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

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

@@ -572,6 +572,10 @@ public class NoCarServiceImpl implements NoCarService{
     @Override
     @Transactional(isolation= Isolation.READ_COMMITTED)
     public RespR getInvoiceByWayBillNumReal(NoCarWayBill noCarWayBill, boolean isInterface) {
+        boolean isKf = true;
+        if(noCarWayBill.getInterType() == 3 || noCarWayBill.getInterType()==5){
+            isKf = false;
+        }
         log.info("取票啦：NoCarServiceImpl.getInvoiceByWayBillNumReal{},isCurr{}",noCarWayBill,isInterface);
         if(isInterface && noCarWayBill.getBillwayStatus()!=-5){
             if(noCarWayBill.getBillwayStatus() == 1 || noCarWayBill.getBillwayStatus() == 2 || noCarWayBill.getBillwayStatus() == 3 || noCarWayBill.getBillwayStatus() == 4){
@@ -604,6 +608,7 @@ public class NoCarServiceImpl implements NoCarService{
         }else{
             int tempStatus = responseRespR.getData().getWaybillStatus().intValue();
             if(noCarWayBill.getBillwayStatus()==-5){
+                noCarWayBill.setInterType(0);
                 noCarWayBill.setPlateNum(responseRespR.getData().getPlateNum());
                 noCarWayBill.setStartTime(DateUtil.tTimeToDate(responseRespR.getData().getWaybillStartTime()));
                 noCarWayBill.setPredictEndTime(DateUtil.tTimeToDate(responseRespR.getData().getWaybillEndTime()));
@@ -666,6 +671,7 @@ public class NoCarServiceImpl implements NoCarService{
 
 
                 });
+                if(isKf)
                 customerMapper.updateByPrimaryKeySelective(customer);
 
             }

src/main/resources/mapper/calculateInfor/MounthAccMapper.xml

@@ -4,7 +4,7 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.jkcredit.invoice.model.entity.Calculate.MounthAcc">
         <id column="id" property="id"/>
-        <result column="customId" property="customId"/>
+        <result column="customerId" property="customerId"/>
         <result column="companyName" property="companyName"/>
         <result column="waybillNum" property="waybillNum"/>
         <result column="tradeId" property="tradeId"/>
@@ -42,7 +42,7 @@
           enStation,
           exStation
         )
-        values ( #{customId,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR},#{waybillNum,jdbcType=VARCHAR},
+        values ( #{customerId,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR},#{waybillNum,jdbcType=VARCHAR},
         #{tradeId,jdbcType=VARCHAR}, #{fee,jdbcType=DOUBLE},#{exTime,jdbcType=VARCHAR}
         ,#{buyerName,jdbcType=VARCHAR},#{buyerTaxpayerCode,jdbcType=VARCHAR},#{enStation,jdbcType=VARCHAR},#{exStation,jdbcType=VARCHAR}
         )