无车优化，自有车接口返回

src/main/java/com/jkcredit/invoice/credit/custInterface/SelfCarInterServiceImpl.java

@@ -172,6 +172,7 @@ public class SelfCarInterServiceImpl implements SelfCarInterService {
                 if(null == jb || StringUtils.isEmpty(plateNum)
                         || null == plateColor
                 ){
+                    result.setMsg("参数格式错误");
                     return  result;
                 }
 
@@ -477,6 +478,9 @@ public class SelfCarInterServiceImpl implements SelfCarInterService {
                 return result;
             } else {
                 result.setData(3);
+                if("未查得".equals(result.getMsg())){
+                    result.setData(2);
+                }
                 result.setCode(200);
                 result.setMsg(rs.getMsg());
                 return result;
@@ -647,6 +651,9 @@ public class SelfCarInterServiceImpl implements SelfCarInterService {
                 return result;
             } else {
                 result.setData(3);
+                if("未查得".equals(rs.getMsg())){
+                    result.setData(3);
+                }
                 result.setCode(200);
                 result.setMsg(rs.getMsg());
                 return result;

src/main/java/com/jkcredit/invoice/mapper/Binvoce/SelfCarInvoiceMapper.java

@@ -21,5 +21,6 @@ public interface SelfCarInvoiceMapper extends BaseMapper<SelfCarInvoice> {
     List<SelfCarInvoice> selectByCardId(String cardId);
 
     List<SelfCarInvoice> selectByTradeAndInvoiceMakeTime(SelfCarInvoice record);
+    SelfCarInvoice selectByCodeAndNum(SelfCarInvoice record);
     int upDateCompany(CompanyVo companyVo);
 }

src/main/java/com/jkcredit/invoice/service/lowerService/impl/SelfCarServiceLImpl.java

@@ -123,6 +123,8 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
                         }
                     }
                 };
+            }else {
+                return new RespR(false,"未查得");
             }
 
             return new RespR(result);
@@ -357,10 +359,13 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
                     selfCarInvoice.setCompanyNum(customerCarRec.getCompanyNum());
                     selfCarInvoice.setEnStation(b2BInvoiceListModel.getEnStationName());
                     selfCarInvoice.setExStation(b2BInvoiceListModel.getExStationName());
-                    if(selfCarInvoiceMapper.selectByTradeAndInvoiceMakeTime(selfCarInvoice)==null || selfCarInvoiceMapper.selectByTradeAndInvoiceMakeTime(selfCarInvoice).size()==0){
+                    SelfCarInvoice selfCarInvoice1 = selfCarInvoiceMapper.selectByCodeAndNum(selfCarInvoice);
+                    if(selfCarInvoice1==null){
                         selfCarInvoiceMapper.insert(selfCarInvoice);
                     }
                 }
+            }else{
+                return new RespR("未查得");
             }
             return new RespR(b2BInvoiceListModels,responseRespR.getData().getResult().toString());
         }
@@ -418,7 +423,7 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
         RespR<CardBindQueryListToBResponse> respR = selfCarInterface.cardBindQueryListToB(cardQueryCardToBRequest);
 
         if(customerRec.getInterType() == 0){
-            if(respR.getCode() == 0 && (respR.getData().getResult()==null||respR.getData().getResult().size()==0)){
+            if(respR.getCode() == 0 && (respR.getData().getResult()==null||respR.getData().getResult().size()<=0)){
                 respR.setCode(2);
             }
             return respR;

src/main/java/com/jkcredit/invoice/task/ScheduledBillTask.java

@@ -151,8 +151,8 @@ public class ScheduledBillTask {
               param.setStatus(2);
               param.setCardId(customerCarRec.getEtcNum());
               List<SelfCarTrade> selfCarTrades = sellCarTradeMapper.selectByCardIdByStatus(param);
-              selfCarTradeService.updateTrades(selfCarTrades);
               selfCarService.getSelfCarInvoicesByTime(selfCarDueQueryVo);
+              selfCarTradeService.updateTrades(selfCarTrades);
           }catch (Exception e){
               e.printStackTrace();
               MIX_LOG.info(customerCarRec.getEtcNum());

src/main/resources/mapper/invoice/SelfCarInvoiceMapper.xml

@@ -173,6 +173,12 @@
         from t_SelfCarInvoice
         where  tradeId = BINARY #{tradeId,jdbcType=VARCHAR} and invoiceMakeTime = #{invoiceMakeTime,jdbcType=VARCHAR} and  invoiceUrl= BINARY #{invoiceUrl,jdbcType=VARCHAR}
     </select>
+    <select id="selectByCodeAndNum" resultMap="BaseResultMap" parameterType="com.jkcredit.invoice.model.entity.invoice.SelfCarInvoice" >
+        select
+        <include refid="baseSql" />
+        from t_SelfCarInvoice
+        where  invoiceNum = BINARY #{invoiceNum,jdbcType=VARCHAR} and invoiceCode = #{invoiceCode,jdbcType=VARCHAR}
+    </select>
     <update id="upDateCompany" parameterType="com.jkcredit.invoice.model.vo.CompanyVo">
         UPDATE t_SelfCarInvoice set companyName = #{newCompanyName} where companyName = #{oldCompanyName}
     </update>