20211110后端更新代码_1

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

@@ -10,6 +10,7 @@ import com.jkcredit.invoice.model.entity.customer.CustomerRec;
 import com.jkcredit.invoice.service.customer.CustomerService;
 import com.jkcredit.invoice.service.lowerService.CustomeLowerService;
 import com.jkcredit.invoice.util.Base64Util;
+import com.jkcredit.invoice.util.DateUtil;
 import com.jkcredit.invoice.util.RespR;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -212,7 +213,10 @@ public class CustomerInterLowerServiceImpl implements CustomerInterLowerService
             return  result;
         }
         if( StringUtils.isEmpty(companyName) && StringUtils.isEmpty(taxpayerCode)){
-             return  result;
+
+            result.setMsg("查询错误");
+            result.setCode(9998);
+            return  result;
          }
 
         CustomerRec customerRec = new CustomerRec();
@@ -298,8 +302,8 @@ public class CustomerInterLowerServiceImpl implements CustomerInterLowerService
 
 
             CustomerRec customerRec = new CustomerRec();
-            customerRec.setServiceStartTime(serviceStartTime);//服务开始时间
-            customerRec.setServiceEndTime(serviceEndTime);//服务结束时间
+            customerRec.setServiceStartTime(DateUtil.getDistanceHoursFormat(serviceStartTime));//服务开始时间
+            customerRec.setServiceEndTime(DateUtil.getDistanceHoursFormat(serviceEndTime));//服务结束时间
             customerRec.setServiceType(serviceType);//协议类型
             customerRec.setLowerFileName(contractFileName);//协议名称
             customerRec.setLowerBase64Str(base64Str);//协议base64编码

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

@@ -19,6 +19,7 @@ import com.jkcredit.invoice.service.lowerService.NoCarService;
 import com.jkcredit.invoice.service.lowerService.SelfCarServiceL;
 import com.jkcredit.invoice.service.lowerService.vo.*;
 import com.jkcredit.invoice.service.manager.ParamService;
+import com.jkcredit.invoice.service.nocar.NoCarBillWayImportService;
 import com.jkcredit.invoice.util.DateUtil;
 import com.jkcredit.invoice.util.RespR;
 import lombok.extern.slf4j.Slf4j;
@@ -38,6 +39,8 @@ public class NoCarInterServiceImpl implements NoCarInterService {
 
     @Autowired
     private NoCarService noCarService;
+    @Autowired
+    NoCarBillWayImportService noCarWaybillMapperImprt;
 
     @Autowired
     CustomerCarRecMapper customerCarRecMapper;
@@ -96,11 +99,13 @@ public class NoCarInterServiceImpl implements NoCarInterService {
             customerCarRec.setCustomerName(appKey);
             if(StringUtils.isEmpty(companyName)){
                 String companyNum = paramService.getParamsByParamName("REQUEST_COMPANY_NUM").getParamValue();
+                String appKeyDemo = paramService.getParamsByParamName("REQUEST_COMPANY_NAME").getParamValue();
                 CustomerRec customerRec = new CustomerRec();
-                customerRec.setCustomerName(appKey);
+                customerRec.setCustomerName(appKeyDemo);
                 customerRec.setCompanyNum(companyNum);
                 CustomerRec customerRec1 =  customerRecMapper.selectByCustomerNameAndCompanyNum(customerRec);
                 customerCarRec.setCompanyName(customerRec1.getCompanyName());
+                customerCarRec.setCustomerName(appKeyDemo);
             }else {
                 customerCarRec.setCompanyName(companyName);
             }
@@ -108,7 +113,9 @@ public class NoCarInterServiceImpl implements NoCarInterService {
             customerCarRec.setCarColor(plateColor);
             customerCarRec.setCarNum(plateNumber);
             customerCarRec.setInterType(0);
-            customerCarRec.setServiceOperation(1);//默认运营车辆
+            if("0".equals(customerCarRec.getCarColor())){
+                customerCarRec.setServiceOperation(1);//默认运营车辆
+            }
 
             customerCarRecList.add(customerCarRec);
 
@@ -275,8 +282,11 @@ public class NoCarInterServiceImpl implements NoCarInterService {
             noCarWayBill.setFee(fee.longValue());
             noCarWayBill.setTitleType(titleType);
             noCarWayBill.setTaxplayerCode(taxplayerCode);
+            NoCarWayBill noCarWayBillDb = noCarWaybillMapper.selectByBillNum(noCarWayBill.getBillNum());
 
-
+            if(noCarWayBillDb!=null && (noCarWayBillDb.getBillwayStatus() == 1||noCarWayBillDb.getBillwayStatus() == 2 || noCarWayBillDb.getBillwayStatus() == 3 || noCarWayBillDb.getBillwayStatus() == 4)) {
+                noCarWaybillMapperImprt.updateBillway(-2, "失败，运单号重复", noCarWayBill);
+            }
             RespR rs = noCarService.noCarWaybillStart(noCarWayBill);
             long costtimeend = System.currentTimeMillis();
             log.info("[-NoCarInterServiceImpl.noCarBillStart-] result is "
@@ -444,7 +454,13 @@ public class NoCarInterServiceImpl implements NoCarInterService {
             noCarWayBill.setTaxplayerCode(taxplayerCode);
 
 
-            RespR rs = noCarService.noCarHisWaybillStart(noCarWayBill);
+            NoCarWayBill noCarWayBillDb = noCarWaybillMapper.selectByBillNum(noCarWayBill.getBillNum());
+
+            if(noCarWayBillDb!=null && (noCarWayBillDb.getBillwayStatus() == 1||noCarWayBillDb.getBillwayStatus() == 2 || noCarWayBillDb.getBillwayStatus() == 3 || noCarWayBillDb.getBillwayStatus() == 4)) {
+                noCarWaybillMapperImprt.updateBillway(-2, "失败，运单号重复", noCarWayBill);
+            }
+
+                RespR rs = noCarService.noCarHisWaybillStart(noCarWayBill);
             long costtimeend = System.currentTimeMillis();
             log.info("[-NoCarInterServiceImpl.noCarHisWaybillStart-] result is "
                     + rs.toString() + ", request is " + data + " ,costtime="

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

@@ -10,6 +10,7 @@ import com.jkcredit.invoice.model.entity.customer.CustomerRec;
 import com.jkcredit.invoice.service.lowerService.SelfCarServiceL;
 import com.jkcredit.invoice.service.lowerService.vo.*;
 import com.jkcredit.invoice.service.selfCar.SelfCarService;
+import com.jkcredit.invoice.util.DateUtil;
 import com.jkcredit.invoice.util.RespR;
 import com.mysql.cj.xdevapi.JsonArray;
 import lombok.extern.slf4j.Slf4j;
@@ -408,10 +409,11 @@ public class SelfCarInterServiceImpl implements SelfCarInterService {
             TradeRequestVo tradeRequestVo  = new TradeRequestVo();
             tradeRequestVo.setCustomerName(appKey);
             tradeRequestVo.setCompanyName(customerRec1.getCompanyName());
-            tradeRequestVo.setStartTime(startExTime);
-            tradeRequestVo.setEndTime(endExTime);
+            tradeRequestVo.setStartTime(DateUtil.getDistanceHoursFormat(startExTime));
+            tradeRequestVo.setEndTime(DateUtil.getDistanceHoursFormat(endExTime));
             tradeRequestVo.setEtcId(cardId);
             tradeRequestVo.setTradeStatus(tradeStatus);
+            tradeRequestVo.setInterType(0);//0 接口
 
             if(tradeRequestVo.getTradeStatus() ==null){
                 tradeRequestVo.setTradeStatus(1);

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

@@ -92,7 +92,7 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
         RespR<CardTradeResponse> resp = selfCarInterface.cardTrade(cardTradeRequest);
         if(resp.getCode() == 1){
             log.info("获取交易失败SelfCarServiceLImpl.getTradeList{},msg{}",tradeRequestVo,resp.getMsg());
-            return new RespR(false,"请求失败："+resp.getMsg());
+            return new RespR(false,resp.getMsg());
         }else{
             CardTradeResponse cardTradeResponse = resp.getData();
             List<CardTradeModel> result  = cardTradeResponse.getResult();
@@ -120,7 +120,13 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
                     }
                 };
             }
-            return new RespR(result);
+
+            if(tradeRequestVo.getInterType() == 0){
+                return new RespR(resp.getData());
+            }else{
+                return new RespR(result);
+            }
+
         }
     }
 

src/main/java/com/jkcredit/invoice/service/lowerService/vo/TradeRequestVo.java

@@ -6,11 +6,21 @@ public class TradeRequestVo {
     private String companyName;
     private String customerName;
     private String etcId;
+    private Integer interType = 1;//0 接口 1平台
     /*待开票	1
     开票中	2
     已开票	3*/
     private Integer tradeStatus;
 
+
+    public Integer getInterType() {
+        return interType;
+    }
+
+    public void setInterType(Integer interType) {
+        this.interType = interType;
+    }
+
     public String getStartTime() {
         return startTime;
     }