后端代码提交

src/main/java/com/jkcredit/invoice/credit/InterfaceCheckServer.java

@@ -20,10 +20,9 @@ public class InterfaceCheckServer {
      @Autowired
      NoCarInterService noCarInterService;
 
-      DataResult result = null;
-
     //跳转到对应的Service服务处理逻辑
     public  DataResult doJumpHandler(String appKey, String api, String data,String requestid ) {
+        DataResult result;
         switch (api){
 
             //----------------------------自有车、无车公共接口---------------------------------//

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

@@ -303,12 +303,16 @@ public class NoCarInterServiceImpl implements NoCarInterService {
             customerCarRec.setBusinessType("2");
             customerCarRec.setServiceOperation(1);//默认运营车辆
             noCarWayBill.setTitleType(2);
+            noCarWayBill.setUpdateTime(DateUtil.getCurrentDateStr());
             //先查询上游是否已经备案
             RespR<VehicleQueryResponse> respRquery = noCarService.customerCarRecQueryUpper(customerCarRec);
             if(respRquery.getCode() == 1 || respRquery.getData() == null || respRquery.getData().getResult() == null || respRquery.getData().getResult().size()<=0){
                 customerCarRecs.add(customerCarRec);
                 RespR respR = noCarService.customerCarRec(customerCarRecs);
                 if(respR.getCode() ==1){
+                    noCarWayBill.setFailReason(respR.getMsg());
+                    noCarWayBill.setBillwayStatus(-2);
+                    insertOrUpdateBill(noCarWayBill);
                     result.setMsg("车牌号备案失败，失败原因："+respR.getMsg());
                     return result;
                 }
@@ -327,6 +331,9 @@ public class NoCarInterServiceImpl implements NoCarInterService {
                 result.setData(3);
                 result.setCode(200);
                 result.setMsg(rs.getMsg());
+                noCarWayBill.setFailReason(rs.getMsg());
+                noCarWayBill.setBillwayStatus(-2);
+                insertOrUpdateBill(noCarWayBill);
                 return result;
             }
         } catch (Exception e) {
@@ -386,7 +393,7 @@ public class NoCarInterServiceImpl implements NoCarInterService {
             noCarWayBill.setStartTime(noCarWayBill1.getStartTime());
             noCarWayBill.setHisFlag(noCarWayBill1.getHisFlag());
             noCarWayBill.setInterType(0);//接口
-
+            noCarWayBill.setUpdateTime(DateUtil.getCurrentDateStr());
             RespR rs = noCarService.noCarWaybillEnd(noCarWayBill);
             long costtimeend = System.currentTimeMillis();
             log.info("[-NoCarInterServiceImpl.noCarBillEnd-] result is "
@@ -483,7 +490,7 @@ public class NoCarInterServiceImpl implements NoCarInterService {
             noCarWayBill.setFee(fee.longValue());
             noCarWayBill.setTitleType(titleType);
             noCarWayBill.setTaxplayerCode(taxplayerCode);
-
+            noCarWayBill.setHisFlag(1);
 
             NoCarWayBill noCarWayBillDb = noCarWaybillMapper.selectByBillNum(noCarWayBill.getBillNum());
 
@@ -502,6 +509,7 @@ public class NoCarInterServiceImpl implements NoCarInterService {
             customerCarRec.setBusinessType("2");
             customerCarRec.setServiceOperation(1);//默认运营车辆
             noCarWayBill.setTitleType(2);
+            noCarWayBill.setUpdateTime(DateUtil.getCurrentDateStr());
             //先查询上游是否已经备案
             RespR<VehicleQueryResponse> respRquery = noCarService.customerCarRecQueryUpper(customerCarRec);
             if(respRquery.getCode() == 1 || respRquery.getData() == null || respRquery.getData().getResult() == null || respRquery.getData().getResult().size()<=0){
@@ -509,6 +517,9 @@ public class NoCarInterServiceImpl implements NoCarInterService {
                 RespR respR = noCarService.customerCarRec(customerCarRecs);
                 if(respR.getCode() ==1){
                     result.setMsg("车牌号备案失败，失败原因："+respR.getMsg());
+                    noCarWayBill.setFailReason(respR.getMsg());
+                    noCarWayBill.setBillwayStatus(-2);
+                    insertOrUpdateBill(noCarWayBill);
                     return result;
                 }
             }
@@ -523,9 +534,13 @@ public class NoCarInterServiceImpl implements NoCarInterService {
                 result.setMsg(rs.getData().toString());
                 return result;
             } else {
+
                 result.setData(3);
                 result.setCode(200);
                 result.setMsg(rs.getMsg());
+                noCarWayBill.setFailReason(rs.getMsg());
+                noCarWayBill.setBillwayStatus(-2);
+                insertOrUpdateBill(noCarWayBill);
                 return result;
             }
         } catch (Exception e) {
@@ -535,7 +550,15 @@ public class NoCarInterServiceImpl implements NoCarInterService {
         return result;
     }
 
+    //插入或者更新运单
+    public void insertOrUpdateBill(NoCarWayBill noCarWayBill){
 
+        if(noCarWaybillMapper.selectByBillNum(noCarWayBill.getBillNum()) == null){
+            noCarWaybillMapper.insert(noCarWayBill);
+        }else{
+            noCarWaybillMapper.updateByBillNum(noCarWayBill);
+        }
+    }
 
 
 
@@ -575,6 +598,7 @@ public class NoCarInterServiceImpl implements NoCarInterService {
 
             NoCarWayBill noCarWayBill1 = noCarWaybillMapper.selectByBillNum(num);
             if (null == noCarWayBill1){
+                result.setMsg("未上传开始运单");
                 return result;
             }
 
@@ -586,7 +610,7 @@ public class NoCarInterServiceImpl implements NoCarInterService {
             noCarWayBill.setStartTime(noCarWayBill1.getStartTime());
             noCarWayBill.setHisFlag(noCarWayBill1.getHisFlag());
             noCarWayBill.setInterType(0);//接口
-
+            noCarWayBill.setUpdateTime(DateUtil.getCurrentDateStr());
             RespR rs = noCarService.noCarHisWaybillEnd(noCarWayBill);
             long costtimeend = System.currentTimeMillis();
             log.info("[-NoCarInterServiceImpl.noCarHisWaybillEnd-] result is "

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

@@ -410,7 +410,7 @@ public class NoCarServiceImpl implements NoCarService{
         log.info("历史运单结束上传：NoCarServiceImpl.noCarHisWaybillEnd{},msg{}",noCarWayBill,"开始");
         //查询运单号为开始指令
         NoCarWayBill noCarWayBill1 = noCarWaybillMapper.selectByBillNum(noCarWayBill.getBillNum());
-        if(noCarWayBill1 == null || noCarWayBill1.getBillwayStatus() !=1 || noCarWayBill.getHisFlag() ==0 ){
+        if(noCarWayBill1 == null || noCarWayBill1.getBillwayStatus() !=1 || noCarWayBill.getHisFlag() ==0 || noCarWayBill1.getBillwayStatus() == -3 ){
             log.info("运单结束失败：NoCarServiceImpl.noCarWaybillEnd{},msg{}",noCarWayBill,"当前运单状态无法结束,请检查当前指令状态");
             return new RespR(false,"当前运单状态无法结束,请检查当前指令状态");
         }
@@ -553,7 +553,7 @@ public class NoCarServiceImpl implements NoCarService{
         billInvoice.setExTime(DateUtil.tTimeToDate(billInvoice.getExTime()));
         billInvoice.setInvoiceMakeTime(DateUtil.tTimeToDate(billInvoice.getInvoiceMakeTime()));
         billInvoice.setWaybillEndTime(DateUtil.tTimeToDate(billInvoice.getWaybillEndTime()));
-        billInvoice.setTradeMatchTime(DateUtil.getCurrentDateStr());
+        billInvoice.setTradeMatchTime(DateUtil.tTimeToDate(billInvoice.getTradeMatchTime()));
         billInvoice.setWaybillStartTime(DateUtil.tTimeToDate(billInvoice.getWaybillStartTime()));
         return billInvoice;
     }

src/main/java/com/jkcredit/invoice/service/nocar/impl/NoCarBillWayServiceImpl.java

@@ -206,6 +206,8 @@ public class NoCarBillWayServiceImpl extends ServiceImpl<NoCarWaybillMapper,NoCa
                         NoCarWayBill noCarWayBillDb = noCarWaybillMapper.selectByBillNum(noCarWayBill.getBillNum());
                         if(noCarWayBillDb!=null && (noCarWayBillDb.getBillwayStatus() == 2 || noCarWayBillDb.getBillwayStatus() == 3 || noCarWayBillDb.getBillwayStatus() == 4)){
                             noCarWaybillMapperImprt.updateBillway(-2,"失败，运单号重复",noCarWayBill);
+                        }else if(noCarWayBillDb!=null && noCarWayBillDb.getBillwayStatus()==1){
+                            noCarWayBill.setBillwayStatus(1);
                         }
                         if(customerRec == null || customerRec.getRecStatus()!=1){
                             stringBuffer.append("#").append(noCarWayBill.getBillNum()).append(":").append("企业税号未备案#");

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

@@ -39,10 +39,10 @@
                 and BINARY customId = #{calculateInfor.customId}
             </if>
             <if test="calculateInfor.companyLongName != null and calculateInfor.companyLongName != ''">
-                and BINARY companyLongName LIKE CONCAT('%',#{calculateInfor.companyLongName},'%')
+                and BINARY companyLongName =#{calculateInfor.companyLongName}
             </if>
             <if test="calculateInfor.buyerName != null and calculateInfor.buyerName != ''">
-                and BINARY buyerName LIKE CONCAT('%',#{calculateInfor.buyerName},'%')
+                and BINARY buyerName =#{calculateInfor.buyerName}
             </if>
             <if test="calculateInfor.buyerTaxpayerCode != null and calculateInfor.buyerTaxpayerCode != ''">
                 and BINARY buyerTaxpayerCode = #{calculateInfor.buyerTaxpayerCode}

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

@@ -76,7 +76,7 @@
         from t_billInvoice
         <where>
             <if test="billInvoice.companyName != null and billInvoice.companyName != ''">
-                and BINARY companyName LIKE CONCAT('%',#{billInvoice.companyName},'%')
+                and BINARY companyName =#{billInvoice.companyName}
             </if>
             <if test="billInvoice.waybillNum != null and billInvoice.waybillNum != ''">
                 and  instr(CONCAT(',',#{billInvoice.waybillNum},','),CONCAT(',',waybillNum,','))>0
@@ -97,9 +97,7 @@
                 and invoiceMakeTime BETWEEN #{billInvoice.invoiceMakeStart} and #{billInvoice.invoiceMakeEnd}
             </if>
             <if test="billInvoice.calculateTimeStart != null and billInvoice.calculateTimeStart != ''">
-                and exists(SELECT  1 from t_CalculateInfor g where g.tradeId = transactionId and
-                g.calculateTime BETWEEN #{billInvoice.calculateTimeStart} and #{billInvoice.calculateTimeEnd}
-                )
+                calculateTime BETWEEN #{billInvoice.calculateTimeStart} and #{billInvoice.calculateTimeEnd}
 
             </if>
         </where>

src/main/resources/mapper/waybill/NoCarWaybillImportMapper.xml

@@ -57,7 +57,7 @@
         from t_waybill_Import
         <where>
             <if test="noCarWayBill.companyName != null and noCarWayBill.companyName != ''">
-                and BINARY companyName LIKE CONCAT('%',#{noCarWayBill.companyName},'%')
+                and BINARY companyName = #{noCarWayBill.companyName}
             </if>
             <if test="noCarWayBill.billNum != null and noCarWayBill.billNum != ''">
                 and BINARY billNum = #{noCarWayBill.billNum}
@@ -97,7 +97,7 @@
         from t_waybill_Import
         <where>
             <if test="noCarWayBill.companyName != null and noCarWayBill.companyName != ''">
-                and BINARY companyName LIKE CONCAT('%',#{noCarWayBill.companyName},'%')
+                and BINARY companyName = #{noCarWayBill.companyName}
             </if>
             <if test="noCarWayBill.billNum != null and noCarWayBill.billNum != ''">
                 and BINARY billNum = #{noCarWayBill.billNum}

src/main/resources/mapper/waybill/NoCarWaybillMapper.xml

@@ -103,7 +103,7 @@
         from t_waybill_no
         <where>
             <if test="noCarWayBill.companyName != null and noCarWayBill.companyName != ''">
-                and BINARY companyName LIKE CONCAT('%',#{noCarWayBill.companyName},'%')
+                and BINARY companyName = #{noCarWayBill.companyName}
             </if>
             <if test="noCarWayBill.billNum != null and noCarWayBill.billNum != ''">
                 and BINARY billNum = #{noCarWayBill.billNum}