接口优化，月账单查询

src/main/java/com/jkcredit/invoice/controller/localBussiness/NoCarController.java

@@ -195,6 +195,7 @@ public class NoCarController {
             if(noCarWayBills!=null && noCarWayBills.size()>0){
                 noCarWayBills.stream().forEach(noCarWayBill -> {
                     try {
+                         noCarWayBill.setBillwayStatus(-5);
                          noCarService.getInvoiceByWayBillNumReal(noCarWayBill,false);
                     }catch (Exception e){
                         e.printStackTrace();

src/main/java/com/jkcredit/invoice/controller/localBussiness/SelfCarController.java

@@ -325,7 +325,7 @@ public class SelfCarController {
             customerRec.setCustomerName(selfcarInvoiceByTimeVo.getCustomerName());
             customerRec.setCompanyName(selfcarInvoiceByTimeVo.getCompanyName());
             CustomerRec customerRec1 = customerRecMapper.selectByCustomerNameAndCompany(customerRec);
-            if(customerRec == null || customerRec.getRecStatus().intValue() !=1 ){
+            if(customerRec1 == null || customerRec1.getRecStatus().intValue() !=1 ){
                 return new RespR(false,"客户未备案");
             }
             List<B2BInvoiceListModel>  allSelfInvocies = new ArrayList<>();

src/main/java/com/jkcredit/invoice/controller/service/NoCarServiceController.java

@@ -1,5 +1,6 @@
 package com.jkcredit.invoice.controller.service;
 
+import com.jkcredit.invoice.mapper.calculateInfor.MounthAccMapper;
 import com.jkcredit.invoice.model.entity.customer.CustomerCarRec;
 import com.jkcredit.invoice.model.entity.customer.CustomerRec;
 import com.jkcredit.invoice.model.entity.waybill.NoCarWayBill;
@@ -56,7 +57,159 @@ public class NoCarServiceController {
     public RespR monthAccQuery(@RequestBody MonthAccountQueryVo monthAccountQueryVo){
         return noCarService.monthAccQuery(monthAccountQueryVo);
     }
+    @Autowired
+    MounthAccMapper mounthAccMapper;
+    /**
+     * @param
+     * @return
+     */
+    @PostMapping("/monthAccUpdate")
+    @ApiOperation(value="月账单交易查询更新", notes="月账单交易查询更新")
+    //@LoginRequired
+    public RespR monthAccQueryUpdate(@RequestBody MonthAccountQueryVo monthAccountQueryVo){
+        String [] companys = new String[]{"内蒙古书宏超网络科技有限公司邳州分公司",
+                "山西云启正通物流有限责任公司",
+                "吉安供应链管理淮安有限公司",
+                "辽宁骐盛物流供应链管理有限公司芜湖分公司",
+                "贵州汽喇叭物联科技有限公司",
+                "贵州茂运供应链管理有限公司",
+                "睿博龙（天津）智慧物联科技有限公司",
+                "山西佳欣物联科技有限公司",
+                "江苏万安物流有限公司",
+                "贵州赣府物联科技有限公司",
+                "榆林市渊茂物流科技有限公司",
+                "贵州弘裕智慧物流有限公司",
+                "辽宁四通物联网络科技有限公司",
+                "江苏恒泰网络科技有限公司",
+                "福建丰车物流有限公司",
+                "山西润物供应链管理有限公司芜湖分公司",
+                "中邦汇鑫（山东）物流信息有限公司",
+                "萍乡青润运输有限公司",
+                "贵州慧运宝网络科技有限公司",
+                "荣程智运科技（天津）有限公司",
+                "浙江佑运物流科技有限公司芜湖分公司",
+                "七彩光环（山西）科技供应链有限公司",
+                "广东洋浦实业有限公司",
+                "聊城新世纪物流科技有限公司",
+                "美途科技（韶关）有限公司天津分公司",
+                "江苏万安物流有限公司舞阳分公司",
+                "贵州鲲运智慧物流有限公司",
+                "筋斗云（山西）智慧物联科技有限公司",
+                "贵州成江海物联科技有限公司",
+                "山西风行美亚智慧物联科技有限公司",
+                "贵州运多多网络科技有限公司",
+                "山东兰瑞网络科技有限责任公司",
+                "贵州新收获网络科技有限公司",
+                "丽江市古城区陆运帮供应链有限公司",
+                "江苏国镖信息科技有限公司芜湖分公司",
+                "山西晋通公铁联运科技有限公司",
+                "物链万家（山西）科技有限公司",
+                "山西星图智科供应链管理有限公司",
+                "宁夏盈度互联网科技有限公司",
+                "江西靛蓝互联网科技有限公司",
+                "山西新成功物联科技有限公司",
+                "贵州浩鑫供应链管理有限公司",
+                "新疆州驰信息科技有限公司",
+                "宁夏冉嘉荣供应链管理有限公司",
+                "河南牛车科技有限责任公司",
+                "聊城新世纪物流科技有限公司青岛分公司",
+                "贵州知象网络科技有限公司",
+                "贵州梵润物联科技有限公司",
+                "贵州宇雷供应链管理有限公司",
+                "江西海帮供应链管理有限公司",
+                "贵州油满满科技有限公司",
+                "襄阳厚载科技有限公司",
+                "湖南花农网信息科技有限公司",
+                "济源市中浩供应链管理有限公司",
+                "新疆州驰信息科技有限公司芜湖分公司",
+                "贵州峰运供应链科技有限公司",
+                "智享快运（山西）供应链管理有限公司",
+                "甘肃蜀西蓉创科技有限公司",
+                "甘肃物云集物流科技有限公司",
+                "山西金牛物联科技有限公司",
+                "武汉吉运物流有限公司",
+                "山西大快田园物联科技有限公司",
+                "河北晟洲物流有限公司",
+                "辽宁骐盛物流供应链管理有限公司营口分公司",
+                "山东村鸟网络科技有限公司",
+                "江苏国镖信息科技有限公司盐城分公司",
+                "安徽星微网络科技有限公司",
+                "贵州东和物流有限公司",
+                "辽宁四通物联网络科技有限公司海城分公司",
+                "乌海市中海物流有限责任公司湾沚分公司",
+                "贵州东轩供应链管理有限公司",
+                "贵州慧天物流科技有限公司",
+                "山西云车智慧物联科技有限公司",
+                "贵州福赛特智慧物联有限公司",
+                "湖北易得物流有限公司",
+                "河南易卡运智博物流有限公司",
+                "营口丰巢物流科技有限公司湾沚分公司",
+                "营口丰巢物流科技有限公司(辽宁)自贸区分公司",
+                "山西安通速达智慧物联科技有限公司",
+                "内蒙古书宏超网络科技有限公司",
+                "江苏万安物流有限公司靖江分公司",
+                "绥德县骏华科技有限公司",
+                "辽宁四通物联网络科技有限公司芜湖分公司",
+                "四川世纪兆通物流有限公司",
+                "山西盛泽物联科技有限公司",
+                "贵州一飞网络科技有限公司",
+                "山西货满赢供应链管理有限公司",
+                "辽宁四通物联网络科技有限公司邳州分公司",
+                "重庆车犇网络科技有限公司",
+                "江西怡达供应链管理有限公司",
+                "榆林市利升物流有限公司",
+                "辽宁骐盛物流供应链管理有限公司湾沚分公司",
+                "山西缆库智慧物联科技有限公司",
+                "贵州凡网物联科技有限公司",
+                "山西直拼物联科技有限公司",
+                "贵州来拉货科技有限公司",
+                "山西中弘智运科技有限公司",
+                "山西优途科技有限公司",
+                "新疆州驰信息科技有限公司邳州分公司",
+                "辽宁骐盛物流供应链管理有限公司邳州分公司",
+                "中建运联（山西）供应链有限公司",
+                "贵州胜鑫良晨网络科技有限公司",
+                "贵州中众衡智企通物联科技有限公司",
+                "贵州运万佳物流科技有限公司",
+                "湖南花农网信息科技有限公司湘潭分公司",
+                "山西云启正通物流有限责任公司宿州分公司",
+                "江西弘道网络科技有限公司",
+                "淮安市昆交汽车运输有限公司",
+                "贵州梵运网络科技有限公司",
+                "中轩物联有限公司",
+                "新承运（平潭）物流科技有限公司福清分公司",
+                "山西立德源科技有限公司",
+                "贵州联玺汇网络科技有限公司",
+                "金昌顺通智慧物流有限公司",
+                "山西丝路物联科技有限公司",
+                "河北晟洲物流有限公司芜湖分公司",
+                "辽宁四通物联网络科技有限公司湾沚分公司",
+                "浙江佑运物流科技有限公司",
+                "贵州久江供应链管理有限公司",
+                "宿迁京东通联物流有限公司",
+                "营口丰巢物流科技有限公司邳州分公司",
+                "贵州梵行智慧物联有限公司",
+                "绥德县骏华科技有限公司芜湖分公司",
+                "山西裕兴华物流科技有限公司",
+                "山西麓湘网络科技有限公司",
+                "聊城新世纪物流科技有限公司德州分公司",
+                "贵州佳源网络货运有限公司",
+                "长沙争渡网络科技有限公司",
+                "山西全都通科技有限公司",
+                "甘肃陆港通物流科技有限公司",
+                "甘肃恒浦供应链有限责任公司",
+                "贵州六运大通供应链管理有限公司",
+                "湖北小象物流服务有限公司",
+                "贵州缆库智慧物流有限公司"
+        };
+        mounthAccMapper.deleteAll();
+        for(int i=0;i<companys.length;i++){
+            monthAccountQueryVo.setCompanyName(companys[i]);
+            noCarService.monthAccQueryUpdate(monthAccountQueryVo);
 
+        }
+        return new RespR(true);
+    }
     /**
      * @param customerCarRecs
      * @return

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

@@ -167,6 +167,7 @@ public class SimpleCORSFilter implements Filter {
             "/noCarService/noCarVoiceQuery",
             "/noCarService/hCVoiceQuery",
             "/noCarService/monthAccQuery",
+            "/noCarService/monthAccUpdate",
             "/noCarService/customerCarRec",
             "/noCarService/customeRecUpperQuery",
             "/noCarService/customerCarRecQuery",

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

@@ -665,8 +665,12 @@ public class NoCarInterServiceImpl implements NoCarInterService {
             if (null == noCarWayBill1){
                noCarWayBill1 = new NoCarWayBill();
                noCarWayBill1.setBillNum(num);
+               noCarWayBill1.setInterType(0);
                noCarWayBill1.setBillwayStatus(-5);
             }
+            if(noCarWayBill1.getInterType() == 3 || (noCarWayBill1.getBillwayStatus()<2 && noCarWayBill1.getFailReason()!=null && noCarWayBill1.getFailReason().contains("XyWaybillHistoryEnd"))){
+                noCarWayBill1.setBillwayStatus(-5);
+            }
             noCarWayBill1.setCustomerName(appKey);
             noCarWayBill1.setCompanyName(noCarWayBill1.getCompanyName());
             RespR rs = noCarService.getInvoiceByWayBillNumReal(noCarWayBill1,true);

src/main/java/com/jkcredit/invoice/mapper/calculateInfor/MounthAccMapper.java

@@ -0,0 +1,11 @@
+package com.jkcredit.invoice.mapper.calculateInfor;
+
+import com.jkcredit.invoice.model.entity.Calculate.MounthAcc;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface MounthAccMapper {
+    int insert(MounthAcc mounthAcc);
+
+    int deleteAll();
+}

src/main/java/com/jkcredit/invoice/mapper/waybill/SellCarTradeMapper.java

@@ -19,7 +19,7 @@ public interface SellCarTradeMapper extends BaseMapper<SelfCarTrade> {
 
     int updateByTradeId(SelfCarTrade record);
 
-    SelfCarTrade selectByTradeId(String tradeId);
+    List<SelfCarTrade> selectByTradeId(String tradeId);
     List<SelfCarTrade> selectByCardIdByStatus(SelfCarTrade record);
     List<SelfCarTrade> selectByCardId(String cardId);
 

src/main/java/com/jkcredit/invoice/model/entity/Calculate/MounthAcc.java

@@ -0,0 +1,110 @@
+package com.jkcredit.invoice.model.entity.Calculate;
+
+/**
+ * 上游月账单
+ */
+public class MounthAcc {
+    /**
+     * 计费id号
+     */
+    private Long Id;
+
+    private String customerId;
+    private String companyName;
+    private String waybillNum;
+    private String tradeId;
+    private Long fee;
+    private String exTime;
+    private String buyerName;
+    private String buyerTaxpayerCode;
+    private String enStation;
+    private String exStation;
+
+    public Long getId() {
+        return Id;
+    }
+
+    public void setId(Long id) {
+        Id = id;
+    }
+
+    public String getCustomerId() {
+        return customerId;
+    }
+
+    public void setCustomerId(String customerId) {
+        this.customerId = customerId;
+    }
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
+    public String getWaybillNum() {
+        return waybillNum;
+    }
+
+    public void setWaybillNum(String waybillNum) {
+        this.waybillNum = waybillNum;
+    }
+
+    public String getTradeId() {
+        return tradeId;
+    }
+
+    public void setTradeId(String tradeId) {
+        this.tradeId = tradeId;
+    }
+
+    public Long getFee() {
+        return fee;
+    }
+
+    public void setFee(Long fee) {
+        this.fee = fee;
+    }
+
+    public String getExTime() {
+        return exTime;
+    }
+
+    public void setExTime(String exTime) {
+        this.exTime = exTime;
+    }
+
+    public String getBuyerName() {
+        return buyerName;
+    }
+
+    public void setBuyerName(String buyerName) {
+        this.buyerName = buyerName;
+    }
+
+    public String getBuyerTaxpayerCode() {
+        return buyerTaxpayerCode;
+    }
+
+    public void setBuyerTaxpayerCode(String buyerTaxpayerCode) {
+        this.buyerTaxpayerCode = buyerTaxpayerCode;
+    }
+
+    public String getEnStation() {
+        return enStation;
+    }
+
+    public void setEnStation(String enStation) {
+        this.enStation = enStation;
+    }
+
+    public String getExStation() {
+        return exStation;
+    }
+
+    public void setExStation(String exStation) {
+        this.exStation = exStation;
+    }
+}

src/main/java/com/jkcredit/invoice/service/lowerService/NoCarService.java

@@ -79,4 +79,11 @@ public interface NoCarService {
      * @return
      */
     RespR monthAccQuery(MonthAccountQueryVo monthAccountQueryVo);
+
+    /**
+     * 月账单查询更新
+     * @param monthAccountQueryVo
+     * @return
+     */
+    RespR monthAccQueryUpdate(MonthAccountQueryVo monthAccountQueryVo);
 }

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

@@ -7,11 +7,13 @@ import cn.com.taiji.sdk.model.comm.protocol.tts.vehicle.VehicleRegisterResponse;
 import cn.com.taiji.sdk.model.comm.protocol.tts.waybill.*;
 import com.jkcredit.invoice.common.CommonConstants;
 import com.jkcredit.invoice.mapper.Binvoce.BillInvoiceMapper;
+import com.jkcredit.invoice.mapper.calculateInfor.MounthAccMapper;
 import com.jkcredit.invoice.mapper.calculateInfor.NoCarCalculateInforMapper;
 import com.jkcredit.invoice.mapper.customer.CustomerCarRecMapper;
 import com.jkcredit.invoice.mapper.customer.CustomerMapper;
 import com.jkcredit.invoice.mapper.customer.CustomerRecMapper;
 import com.jkcredit.invoice.mapper.waybill.NoCarWaybillMapper;
+import com.jkcredit.invoice.model.entity.Calculate.MounthAcc;
 import com.jkcredit.invoice.model.entity.Calculate.NoCarCalculateInfor;
 import com.jkcredit.invoice.model.entity.customer.Customer;
 import com.jkcredit.invoice.model.entity.customer.CustomerCarRec;
@@ -402,6 +404,19 @@ public class NoCarServiceImpl implements NoCarService{
             noCarWaybillMapper.updateByBillNum(noCarWayBill);
         }
     }
+    //插入或者更新运单
+    public void insertOrUpdateBill(NoCarWayBill noCarWayBill){
+        noCarWayBill.setUpdateTime(DateUtil.getCurrentDateStr());
+        NoCarWayBill curr = noCarWaybillMapper.selectByBillNum(noCarWayBill.getBillNum());
+        if(curr == null){
+            noCarWaybillMapper.insert(noCarWayBill);
+        }else{
+            if(curr.getBillwayStatus()>1){
+                return;
+            }
+            noCarWaybillMapper.updateByBillNum(noCarWayBill);
+        }
+    }
     @Override
     public RespR noCarHisWaybillStart(NoCarWayBill noCarWayBill) {
         log.info("历史运单开始上传：NoCarServiceImpl.noCarHisWaybillStart{},msg{}",noCarWayBill,"开始");
@@ -589,14 +604,12 @@ public class NoCarServiceImpl implements NoCarService{
         }else{
             int tempStatus = responseRespR.getData().getWaybillStatus().intValue();
             if(noCarWayBill.getBillwayStatus()==-5){
-                noCarWayBill.setIntfaceStartTime(DateUtil.getCurrentDateStr());
-                noCarWayBill.setInterType(0);
                 noCarWayBill.setPlateNum(responseRespR.getData().getPlateNum());
                 noCarWayBill.setStartTime(DateUtil.tTimeToDate(responseRespR.getData().getWaybillStartTime()));
                 noCarWayBill.setPredictEndTime(DateUtil.tTimeToDate(responseRespR.getData().getWaybillEndTime()));
                 //更改票状态
                 noCarWayBill.setBillwayStatus(tempStatus);
-                insertOrUpdateBillEnd(noCarWayBill);
+                insertOrUpdateBill(noCarWayBill);
             }else {
                 //更改票状态
                 noCarWayBill.setBillwayStatus(tempStatus);
@@ -696,7 +709,7 @@ public class NoCarServiceImpl implements NoCarService{
     }
     @Override
     public RespR monthAccQuery(MonthAccountQueryVo monthAccountQueryVo) {
-        log.info("取月票啦：NoCarServiceImpl.hCInvoiceQuery{},msg{}",monthAccountQueryVo,"开始");
+        log.info("取月票啦：NoCarServiceImpl.monthAccQuery{},msg{}",monthAccountQueryVo,"开始");
         CustomerRec customerRecParm = new CustomerRec();
         customerRecParm.setCompanyName(monthAccountQueryVo.getCompanyName());
         customerRecParm.setCustomerName(monthAccountQueryVo.getCustomeName());
@@ -706,7 +719,7 @@ public class NoCarServiceImpl implements NoCarService{
             customerRec = customerRecs.get(0);
         }
         if(customerRec == null || customerRec.getRecStatus()!=1){
-            log.info("取月票失败啦：NoCarServiceImpl.hCInvoiceQuery{},msg{}",monthAccountQueryVo,"企业未备案成功,查询失败");
+            log.info("取月票失败啦：NoCarServiceImpl.monthAccQuery{},msg{}",monthAccountQueryVo,"企业未备案成功,查询失败");
             return new RespR(false,"企业未备案成功,查询失败");
         }
         WaybillCountQueryRequest waybillCountQueryRequest = new WaybillCountQueryRequest();
@@ -718,7 +731,68 @@ public class NoCarServiceImpl implements NoCarService{
         waybillCountQueryRequest.setPageNo(monthAccountQueryVo.getPageNo());
         waybillCountQueryRequest.setPageSize(1000);
         RespR<WaybillCountQueryResponse> waybillCountQueryResponseRespR =  noCarInterface.waybillCountQuery(waybillCountQueryRequest);
-        log.info("取月票结束：NoCarServiceImpl.hCInvoiceQuery{},msg{}",waybillCountQueryResponseRespR,waybillCountQueryResponseRespR.getMsg());
+        log.info("取月票结束：NoCarServiceImpl.monthAccQuery{},msg{}",waybillCountQueryResponseRespR,waybillCountQueryResponseRespR.getMsg());
         return waybillCountQueryResponseRespR;
     }
+    @Autowired
+    MounthAccMapper mounthAccMapper;
+    @Override
+    public RespR monthAccQueryUpdate(MonthAccountQueryVo monthAccountQueryVo) {
+        log.info("更新取月票啦：NoCarServiceImpl.monthAccQueryUpdate{},msg{}",monthAccountQueryVo,"开始");
+        CustomerRec customerRecParm = new CustomerRec();
+        customerRecParm.setCompanyName(monthAccountQueryVo.getCompanyName());
+        customerRecParm.setCustomerName(monthAccountQueryVo.getCustomeName());
+        CustomerRec customerRec = null;
+        List<CustomerRec> customerRecs = customerRecMapper.selectByCompanyName(monthAccountQueryVo.getCompanyName());
+        if(customerRecs != null && customerRecs.size()>0){
+            customerRec = customerRecs.get(0);
+        }
+
+        if(customerRec == null || customerRec.getRecStatus()!=1){
+            log.info("取月票失败啦：NoCarServiceImpl.hCInvoiceQuery{},msg{}",monthAccountQueryVo,"企业未备案成功,查询失败");
+            return new RespR(false,"企业未备案成功,查询失败");
+        }
+        WaybillCountQueryRequest waybillCountQueryRequest = new WaybillCountQueryRequest();
+        String companyNum = paramService.getParamsByParamName("REQUEST_COMPANY_NUM").getParamValue();
+        waybillCountQueryRequest.setCompanyNum(companyNum);
+        waybillCountQueryRequest.setTaxCode(customerRec.getCompanyReferencenum());
+        waybillCountQueryRequest.setTradeMonth(monthAccountQueryVo.getTradeMonth());
+        waybillCountQueryRequest.setWaybillSource(monthAccountQueryVo.getWaybillSource());
+        waybillCountQueryRequest.setPageNo(monthAccountQueryVo.getPageNo());
+        waybillCountQueryRequest.setPageSize(1000);
+        RespR<WaybillCountQueryResponse> waybillCountQueryResponseRespR =  noCarInterface.waybillCountQuery(waybillCountQueryRequest);
+        if(waybillCountQueryResponseRespR.getCode() != 1){
+            dealMouthAcc(waybillCountQueryResponseRespR,customerRec);
+            if(waybillCountQueryResponseRespR.getData().getTotalCount()>1000){
+                for(int i=2;i<waybillCountQueryResponseRespR.getData().getTotalCount()/1000+2;i++){
+                    waybillCountQueryRequest.setPageNo(i);
+                    RespR<WaybillCountQueryResponse> waybillCountQueryResponseRespR1 =  noCarInterface.waybillCountQuery(waybillCountQueryRequest);
+                    dealMouthAcc(waybillCountQueryResponseRespR1,customerRec);
+                }
+            }
+        }
+
+        log.info("更新取月票啦：NoCarServiceImpl.monthAccQueryUpdate{},msg{}",waybillCountQueryResponseRespR,waybillCountQueryResponseRespR.getMsg());
+        return new RespR(true);
+    }
+    public void dealMouthAcc(RespR<WaybillCountQueryResponse> waybillCountQueryResponseRespR,CustomerRec customerRec){
+        String customerName = customerRec.getCustomerName();
+        String companyName = customerRec.getCompanyBelongName();
+        String buyerName = customerRec.getCompanyName();
+        String buyerCode = customerRec.getCompanyReferencenum();
+        waybillCountQueryResponseRespR.getData().getResult().forEach(waybillCountQueryModel -> {
+            MounthAcc mounthAcc = new MounthAcc();
+            mounthAcc.setBuyerName(buyerName);
+            mounthAcc.setBuyerTaxpayerCode(buyerCode);
+            mounthAcc.setCompanyName(companyName);
+            mounthAcc.setCustomerId(customerName);
+            mounthAcc.setExTime(DateUtil.tTimeToDate(waybillCountQueryModel.getExTime()));
+            mounthAcc.setEnStation(waybillCountQueryModel.getEnStation());
+            mounthAcc.setExStation(waybillCountQueryModel.getExStation());
+            mounthAcc.setFee(waybillCountQueryModel.getFee());
+            mounthAcc.setTradeId(waybillCountQueryModel.getTradeId());
+            mounthAcc.setWaybillNum(waybillCountQueryModel.getWaybillNum());
+            mounthAccMapper.insert(mounthAcc);
+        });
+    }
 }

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

@@ -100,9 +100,10 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
             //对不存在的tradeId入表
             if(result!=null && result.size()>0){
                 customerCarRecMapper.selectByETCForLock(tradeRequestVo.getEtcId());
+                SelfCarTrade selfCarTrade;
                 for(CardTradeModel cardTradeModel:result){
-                    SelfCarTrade selfCarTrade =  sellCarTradeMapper.selectByTradeId(cardTradeModel.getTradeId());
-                    if(selfCarTrade == null){
+                    List<SelfCarTrade> selfCarTrades =  sellCarTradeMapper.selectByTradeId(cardTradeModel.getTradeId());
+                    if(selfCarTrades == null || selfCarTrades.size()<=0){
                         selfCarTrade = new SelfCarTrade();
                         selfCarTrade.setInterType(tradeRequestVo.getInterType());
                         selfCarTrade.setCustomId(customerRec.getCustomerName());
@@ -116,6 +117,7 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
                         selfCarTrade.setStatus(tradeRequestVo.getTradeStatus());
                         sellCarTradeMapper.insert(selfCarTrade);
                     }else{
+                        selfCarTrade = selfCarTrades.get(0);
                         if(!selfCarTrade.getStatus().equals(tradeRequestVo.getTradeStatus()) ){
                             selfCarTrade.setStatus(tradeRequestVo.getTradeStatus());
                             selfCarTrade.setInterType(tradeRequestVo.getInterType());
@@ -188,7 +190,7 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
             double needFee = 0;
             //更新交易id申请开票时间，并将转态改为开票中
             for(String tradeId : tradeIds){
-                SelfCarTrade selfCarTrade =  sellCarTradeMapper.selectByTradeId(tradeId);
+                SelfCarTrade selfCarTrade =  sellCarTradeMapper.selectByTradeId(tradeId).get(0);
                 selfCarTrade.setStatus(2);
                 selfCarTrade.setAclTime(DateUtil.getCurrentDateStr());
                 selfCarTrade.setApplId(b2BInvoiceApplyResponse.getApplyId());
@@ -341,7 +343,7 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
                     selfCarInvoice.setEnStation(b2BInvoiceListModel.getEnStationName());
                     selfCarInvoice.setExStation(b2BInvoiceListModel.getExStationName());
                     List<SelfCarInvoice> selfCarInvoice1 = selfCarInvoiceMapper.selectByCodeAndNum(selfCarInvoice);
-                    if(selfCarInvoice1==null){
+                    if(selfCarInvoice1==null || selfCarInvoice1.size()<=0){
                         selfCarInvoiceMapper.insert(selfCarInvoice);
                     }
                 }

src/main/java/com/jkcredit/invoice/service/selfCar/impl/SelfCarTradeServiceImpl.java

@@ -43,7 +43,7 @@ public class SelfCarTradeServiceImpl extends ServiceImpl<SellCarTradeMapper,Self
                 List<SelfCarTrade> cars =  sellCarTradeMapper.selectByCardId(selfCarTrade.getCardId());
                 selfCarTradeTmp.addAll(cars);
             }else if(StringUtils.isEmpty(selfCarTrade.getCardId()) && StringUtils.isNotEmpty(selfCarTrade.getTradeId())){
-                SelfCarTrade car =  sellCarTradeMapper.selectByTradeId(selfCarTrade.getTradeId());
+                SelfCarTrade car =  sellCarTradeMapper.selectByTradeId(selfCarTrade.getTradeId()).get(0);
                 selfCarTradeTmp.add(car);
             }else{
                 return new RespR<>("失败","0");

src/main/resources/logback-spring.xml

@@ -5,11 +5,6 @@
     <!-- 彩色日志格式 -->
     <property name="CONSOLE_LOG_PATTERN"
               value="%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n" />
-    <!-- 彩色日志依赖的渲染类 -->
-    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
-    <conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
-    <conversionRule conversionWord="wEx"
-                    converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" />
     <!-- Console log output -->
     <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
@@ -23,20 +18,21 @@
 
         <!-- rollingPolicy:当发生滚动时，决定 RollingFileAppender 的行为，涉及文件移动和重命名。 -->
         <!-- TimeBasedRollingPolicy： 最常用的滚动策略，它根据时间来制定滚动策略，既负责滚动也负责出发滚动 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
             <!-- 活动文件的名字会根据fileNamePattern的值，每隔一段时间改变一次 -->
             <!-- 文件名：log/sys.2017-12-05.0.log -->
-            <fileNamePattern>${log.path}/logs/system.log.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <fileNamePattern>${log.path}/logs/system.log.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
             <!-- 每产生一个日志文件，该日志文件的保存期限为30天 -->
-            <maxHistory>60</maxHistory>
+            <maxHistory>30</maxHistory>
+            <maxFileSize>10MB</maxFileSize>
         </rollingPolicy>
             <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
                 <pattern>${CONSOLE_LOG_PATTERN}</pattern>
             </encoder>
-            <triggeringPolicy  class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-                <!-- maxFileSize:这是活动文件的大小，默认值是10MB,本篇设置为1KB，只是为了演示 -->
-                <maxFileSize>50M</maxFileSize>
-            </triggeringPolicy>
+           <!-- <triggeringPolicy  class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+                &lt;!&ndash; maxFileSize:这是活动文件的大小，默认值是10MB,本篇设置为1KB，只是为了演示 &ndash;&gt;
+                <maxFileSize>1KB</maxFileSize>
+            </triggeringPolicy>-->
 
     </appender>
     <!-- Level: FATAL 0  ERROR 3  WARN 4  INFO 6  DEBUG 7 -->

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

@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jkcredit.invoice.mapper.calculateInfor.MounthAccMapper">
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.jkcredit.invoice.model.entity.Calculate.MounthAcc">
+        <id column="id" property="id"/>
+        <result column="customId" property="customId"/>
+        <result column="companyName" property="companyName"/>
+        <result column="waybillNum" property="waybillNum"/>
+        <result column="tradeId" property="tradeId"/>
+        <result column="fee" property="fee"/>
+        <result column="exTime" property="exTime"/>
+        <result column="buyerName" property="buyerName"/>
+        <result column="buyerTaxpayerCode" property="buyerTaxpayerCode"/>
+        <result column="enStation" property="enStation"/>
+        <result column="exStation" property="exStation"/>
+    </resultMap>
+
+    <sql id="baseSql">
+        id,
+         customerId,
+          companyName,
+          waybillNum,
+          tradeId,
+          fee,
+          exTime,
+          buyerName,
+          buyerTaxpayerCode,
+          enStation,
+          exStation
+    </sql>
+    <insert id="insert" parameterType="com.jkcredit.invoice.model.entity.Calculate.MounthAcc" >
+        insert into t_mouth_cal (
+         customerId,
+          companyName,
+          waybillNum,
+          tradeId,
+          fee,
+          exTime,
+          buyerName,
+          buyerTaxpayerCode,
+          enStation,
+          exStation
+        )
+        values ( #{customId,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}
+        )
+    </insert>
+    <delete id="deleteAll">
+        delete from t_mouth_cal where 1=1
+    </delete>
+</mapper>

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

@@ -77,12 +77,15 @@
         <include refid="baseSql" />,waybillStatus billStatus,calculateTime
         from t_billInvoice
         <where>
+            <if test="billInvoice.customerName != null and billInvoice.customerName != ''">
+                and  customerName = BINARY #{billInvoice.customerName}
+            </if>
             <if test="billInvoice.companyName != null and billInvoice.companyName != ''">
                 and  companyName = BINARY #{billInvoice.companyName}
             </if>
 
             <if test="billInvoice.waybillNum != null and billInvoice.waybillNum != ''">
-                and  instr(CONCAT(',',#{billInvoice.waybillNum},','),CONCAT(',',waybillNum,','))>0
+                and  waybillNum = BINARY #{billInvoice.waybillNum}
             </if>
             <if test="billInvoice.buyerTaxpayerCode != null and billInvoice.buyerTaxpayerCode != ''">
                 and  buyerTaxpayerCode = BINARY #{billInvoice.buyerTaxpayerCode}
@@ -90,17 +93,11 @@
             <if test="billInvoice.plateNum != null and billInvoice.plateNum != ''">
                 and  plateNum = BINARY #{billInvoice.plateNum}
             </if>
-            <if test="billInvoice.invoiceCode != null and billInvoice.invoiceCode != '' and billInvoice.interType==1">
-                and instr(CONCAT(',',#{billInvoice.invoiceCode},','),CONCAT(',',invoiceCode,','))>0
-            </if>
-            <if test="billInvoice.invoiceCode != null and billInvoice.invoiceCode != '' and billInvoice.interType==5">
+            <if test="billInvoice.invoiceCode != null and billInvoice.invoiceCode != ''">
                 and invoiceCode = #{billInvoice.invoiceCode}
             </if>
-            <if test="billInvoice.invoiceNum != null and billInvoice.invoiceNum != '' and billInvoice.interType==1">
-                and instr(CONCAT(',',#{billInvoice.invoiceNum},','),CONCAT(',',invoiceNum,','))>0
-            </if>
-            <if test="billInvoice.invoiceNum != null and billInvoice.invoiceNum != '' and billInvoice.interType==5">
-                and  invoiceNum = #{billInvoice.invoiceNum}
+            <if test="billInvoice.invoiceNum != null and billInvoice.invoiceNum != ''">
+                and invoiceNum = #{billInvoice.invoiceNum}
             </if>
             <if test="billInvoice.invoiceMakeStart != null and billInvoice.invoiceMakeStart != ''">
                 and invoiceMakeTime BETWEEN #{billInvoice.invoiceMakeStart} and #{billInvoice.invoiceMakeEnd}

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

@@ -61,11 +61,14 @@
             <if test="noCarWayBill.hisFlag != null">
             and hisFlag = #{noCarWayBill.hisFlag,jdbcType=INTEGER}
             </if>
+            <if test="noCarWayBill.customerName != null and noCarWayBill.customerName != ''">
+                and  customerName = BINARY #{noCarWayBill.customerName}
+            </if>
             <if test="noCarWayBill.companyName != null and noCarWayBill.companyName != ''">
                 and  companyName = BINARY #{noCarWayBill.companyName}
             </if>
             <if test="noCarWayBill.billNum != null and noCarWayBill.billNum != '' and noCarWayBill.batchNum != '1'">
-                and   instr(CONCAT(',',#{noCarWayBill.billNum},','),CONCAT(',',billNum,','))>0
+                and  billNum = #{noCarWayBill.billNum}
             </if>
             <if test="noCarWayBill.billNum != null and noCarWayBill.billNum != '' and noCarWayBill.batchNum == '1'">
                 and  billNum = BINARY #{noCarWayBill.billNum}