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

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

@@ -550,8 +550,8 @@ public class NoCarServiceImpl implements NoCarService{
         waybillNumFindInvoiceResponse.setResult(invoiceProcessingListModels);
         waybillNumFindInvoiceResponse.setPlateNum(noCarWayBill.getPlateNum());
         waybillNumFindInvoiceResponse.setInfo("成功");
-        waybillNumFindInvoiceResponse.setWaybillStartTime(DateUtil.dateToTime(noCarWayBill.getStartTime()));
-        waybillNumFindInvoiceResponse.setWaybillEndTime(DateUtil.dateToTime(noCarWayBill.getPredictEndTime()));
+        waybillNumFindInvoiceResponse.setWaybillStartTime(noCarWayBill.getStartTime()==null?null:DateUtil.dateToTime(noCarWayBill.getStartTime()));
+        waybillNumFindInvoiceResponse.setWaybillEndTime(noCarWayBill.getPredictEndTime()==null?null:DateUtil.dateToTime(noCarWayBill.getPredictEndTime()));
         waybillNumFindInvoiceResponse.setWaybillStatus(noCarWayBill.getBillwayStatus());
         waybillNumFindInvoiceResponse.setReceiveTime(DateUtil.dateToTime(DateUtil.getCurrentDateStr()));
         waybillNumFindInvoiceResponse.setWaybillNum(noCarWayBill.getBillNum());
@@ -572,9 +572,12 @@ 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;
+        byte isKf = 1;
+        if(noCarWayBill.getInterType() == 3){
+            isKf = 3;
+        }
+        if(noCarWayBill.getInterType() == 5){
+            isKf = 5;
         }
         log.info("取票啦：NoCarServiceImpl.getInvoiceByWayBillNumReal{},isCurr{}",noCarWayBill,isInterface);
         if(isInterface && noCarWayBill.getBillwayStatus()!=-5){
@@ -608,7 +611,9 @@ public class NoCarServiceImpl implements NoCarService{
         }else{
             int tempStatus = responseRespR.getData().getWaybillStatus().intValue();
             if(noCarWayBill.getBillwayStatus()==-5){
-                noCarWayBill.setInterType(0);
+                if(isKf != 3){
+                    noCarWayBill.setInterType(0);
+                }
                 noCarWayBill.setPlateNum(responseRespR.getData().getPlateNum());
                 noCarWayBill.setStartTime(DateUtil.tTimeToDate(responseRespR.getData().getWaybillStartTime()));
                 noCarWayBill.setPredictEndTime(DateUtil.tTimeToDate(responseRespR.getData().getWaybillEndTime()));
@@ -617,6 +622,9 @@ public class NoCarServiceImpl implements NoCarService{
                 insertOrUpdateBill(noCarWayBill);
             }else {
                 //更改票状态
+                noCarWayBill.setPlateNum(responseRespR.getData().getPlateNum());
+                noCarWayBill.setStartTime(DateUtil.tTimeToDate(responseRespR.getData().getWaybillStartTime()));
+                noCarWayBill.setPredictEndTime(DateUtil.tTimeToDate(responseRespR.getData().getWaybillEndTime()));
                 noCarWayBill.setBillwayStatus(tempStatus);
                 noCarWayBill.setUpdateTime(DateUtil.getCurrentDateStr());
                 noCarWaybillMapper.updateByBillNum(noCarWayBill);
@@ -654,6 +662,7 @@ public class NoCarServiceImpl implements NoCarService{
 
                     billInvoiceMapper.insert(billInvoice);
                 });
+                if(isKf == 3)   return new RespR(responseRespR.getData());
                 //统一插入交易id 和 和计费信息
                 Param param = paramService.getParamsByParamName("CUST_NOCAR_FEE");
                 Double fee = Double.parseDouble(param.getParamValue());
@@ -671,7 +680,7 @@ public class NoCarServiceImpl implements NoCarService{
 
 
                 });
-                if(isKf)
+                if(isKf==1)
                 customerMapper.updateByPrimaryKeySelective(customer);
 
             }

src/main/resources/logback-spring.xml

@@ -24,7 +24,7 @@
             <fileNamePattern>${log.path}/logs/system.log.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
             <!-- 每产生一个日志文件，该日志文件的保存期限为30天 -->
             <maxHistory>30</maxHistory>
-            <maxFileSize>10MB</maxFileSize>
+            <maxFileSize>1000MB</maxFileSize>
         </rollingPolicy>
             <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
                 <pattern>${CONSOLE_LOG_PATTERN}</pattern>

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

@@ -81,7 +81,7 @@
                 and  customerName = BINARY #{billInvoice.customerName}
             </if>
             <if test="billInvoice.companyName != null and billInvoice.companyName != ''">
-                and  companyName = BINARY #{billInvoice.companyName}
+                and  buyerName = BINARY #{billInvoice.companyName}
             </if>
 
             <if test="billInvoice.waybillNum != null and billInvoice.waybillNum != ''">
@@ -283,7 +283,7 @@
         from t_billInvoice
         <where>
             <if test="billInvoice.companyName != null and billInvoice.companyName != ''">
-                and  companyName = BINARY #{billInvoice.companyName}
+                and  buyerName = BINARY #{billInvoice.companyName}
             </if>
             <if test="billInvoice.waybillNum != null and billInvoice.waybillNum != ''">
                 and  waybillNum = BINARY #{billInvoice.waybillNum}