优化代码提交

src/main/java/com/jkcredit/invoice/SysInvoiceApplication.java

@@ -3,8 +3,12 @@ package com.jkcredit.invoice;
 import com.jkcredit.invoice.credit.SimpleCORSFilter;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.web.server.ConfigurableWebServerFactory;
+import org.springframework.boot.web.server.ErrorPage;
+import org.springframework.boot.web.server.WebServerFactoryCustomizer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Import;
+import org.springframework.http.HttpStatus;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
@@ -28,5 +32,11 @@ public class SysInvoiceApplication {
     public SimpleCORSFilter simpleCORSFilter(){
         return new SimpleCORSFilter();
     }
-
+    @Bean
+    public WebServerFactoryCustomizer<ConfigurableWebServerFactory> webServerFactoryWebServerFactoryCustomizer(){
+        return factory -> {
+            ErrorPage errorPage = new ErrorPage(HttpStatus.NOT_FOUND,"/index.html");
+            factory.addErrorPages(errorPage);
+        };
+    }
 }

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

@@ -24,48 +24,6 @@ import java.util.List;
 public class NoCarServiceController {
     @Autowired
     private NoCarService noCarService;
-
-    /**
-     * @param noCarWayBill
-     * @return
-     */
-    @PostMapping("/noCarBillStart")
-    @ApiOperation(value="实时运单开始指令", notes="实时运单开始指令")
-    //@LoginRequired
-    public RespR noCarBillStart(@RequestBody NoCarWayBill noCarWayBill){
-        return noCarService.noCarWaybillStart(noCarWayBill);
-    }
-    /**
-     * @param noCarWayBill
-     * @return
-     */
-    @PostMapping("/noCarBillEnd")
-    @ApiOperation(value="实时运单结束指令", notes="实时运单结束指令")
-    //@LoginRequired
-    public RespR noCarBillEnd(@RequestBody NoCarWayBill noCarWayBill){
-        return noCarService.noCarWaybillEnd(noCarWayBill);
-    }
-    /**
-     * @param noCarWayBill
-     * @return
-     */
-    @PostMapping("/noCarHisWaybillStart")
-    @ApiOperation(value="历史运单开始指令", notes="用户运单结束指令")
-    //@LoginRequired
-    public RespR noCarHisWaybillStart(@RequestBody NoCarWayBill noCarWayBill){
-        return noCarService.noCarHisWaybillStart(noCarWayBill);
-    }
-    /**
-     * @param noCarWayBill
-     * @return
-     */
-    @PostMapping("/noCarHisWaybillEnd")
-    @ApiOperation(value="历史运单结束指令", notes="历史运单结束指令")
-    //@LoginRequired
-    public RespR noCarHisWaybillEnd(@RequestBody NoCarWayBill noCarWayBill){
-        return noCarService.noCarHisWaybillEnd(noCarWayBill);
-    }
-
     /**
      * @param
      * @return

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

@@ -313,12 +313,12 @@ public class NoCarInterServiceImpl implements NoCarInterService {
                 if(respR.getCode() ==1){
                     noCarWayBill.setFailReason(respR.getMsg());
                     noCarWayBill.setBillwayStatus(-2);
-                    insertOrUpdateBill(noCarWayBill);
+                    insertOrUpdateBill(noCarWayBill,noCarWayBillDb);
                     result.setMsg("车牌号备案失败，失败原因："+respR.getMsg());
                     return result;
                 }
             }
-            RespR rs = noCarService.noCarWaybillStart(noCarWayBill);
+            RespR rs = noCarService.noCarWaybillStart(noCarWayBill,noCarWayBillDb);
             long costtimeend = System.currentTimeMillis();
             log.info("[-NoCarInterServiceImpl.noCarBillStart-] result is "
                     + rs.toString() + ", request is " + data + " ,costtime="
@@ -334,7 +334,7 @@ public class NoCarInterServiceImpl implements NoCarInterService {
                 result.setMsg(rs.getMsg());
                 noCarWayBill.setFailReason(rs.getMsg());
                 noCarWayBill.setBillwayStatus(-2);
-                insertOrUpdateBill(noCarWayBill);
+                insertOrUpdateBill(noCarWayBill,noCarWayBillDb);
                 return result;
             }
         } catch (Exception e) {
@@ -382,6 +382,7 @@ public class NoCarInterServiceImpl implements NoCarInterService {
 
             NoCarWayBill noCarWayBill1 = noCarWaybillMapper.selectByBillNum(num);
             if (null == noCarWayBill1){
+                log.info("chongfuyundanhao1:"+num);
                 result.setMsg("运单开始指令还未上传!");
                 return result;
             }
@@ -396,7 +397,7 @@ public class NoCarInterServiceImpl implements NoCarInterService {
             noCarWayBill.setInterType(0);//接口
             noCarWayBill.setUpdateTime(DateUtil.getCurrentDateStr());
             noCarWayBill.setInterfaceEndTime(DateUtil.getCurrentDateStr());
-            RespR rs = noCarService.noCarWaybillEnd(noCarWayBill);
+            RespR rs = noCarService.noCarWaybillEnd(noCarWayBill,noCarWayBill1);
             long costtimeend = System.currentTimeMillis();
             log.info("[-NoCarInterServiceImpl.noCarBillEnd-] result is "
                     + rs.toString() + ", request is " + data + " ,costtime="
@@ -498,6 +499,7 @@ public class NoCarInterServiceImpl implements NoCarInterService {
             NoCarWayBill noCarWayBillDb = noCarWaybillMapper.selectByBillNum(noCarWayBill.getBillNum());
 
             if(noCarWayBillDb!=null && (noCarWayBillDb.getBillwayStatus() == 1||noCarWayBillDb.getBillwayStatus() == 2 || noCarWayBillDb.getBillwayStatus() == 3 || noCarWayBillDb.getBillwayStatus() == 4)) {
+                log.info("chongfuyundanhao1:"+noCarWayBillDb.getBillNum());
                 result.setMsg("运单号重复");
                 return result;
             }
@@ -521,11 +523,11 @@ public class NoCarInterServiceImpl implements NoCarInterService {
                     result.setMsg("车牌号备案失败，失败原因："+respR.getMsg());
                     noCarWayBill.setFailReason(respR.getMsg());
                     noCarWayBill.setBillwayStatus(-2);
-                    insertOrUpdateBill(noCarWayBill);
+                    insertOrUpdateBill(noCarWayBill,noCarWayBillDb);
                     return result;
                 }
             }
-            RespR rs = noCarService.noCarHisWaybillStart(noCarWayBill);
+            RespR rs = noCarService.noCarHisWaybillStart(noCarWayBill,noCarWayBillDb);
             long costtimeend = System.currentTimeMillis();
             log.info("[-NoCarInterServiceImpl.noCarHisWaybillStart-] result is "
                     + rs.toString() + ", request is " + data + " ,costtime="
@@ -542,7 +544,7 @@ public class NoCarInterServiceImpl implements NoCarInterService {
                 result.setMsg(rs.getMsg());
                 noCarWayBill.setFailReason(rs.getMsg());
                 noCarWayBill.setBillwayStatus(-2);
-                insertOrUpdateBill(noCarWayBill);
+                insertOrUpdateBill(noCarWayBill,noCarWayBillDb);
                 return result;
             }
         } catch (Exception e) {
@@ -553,9 +555,9 @@ public class NoCarInterServiceImpl implements NoCarInterService {
     }
 
     //插入或者更新运单
-    public void insertOrUpdateBill(NoCarWayBill noCarWayBill){
+    public void insertOrUpdateBill(NoCarWayBill noCarWayBill,NoCarWayBill noCarWayBillDb){
 
-        if(noCarWaybillMapper.selectByBillNum(noCarWayBill.getBillNum()) == null){
+        if(noCarWayBillDb == null){
             noCarWaybillMapper.insert(noCarWayBill);
         }else{
             noCarWaybillMapper.updateByBillNum(noCarWayBill);
@@ -614,7 +616,7 @@ public class NoCarInterServiceImpl implements NoCarInterService {
             noCarWayBill.setInterType(0);//接口
             noCarWayBill.setUpdateTime(DateUtil.getCurrentDateStr());
             noCarWayBill.setInterfaceEndTime(DateUtil.getCurrentDateStr());
-            RespR rs = noCarService.noCarHisWaybillEnd(noCarWayBill);
+            RespR rs = noCarService.noCarHisWaybillEnd(noCarWayBill,noCarWayBill1);
             long costtimeend = System.currentTimeMillis();
             log.info("[-NoCarInterServiceImpl.noCarHisWaybillEnd-] result is "
                     + rs.toString() + ", request is " + data + " ,costtime="

src/main/java/com/jkcredit/invoice/mapper/customer/CustomerMapper.java

@@ -19,7 +19,7 @@ public interface CustomerMapper extends BaseMapper<Customer> {
     Customer selectByPrimaryKey(Integer id);
 
     Customer selectByCustomerName(String  customerName);
-
+    Customer selectByCustomerNameForLock(String  customerName);
     int updateByPrimaryKeySelective(Customer record);
 
     int updateByPrimaryKey(Customer record);

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

@@ -1,5 +1,7 @@
 package com.jkcredit.invoice.model.entity.Calculate;
 
+import java.util.Objects;
+
 /**
  * 无车计费信息
  */
@@ -182,6 +184,20 @@ public class NoCarCalculateInfor {
     }
 
     @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        NoCarCalculateInfor that = (NoCarCalculateInfor) o;
+        return Objects.equals(tradeId, that.tradeId);
+    }
+
+    @Override
+    public int hashCode() {
+
+        return Objects.hash(tradeId);
+    }
+
+    @Override
     public String toString() {
         return "NoCarCalculateInfor{" +
                 "Id=" + Id +

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

@@ -38,25 +38,25 @@ public interface NoCarService {
      * 运单指令开始
      * @return
      */
-    RespR noCarWaybillStart(NoCarWayBill noCarWayBill);
+    RespR noCarWaybillStart(NoCarWayBill noCarWayBill,NoCarWayBill noCarWayBillDb);
 
     /**
      * 运单指令结束
      * @return
      */
-    RespR noCarWaybillEnd(NoCarWayBill noCarWayBill);
+    RespR noCarWaybillEnd(NoCarWayBill noCarWayBill,NoCarWayBill noCarWayBillDb);
 
     /**
      * 历史运单指令开始
      * @return
      */
-    RespR noCarHisWaybillStart(NoCarWayBill noCarWayBill);
+    RespR noCarHisWaybillStart(NoCarWayBill noCarWayBill,NoCarWayBill noCarWayBillDb);
 
     /**
      * 历史运单指令结束
      * @return
      */
-    RespR noCarHisWaybillEnd(NoCarWayBill noCarWayBill);
+    RespR noCarHisWaybillEnd(NoCarWayBill noCarWayBill,NoCarWayBill noCarWayBillDb);
 
     /**
      * 获取发票和运单状态 true 实时 false 走本地

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

@@ -36,8 +36,7 @@ import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -215,7 +214,7 @@ public class NoCarServiceImpl implements NoCarService{
     }
 
     @Override
-    public RespR noCarWaybillStart(NoCarWayBill noCarWayBill) {
+    public RespR noCarWaybillStart(NoCarWayBill noCarWayBill,NoCarWayBill noCarWayBillDb) {
         log.info("运单上传开始：NoCarServiceImpl.noCarWaybillStart{}",noCarWayBill);
         //如果运单时间和当前时间差了三天，直接返回
         if(DateUtil.getDistanceHours(noCarWayBill.getStartTime(),new Date())<-72){
@@ -240,14 +239,14 @@ public class NoCarServiceImpl implements NoCarService{
             noCarWayBill.setUpdateTime(DateUtil.getCurrentDateStr());
             noCarWayBill.setHisFlag(0);
             noCarWayBill.setBillwayStatus(1);
-            insertOrUpdateBill(noCarWayBill);
+            insertOrUpdateBill(noCarWayBill,noCarWayBillDb);
         }
         return new RespR(responseRespR.getData());
     }
     //插入或者更新运单
-    public void insertOrUpdateBill(NoCarWayBill noCarWayBill){
+    public void insertOrUpdateBill(NoCarWayBill noCarWayBill,NoCarWayBill noCarWayBillDb){
 
-        if(noCarWaybillMapper.selectByBillNum(noCarWayBill.getBillNum()) == null){
+        if(noCarWayBillDb == null){
             noCarWaybillMapper.insert(noCarWayBill);
         }else{
             noCarWaybillMapper.updateByBillNum(noCarWayBill);
@@ -298,11 +297,8 @@ public class NoCarServiceImpl implements NoCarService{
         return new RespR();
     }
     @Override
-    public RespR noCarWaybillEnd(NoCarWayBill noCarWayBill) {
+    public RespR noCarWaybillEnd(NoCarWayBill noCarWayBill,NoCarWayBill noCarWayBill1) {
         log.info("运单结束开始：NoCarServiceImpl.noCarWaybillEnd{}",noCarWayBill);
-        //查询运单号为开始指令
-        NoCarWayBill noCarWayBill1 = noCarWaybillMapper.selectByBillNum(noCarWayBill.getBillNum());
-
         if(noCarWayBill1 == null || noCarWayBill1.getBillwayStatus() !=1 || noCarWayBill1.getHisFlag() ==1 ){
             log.info("运单结束失败：NoCarServiceImpl.noCarWaybillEnd{},msg{}",noCarWayBill,"当前运单状态无法结束,请检查当前指令状态");
             noCarWayBill.setFailReason("当前运单状态无法结束,请检查当前指令状态");
@@ -348,10 +344,8 @@ public class NoCarServiceImpl implements NoCarService{
     }
 
     @Override
-    public RespR noCarHisWaybillStart(NoCarWayBill noCarWayBill) {
+    public RespR noCarHisWaybillStart(NoCarWayBill noCarWayBill,NoCarWayBill noCarWayBill1) {
         log.info("历史运单开始上传：NoCarServiceImpl.noCarHisWaybillStart{},msg{}",noCarWayBill,"开始");
-        NoCarWayBill noCarWayBill1 = noCarWaybillMapper.selectByBillNum(noCarWayBill.getBillNum());
-
         if(noCarWayBill1!=null && noCarWayBill1.getBillwayStatus() ==1){
             return new RespR(false,"运单号重复");
         }
@@ -360,8 +354,7 @@ public class NoCarServiceImpl implements NoCarService{
             return new RespR(false,"失败，运单未满20天时效");
         }
         if((DateUtil.getDistanceHours(noCarWayBill.getStartTime(),DateUtil.StringToDate(noCarWayBill.getPredictEndTime()))<-96) && (noCarWayBill.getInterType() != 0)){
-            log.info("运单结束失败：NoCarServiceImpl.noCarWaybillStart{},msg{}",noCarWayBill,"运单已经超时，请拆分");
-            noCarWaybillMapper.updateByBillNum(noCarWayBill1);
+            log.info("历史运单开始上传失败：NoCarServiceImpl.noCarWaybillStart{},msg{}",noCarWayBill,"运单已经超时，请拆分");
             return new RespR(false,"失败，承运时长超96小时");
         }
 
@@ -381,7 +374,7 @@ public class NoCarServiceImpl implements NoCarService{
             noCarWayBill.setUpdateTime(DateUtil.getCurrentDateStr());
             noCarWayBill.setHisFlag(1);
             noCarWayBill.setBillwayStatus(1);
-            insertOrUpdateBill(noCarWayBill);
+            insertOrUpdateBill(noCarWayBill,noCarWayBill1);
         }
         return new RespR(responseRespR.getData());
     }
@@ -408,10 +401,8 @@ public class NoCarServiceImpl implements NoCarService{
         return waybillStartRequest;
     }
     @Override
-    public RespR noCarHisWaybillEnd(NoCarWayBill noCarWayBill) {
+    public RespR noCarHisWaybillEnd(NoCarWayBill noCarWayBill,NoCarWayBill noCarWayBill1) {
         log.info("历史运单结束上传：NoCarServiceImpl.noCarHisWaybillEnd{},msg{}",noCarWayBill,"开始");
-        //查询运单号为开始指令
-        NoCarWayBill noCarWayBill1 = noCarWaybillMapper.selectByBillNum(noCarWayBill.getBillNum());
         if(noCarWayBill1 == null || noCarWayBill1.getBillwayStatus() !=1 || noCarWayBill.getHisFlag() ==0 || noCarWayBill1.getBillwayStatus() == -3 ){
             log.info("运单结束失败：NoCarServiceImpl.noCarWaybillEnd{},msg{}",noCarWayBill,"当前运单状态无法结束,请检查当前指令状态");
             noCarWayBill.setFailReason("当前运单状态无法结束,请检查当前指令状态");
@@ -452,7 +443,26 @@ public class NoCarServiceImpl implements NoCarService{
         noCarWaybillMapper.updateByBillNum(noCarWayBill1);
         return new RespR(waybillEndResponseRespR.getData());
     }
-
+    public WaybillNumFindInvoiceResponse buildInterFaceVoiceData(NoCarWayBill noCarWayBill,List<BillInvoice> billInvoices){
+        WaybillNumFindInvoiceResponse waybillNumFindInvoiceResponse = new WaybillNumFindInvoiceResponse();
+        List<InvoiceProcessingListModel> invoiceProcessingListModels = new ArrayList<>();
+        if(billInvoices != null && billInvoices.size()>0){
+            billInvoices.stream().forEach(billInvoice -> {
+                InvoiceProcessingListModel invoiceProcessingListModel = new InvoiceProcessingListModel();
+                BeanUtils.copyProperties(billInvoice,invoiceProcessingListModel);
+                invoiceProcessingListModels.add(invoiceProcessingListModel);
+            });
+        }
+        waybillNumFindInvoiceResponse.setResult(invoiceProcessingListModels);
+        waybillNumFindInvoiceResponse.setPlateNum(noCarWayBill.getPlateNum());
+        waybillNumFindInvoiceResponse.setInfo("成功");
+        waybillNumFindInvoiceResponse.setWaybillStartTime(noCarWayBill.getStartTime());
+        waybillNumFindInvoiceResponse.setWaybillEndTime(noCarWayBill.getPredictEndTime());
+        waybillNumFindInvoiceResponse.setWaybillStatus(3);
+        waybillNumFindInvoiceResponse.setReceiveTime(DateUtil.getCurrentDateStr());
+        waybillNumFindInvoiceResponse.setWaybillNum(noCarWayBill.getBillNum());
+        return waybillNumFindInvoiceResponse;
+    }
     @Override
     @Transactional
     public RespR getInvoiceByWayBillNumReal(NoCarWayBill noCarWayBill, boolean isCurr) {
@@ -460,10 +470,16 @@ public class NoCarServiceImpl implements NoCarService{
         NoCarWayBill noCarWayBillDb = noCarWaybillMapper.selectByBillNum(noCarWayBill.getBillNum());
         if(null == noCarWayBillDb){
             log.info("取票失败啦：NoCarServiceImpl.getInvoiceByWayBillNumReal{},isCurr{},msg{}",noCarWayBill,isCurr,"运单号异常,无法开票");
-            return new RespR(false,"运单号异常,无法开票");
+            return new RespR(false,"运单状态异常,无法开票");
         }
+       if(noCarWayBillDb.getBillwayStatus() == 3){
+            //直接返回发票信息
+            List<BillInvoice> billInvoices = billInvoiceMapper.selectByBillNum(noCarWayBill.getBillNum());
+            if(noCarWayBill.getInterType() == 0){
+                return new RespR(buildInterFaceVoiceData(noCarWayBill,billInvoices));
+            }
 
-
+        }
         RespR respR = checkCarWayBillAndSetInfo(noCarWayBill);
         if(respR.getCode() == 1){
             log.info("取票失败啦：NoCarServiceImpl.getInvoiceByWayBillNumReal{},isCurr{},msg{}",noCarWayBill,isCurr,respR.getMsg());
@@ -474,18 +490,6 @@ public class NoCarServiceImpl implements NoCarService{
             log.info("取票失败啦：NoCarServiceImpl.getInvoiceByWayBillNumReal{},isCurr{},msg{}",noCarWayBill,isCurr,"运单转态,无法开票");
             return new RespR(false,"运单状态无法开票");
         }
-        if(!isCurr){
-            //查询本地数据库 如果有发票直接返回
-           List<BillInvoice> billInvoices = billInvoiceMapper.selectByBillNum(noCarWayBill.getBillNum());
-           if(billInvoices!=null && billInvoices.size()>0){
-               return new RespR(billInvoices);
-           }
-        }
-       if(noCarWayBillDb.getBillwayStatus() == 3 && noCarWayBill.getInterType() != 0 ){
-            //直接返回发票信息
-            List<BillInvoice> billInvoices = billInvoiceMapper.selectByBillNum(noCarWayBill.getBillNum());
-            return new RespR(billInvoices);
-        }
         //进行取票操作
         WaybillNumFindInvoiceRequest waybillNumFindInvoiceRequest = new WaybillNumFindInvoiceRequest();
         String companyNum = paramService.getParamsByParamName("REQUEST_COMPANY_NUM").getParamValue();
@@ -506,6 +510,8 @@ public class NoCarServiceImpl implements NoCarService{
                 billInvoiceMapper.deleteByBillNum(noCarWayBill.getBillNum());
                 //发票入库
                 List<InvoiceProcessingListModel> invoiceProcessingListModels = responseRespR.getData().getResult();
+                //用set来去重计费信息
+                Set<NoCarCalculateInfor> carCalculateInfors = new HashSet<>();
                 invoiceProcessingListModels.stream().forEach(invoiceProcessingListModel -> {
                     BillInvoice billInvoice = buildFromInvoiceProcessingListModel(invoiceProcessingListModel);
                     billInvoice.setCompanyName(noCarWayBillDb.getCompanyName());
@@ -520,25 +526,36 @@ public class NoCarServiceImpl implements NoCarService{
                     calculateInfor.setBuyerName(invoiceProcessingListModel.getBuyerName());
                     calculateInfor.setBuyerTaxpayerCode(invoiceProcessingListModel.getBuyerTaxpayerCode());
                     calculateInfor.setInvoiceMakeTime(invoiceProcessingListModel.getInvoiceMakeTime());
-                    Param param = paramService.getParamsByParamName("CUST_NOCAR_FEE");
-                    Double fee = Double.parseDouble(param.getParamValue());
-                    calculateInfor.setFee(fee);
                     calculateInfor.setTradeId(billInvoice.getTransactionId());
-                    //先查询数据库中有没有这个交易id
                     NoCarCalculateInfor noCarCalculateInfor = calculateInforMapper.selectByTradeId(billInvoice.getTransactionId());
-                    if(noCarCalculateInfor==null){
-                        Customer customer = customerMapper.selectByCustomerName(noCarWayBill.getCustomerName());
-                        customer.setInvoiceTime(DateUtil.getCurrentDateStr());
-                        customer.setAccountBalance(MathUtil.sub(customer.getAccountBalance(),calculateInfor.getFee()));
-                        customerMapper.updateByPrimaryKeySelective(customer);
-                        calculateInfor.setCompanyLongName(customer.getCompany());
-                        calculateInforMapper.insert(calculateInfor);
-                        billInvoice.setCalculateTime(calculateInfor.getCalculateTime());
-                    }else{
+                    if(noCarCalculateInfor!=null){
                         billInvoice.setCalculateTime(noCarCalculateInfor.getCalculateTime());
+                    }else{
+                        if(carCalculateInfors.add(calculateInfor)){
+                            billInvoice.setCalculateTime(calculateInfor.getCalculateTime());
+                        }
                     }
+
                     billInvoiceMapper.insert(billInvoice);
                 });
+                //统一插入交易id 和 和计费信息
+                Param param = paramService.getParamsByParamName("CUST_NOCAR_FEE");
+                Double fee = Double.parseDouble(param.getParamValue());
+                Customer customer = customerMapper.selectByCustomerNameForLock(noCarWayBill.getCustomerName());
+                customer.setInvoiceTime(DateUtil.getCurrentDateStr());
+                carCalculateInfors.stream().forEach(calculateInfor -> {
+                    try {
+                        calculateInfor.setCompanyLongName(customer.getCompany());
+                        calculateInfor.setFee(fee);
+                        calculateInforMapper.insert(calculateInfor);
+                        customer.setAccountBalance(MathUtil.sub(customer.getAccountBalance(),calculateInfor.getFee()));
+                    }catch (Exception e){
+                        log.error("重复数据来啦"+calculateInfor.getTradeId());
+                    }
+
+
+                });
+                customerMapper.updateByPrimaryKeySelective(customer);
                 if(noCarWayBill.getInterType() == 0){
                     return new RespR(responseRespR.getData());
                 }

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

@@ -137,7 +137,7 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
             log.info("申请开票失败SelfCarServiceLImpl.applInvoice{},msg{}",invoiceApplVo,"余额不足");
             return new RespR(false,"余额不足");
         }
-        Customer customer = customerMapper.selectByCustomerName(invoiceApplVo.getCustomerName());
+        Customer customer = customerMapper.selectByCustomerNameForLock(invoiceApplVo.getCustomerName());
         if(customer == null || customer.getAccstatus().intValue() == 1){
             log.info("申请开票失败SelfCarServiceLImpl.applInvoice{},msg{}",invoiceApplVo,"客户已经停用");
             return new RespR(false,"客户已经停用");

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

@@ -59,9 +59,9 @@ public class NoCarBillWayServiceImpl extends ServiceImpl<NoCarWaybillMapper,NoCa
         return noCarWaybillMapper.selectAllByPageException(page,noCarWayBill);
     }
     //插入或者更新运单
-    public void insertOrUpdateBill(NoCarWayBill noCarWayBill){
+    public void insertOrUpdateBill(NoCarWayBill noCarWayBill,NoCarWayBill noCarWayBillDb){
 
-        if(noCarWaybillMapper.selectByBillNum(noCarWayBill.getBillNum()) == null){
+        if(noCarWayBillDb == null){
             noCarWaybillMapper.insert(noCarWayBill);
         }else{
             noCarWaybillMapper.updateByBillNum(noCarWayBill);
@@ -100,18 +100,18 @@ public class NoCarBillWayServiceImpl extends ServiceImpl<NoCarWaybillMapper,NoCa
                         noCarWaybillMapperImprt.updateBillway(-2,"企业税号未备案",noCarWayBill);
                         noCarWayBill.setFailReason("企业税号未备案");
                         noCarWayBill.setBillwayStatus(-2);
-                        insertOrUpdateBill(noCarWayBill);
+                        insertOrUpdateBill(noCarWayBill,noCarWayBillDb);
                         stringBuffer.append("#").append(noCarWayBill.getBillNum()).append(":").append("企业税号未备案#");
                         return;
                     }
                     noCarWayBill.setCompanyName(customerRec.getCompanyName());
                     noCarWayBill.setCompanyNum(customerRec.getCompanyNum());
-                    insertOrUpdateBill(noCarWayBill);
+                    insertOrUpdateBill(noCarWayBill,noCarWayBillDb);
                     if(DateUtil.getDistanceHours(noCarWayBill.getStartTime(),new Date())<-72){
                         noCarWaybillMapperImprt.updateBillway(-2,"失败，运单开始时间超72小时#",noCarWayBill);
                         noCarWayBill.setBillwayStatus(-2);
                         noCarWayBill.setFailReason("失败，运单开始时间超72小时");
-                        insertOrUpdateBill(noCarWayBill);
+                        insertOrUpdateBill(noCarWayBill,noCarWayBillDb);
                         return;
 
                     }
@@ -120,7 +120,7 @@ public class NoCarBillWayServiceImpl extends ServiceImpl<NoCarWaybillMapper,NoCa
                         noCarWaybillMapperImprt.updateBillway(-2,"失败，承运时长超96小时#",noCarWayBill);
                         noCarWayBill.setBillwayStatus(-2);
                         noCarWayBill.setFailReason("失败，承运时长超96小时");
-                        insertOrUpdateBill(noCarWayBill);
+                        insertOrUpdateBill(noCarWayBill,noCarWayBillDb);
                         return;
                     }
                     //1.查询是否有车辆备案
@@ -149,7 +149,7 @@ public class NoCarBillWayServiceImpl extends ServiceImpl<NoCarWaybillMapper,NoCa
                                 noCarWaybillMapperImprt.updateBillway(-2,respR.getMsg(),noCarWayBill);
                                 noCarWayBill.setBillwayStatus(-2);
                                 noCarWayBill.setFailReason(respR.getMsg());
-                                insertOrUpdateBill(noCarWayBill);
+                                insertOrUpdateBill(noCarWayBill,noCarWayBillDb);
                                 return;
                             }
                         }
@@ -157,12 +157,12 @@ public class NoCarBillWayServiceImpl extends ServiceImpl<NoCarWaybillMapper,NoCa
 
 
                     //3.进行上传
-                    RespR respR = noCarService.noCarWaybillStart(noCarWayBill);
+                    RespR respR = noCarService.noCarWaybillStart(noCarWayBill,noCarWayBillDb);
                     if (respR.getCode() == 1){
                         noCarWaybillMapperImprt.updateBillway(-2,respR.getMsg(),noCarWayBill);
                         noCarWayBill.setBillwayStatus(-2);
                         noCarWayBill.setFailReason(respR.getMsg());
-                        insertOrUpdateBill(noCarWayBill);
+                        insertOrUpdateBill(noCarWayBill,noCarWayBillDb);
                         stringBuffer.append("#").append(noCarWayBill.getBillNum()).append(":").append(respR.getMsg()).append("#");
                     }else{
                         noCarWaybillMapperImprt.updateBillway(1,"",noCarWayBill);
@@ -217,25 +217,23 @@ public class NoCarBillWayServiceImpl extends ServiceImpl<NoCarWaybillMapper,NoCa
                             noCarWaybillMapperImprt.updateBillway(-2,"企业税号未备案#",noCarWayBill);
                             noCarWayBill.setBillwayStatus(-2);
                             noCarWayBill.setFailReason("企业税号未备案");
-                            insertOrUpdateBill(noCarWayBill);
+                            insertOrUpdateBill(noCarWayBill,noCarWayBillDb);
                             return;
                         }
                         noCarWayBill.setCompanyName(customerRec.getCompanyName());
                         noCarWayBill.setCompanyNum(customerRec.getCompanyNum());
-
-                        insertOrUpdateBill(noCarWayBill);
-
                         if(DateUtil.getDistanceDays(noCarWayBill.getStartTime(),new Date())>-20){
                             log.info("历史运单开始上传失败：NoCarServiceImpl.noCarHisWaybillStart{},msg{}",noCarWayBill,"必须是二十天前的运单");
                             noCarWayBill.setBillwayStatus(-2);
                             noCarWayBill.setFailReason("失败，运单未满20天时效");
                             noCarWaybillMapperImprt.updateBillway(-2,"失败，运单未满20天时效#",noCarWayBill);
-                            insertOrUpdateBill(noCarWayBill);
+                            insertOrUpdateBill(noCarWayBill,noCarWayBillDb);
                             return;
                         }
                         if(DateUtil.getDistanceHours(noCarWayBill.getStartTime(),DateUtil.StringToDate(noCarWayBill.getPredictEndTime()))<-96){
                             noCarWayBill.setBillwayStatus(-2);
                             noCarWayBill.setFailReason("运单已经超时，请拆分");
+                            insertOrUpdateBill(noCarWayBill,noCarWayBillDb);
                             noCarWaybillMapperImprt.updateBillway(-2,"运单已经超时，请拆分#",noCarWayBill);
                             log.info("运单结束失败：NoCarServiceImpl.noCarWaybillStart{},msg{}",noCarWayBill,"运单已经超时，请拆分");
                             return;
@@ -263,7 +261,7 @@ public class NoCarBillWayServiceImpl extends ServiceImpl<NoCarWaybillMapper,NoCa
                                     stringBuffer.append("#").append(noCarWayBill.getBillNum()).append(":").append(respR.getMsg()).append("#");
                                     noCarWayBill.setBillwayStatus(-2);
                                     noCarWayBill.setFailReason(respR.getMsg());
-                                    insertOrUpdateBill(noCarWayBill);
+                                    insertOrUpdateBill(noCarWayBill,noCarWayBillDb);
                                     return;
                                 }
                             }
@@ -279,18 +277,18 @@ public class NoCarBillWayServiceImpl extends ServiceImpl<NoCarWaybillMapper,NoCa
                             noCarWayBillClo = noCarWayBill;
                         }
 
-                        RespR respR = noCarService.noCarHisWaybillStart(noCarWayBill);
+                        RespR respR = noCarService.noCarHisWaybillStart(noCarWayBill,noCarWayBillDb);
                         if (respR.getCode() == 1){
                             stringBuffer.append("#").append(noCarWayBill.getBillNum()).append(":").append(respR.getMsg()).append("#");
                             noCarWaybillMapperImprt.updateBillway(-2,respR.getMsg(),noCarWayBill);
                             noCarWayBill.setBillwayStatus(-2);
                             noCarWayBill.setFailReason(respR.getMsg());
-                            insertOrUpdateBill(noCarWayBill);
+                            insertOrUpdateBill(noCarWayBill,noCarWayBillDb);
                             log.info(noCarWayBill.getBillNum()+"#开始指令失败"+respR.getMsg());
                         }else{
                             log.info(noCarWayBill.getBillNum()+"#开始指令成功"+respR.getMsg());
                             //3.kais指令上传
-                            respR = noCarService.noCarHisWaybillEnd(noCarWayBillClo);
+                            respR = noCarService.noCarHisWaybillEnd(noCarWayBillClo,noCarWayBillClo);
 
                             if(respR.getCode() == 1){
                                 noCarWaybillMapperImprt.updateBillway(1,respR.getMsg(),noCarWayBill);
@@ -337,7 +335,8 @@ public class NoCarBillWayServiceImpl extends ServiceImpl<NoCarWaybillMapper,NoCa
                         noCarWayBill.setUpdateTime(DateUtil.getCurrentDateStr());
                         noCarWayBill.setHisFlag(0);
                         noCarWaybillMapperImprt.insertImport(noCarWayBill);
-                        RespR respR = noCarService.noCarWaybillEnd(noCarWayBill);
+                        NoCarWayBill noCarWayBillDb = noCarWaybillMapper.selectByBillNum(noCarWayBill.getBillNum());
+                        RespR respR = noCarService.noCarWaybillEnd(noCarWayBill,noCarWayBillDb);
                         if (respR.getCode() == 1){
                             noCarWaybillMapperImprt.updateBillway(-2,respR.getMsg(),noCarWayBill);
                             stringBuffer.append("#").append(noCarWayBill.getBillNum()).append(":").append(respR.getMsg()).append("#");

src/main/java/com/jkcredit/invoice/task/ScheduledBillTask.java

@@ -77,7 +77,7 @@ public class ScheduledBillTask {
         carWayBill.setBillwayStatus(2);
         List<NoCarWayBill> noCarWayBillsMdEnd = noCarWaybillMapper.selectByHisFlagAndBillStatus(carWayBill);
         if(noCarWayBillsMdEnd!=null && noCarWayBillsMdEnd.size()>0){
-            noCarWayBillsMdEnd.stream().forEach(noCarWayBill -> {
+            noCarWayBillsMdEnd.parallelStream().forEach(noCarWayBill -> {
                 noCarService.getInvoiceByWayBillNumReal(noCarWayBill,true);
             });
         }

src/main/resources/mapper/customer/CustomerCarRecMapper.xml

@@ -31,25 +31,25 @@
     from  t_customer_carRec
     <where>
       <if test="query.customerName != null">
-        BINARY customer_name = #{query.customerName,jdbcType=VARCHAR}
+         customer_name = BINARY #{query.customerName,jdbcType=VARCHAR}
       </if>
       <if test="query.carNum != null and query.carNum != ''">
-        and BINARY car_num = #{query.carNum}
+        and  car_num = BINARY #{query.carNum}
       </if>
       <if test="query.companyName != null and query.companyName != ''">
-        and BINARY company_name LIKE CONCAT('%',#{query.companyName},'%')
+        and  company_name BINARY LIKE CONCAT('%',#{query.companyName},'%')
       </if>
       <if test="query.companyNum != null and query.companyNum != ''">
-        and BINARY companyNum = #{query.companyNum}
+        and  companyNum = BINARY #{query.companyNum}
       </if>
       <if test="query.etcNum != null and query.etcNum != ''">
-        and BINARY etc_num = #{query.etcNum}
+        and  etc_num = BINARY #{query.etcNum}
       </if>
       <if test="query.recStatus != null and query.recStatus != ''">
         and rec_status = (#{query.recStatus}-1)
       </if>
       <if test="query.businessType != null and query.businessType != ''">
-        and BINARY bussiness_type = #{query.businessType}
+        and  bussiness_type = BINARY #{query.businessType}
       </if>
       <if test="query.startTime != null and query.startTime != ''">
         and (succ_time BETWEEN #{query.startTime} and #{query.endTime}
@@ -64,40 +64,40 @@
     select 
     <include refid="Base_Column_List" />
     from t_customer_carRec
-    where BINARY customer_name = #{customerName,jdbcType=VARCHAR}
+    where  customer_name = BINARY #{customerName,jdbcType=VARCHAR}
   </select>
   <select id="selectByCarNum" parameterType="java.lang.String" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List" />
     from t_customer_carRec
-    where BINARY car_num = #{carNum,jdbcType=VARCHAR} and bussiness_type=2
+    where  car_num = BINARY #{carNum,jdbcType=VARCHAR} and bussiness_type=2
   </select>
   <select id="selectBySelfCarNum" parameterType="java.lang.String" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List" />
     from t_customer_carRec
-    where BINARY car_num = #{carNum,jdbcType=VARCHAR} and bussiness_type=0 and rec_status = 1
+    where  car_num = BINARY #{carNum,jdbcType=VARCHAR} and bussiness_type=0 and rec_status = 1
   </select>
   <select id="selectAllEtcBySelfCarNum" parameterType="java.lang.String" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List" />
     from t_customer_carRec
-    where BINARY car_num = #{carNum,jdbcType=VARCHAR} and bussiness_type=0
+    where  car_num = BINARY #{carNum,jdbcType=VARCHAR} and bussiness_type=0
   </select>
   <select id="selectByETC" parameterType="java.lang.String" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List" />
     from t_customer_carRec
-    where BINARY etc_num = #{etcNum,jdbcType=VARCHAR} AND bussiness_type=0
+    where  etc_num = BINARY #{etcNum,jdbcType=VARCHAR} AND bussiness_type=0
   </select>
   <update id="updateWaitETCStatus" parameterType="com.jkcredit.invoice.model.entity.customer.CustomerCarRec">
     update t_customer_carRec set rec_status = #{recStatus,jdbcType=INTEGER} ,succ_time = #{succTime,jdbcType=VARCHAR}, fail_time = #{failTime,jdbcType=VARCHAR}
     , fail_reason = #{failReason,jdbcType=VARCHAR}, inter_type = #{interType,jdbcType=VARCHAR}
-    where BINARY companyNum = #{companyNum,jdbcType=VARCHAR} and BINARY cust_phone = #{custPhone,jdbcType=VARCHAR} AND bussiness_type=0 and rec_status = 3
+    where  companyNum = BINARY #{companyNum,jdbcType=VARCHAR} and BINARY cust_phone = #{custPhone,jdbcType=VARCHAR} AND bussiness_type=0 and rec_status = 3
   </update>
   <delete id="selectByCustomerName" parameterType="java.lang.String">
     delete from t_customer_carRec
-    where BINARY customer_name = #{customerName,jdbcType=VARCHAR}
+    where  customer_name = BINARY #{customerName,jdbcType=VARCHAR}
   </delete>
   <insert id="insert" parameterType="com.jkcredit.invoice.model.entity.customer.CustomerCarRec">
     insert into t_customer_carRec (customer_name,companyNum, company_name, car_num,
@@ -231,7 +231,7 @@
         company_name = #{companyName,jdbcType=VARCHAR},
       </if>
       <if test="carNum != null">
-        BINARY car_num = #{carNum,jdbcType=VARCHAR},
+         car_num = #{carNum,jdbcType=VARCHAR},
       </if>
       <if test="carColor != null">
         car_color = #{carColor,jdbcType=VARCHAR},

src/main/resources/mapper/customer/CustomerMapper.xml

@@ -96,6 +96,12 @@
     from t_customer
     where  customer_name = BINARY #{customerName,jdbcType=VARCHAR}
   </select>
+  <select id="selectByCustomerNameForLock" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select
+    <include refid="Base_Column_List" />
+    from t_customer
+    where  customer_name = BINARY #{customerName,jdbcType=VARCHAR} lock in share mode
+  </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
     delete from t_customer
     where id = #{id,jdbcType=INTEGER}

src/main/resources/mapper/customer/CustomerRecMapper.xml

@@ -43,16 +43,16 @@
     from t_customer_rec
     <where>
     <if test="customerRec.customerName != null and customerRec.customerName != ''">
-      AND  BINARY customerName =#{customerRec.customerName}
+      AND   customerName = BINARY #{customerRec.customerName}
     </if>
     <if test="customerRec.companyLeaderPhone != null and customerRec.companyLeaderPhone != ''">
-      and BINARY company_leader_Phone = #{customerRec.companyLeaderPhone}
+      and  company_leader_Phone = BINARY #{customerRec.companyLeaderPhone}
     </if>
     <if test="customerRec.companyReferencenum != null and customerRec.companyReferencenum != ''">
-      and BINARY company_referenceNum = #{customerRec.companyReferencenum}
+      and  company_referenceNum = BINARY #{customerRec.companyReferencenum}
     </if>
     <if test="customerRec.companyName != null and customerRec.companyName != ''">
-      and BINARY company_name LIKE CONCAT('%',#{customerRec.companyName},'%')
+      and  company_name BINARY LIKE CONCAT('%',#{customerRec.companyName},'%')
     </if>
       <if test="customerRec.companyBelongName != null and customerRec.companyBelongName != ''">
         and company_belong_name  LIKE CONCAT('%',#{customerRec.companyBelongName},'%')
@@ -69,13 +69,13 @@
     from t_customer_rec
     <where>
       <if test="customerRec.customerName != null and customerRec.customerName != ''">
-        AND  BINARY customerName = #{customerRec.customerName}
+        AND   customerName = BINARY #{customerRec.customerName}
       </if>
       <if test="customerRec.companyName != null and customerRec.companyName != ''">
-        and BINARY company_name  LIKE CONCAT('%',#{customerRec.companyName},'%')
+        and  company_name BINARY LIKE CONCAT('%',#{customerRec.companyName},'%')
       </if>
       <if test="customerRec.companyBelongName != null and customerRec.companyBelongName != ''">
-        and BINARY company_belong_name  LIKE CONCAT('%',#{customerRec.companyBelongName},'%')
+        and  company_belong_name BINARY  LIKE CONCAT('%',#{customerRec.companyBelongName},'%')
       </if>
     </where>
     ORDER by customerName
@@ -96,53 +96,53 @@
     select
     <include refid="Base_Column_List" />
     from t_customer_rec
-    where BINARY customerName = #{customerName,jdbcType=VARCHAR} and rec_status =1
+    where  customerName = BINARY #{customerName,jdbcType=VARCHAR} and rec_status =1
   </select>
     <select id="selectByCustomerNameAll" resultMap="BaseResultMap" parameterType="java.lang.String" >
         select
         <include refid="Base_Column_List" />
         from t_customer_rec
-        where BINARY customerName = #{customerName,jdbcType=VARCHAR}
+        where  customerName = BINARY #{customerName,jdbcType=VARCHAR}
     </select>
   <select id="selectByCustomerNameCpAll" resultMap="BaseResultMap" parameterType="com.jkcredit.invoice.model.entity.customer.CustomerRec" >
     select
     <include refid="Base_Column_List" />
     from t_customer_rec
-    where BINARY customerName = #{customerRec.customerName,jdbcType=VARCHAR}
+    where  customerName = BINARY #{customerRec.customerName,jdbcType=VARCHAR}
     <if test="customerRec.companyName != null and customerRec.companyName != ''">
-      and BINARY company_name  LIKE CONCAT('%',#{customerRec.companyName},'%')
+      and  company_name BINARY  LIKE CONCAT('%',#{customerRec.companyName},'%')
     </if>
   </select>
     <select id="selectByCustomerNameAndCompany" resultMap="BaseResultMap" parameterType="com.jkcredit.invoice.model.entity.customer.CustomerRec" >
         select
         <include refid="Base_Column_List" />
         from t_customer_rec
-        where BINARY customerName = #{customerName,jdbcType=VARCHAR} AND BINARY company_name =  #{companyName,jdbcType=VARCHAR}
+        where  customerName = BINARY #{customerName,jdbcType=VARCHAR} AND BINARY company_name =  #{companyName,jdbcType=VARCHAR}
     </select>
   <select id="selectByCustomerNameAndCompanyReference" resultMap="BaseResultMap" parameterType="com.jkcredit.invoice.model.entity.customer.CustomerRec" >
     select
     <include refid="Base_Column_List" />
     from t_customer_rec
-    where BINARY customerName = #{customerName,jdbcType=VARCHAR} AND BINARY company_referenceNum =  #{companyReferencenum,jdbcType=VARCHAR} and rec_status =1
+    where  customerName = BINARY #{customerName,jdbcType=VARCHAR} AND BINARY company_referenceNum =  #{companyReferencenum,jdbcType=VARCHAR} and rec_status =1
   </select>
     <select id="selectByCompanyReference" resultMap="BaseResultMap" parameterType="java.lang.String" >
         select
         <include refid="Base_Column_List" />
         from t_customer_rec
-        where BINARY  company_referenceNum =  #{companyReferencenum,jdbcType=VARCHAR} and rec_status =1
+        where   company_referenceNum = BINARY #{companyReferencenum,jdbcType=VARCHAR} and rec_status =1
     </select>
 
   <select id="selectByCustomerNameAndCompanyConcat" resultMap="BaseResultMap" parameterType="com.jkcredit.invoice.model.entity.customer.CustomerRec" >
     select
     <include refid="Base_Column_List" />,base64Str
     from t_customer_rec
-    where BINARY customerName = #{customerName,jdbcType=VARCHAR} AND BINARY company_name =  #{companyName,jdbcType=VARCHAR}
+    where  customerName = BINARY #{customerName,jdbcType=VARCHAR} AND BINARY company_name =  #{companyName,jdbcType=VARCHAR}
   </select>
   <select id="selectByCustomerNameAndCompanyNum" resultMap="BaseResultMap" parameterType="com.jkcredit.invoice.model.entity.customer.CustomerRec" >
     select
     <include refid="Base_Column_List" />
     from t_customer_rec
-    where BINARY customerName = #{customerName,jdbcType=VARCHAR} AND company_num =  #{companyNum,jdbcType=VARCHAR}
+    where  customerName = BINARY #{customerName,jdbcType=VARCHAR} AND company_num =  #{companyNum,jdbcType=VARCHAR}
   </select>
     <select id="selectByCompanyNum" resultMap="BaseResultMap" parameterType="com.jkcredit.invoice.model.entity.customer.CustomerRec" >
         select
@@ -337,7 +337,7 @@
         fileMessage = #{fileMessage,jdbcType=VARCHAR},
       </if>
     </set>
-    where BINARY company_name = #{companyName,jdbcType=VARCHAR} and  bussiness_type = #{bussinessType,jdbcType=INTEGER} and company_referenceNum = #{companyReferencenum,jdbcType=VARCHAR}
+    where  company_name = BINARY #{companyName,jdbcType=VARCHAR} and  bussiness_type = #{bussinessType,jdbcType=INTEGER} and company_referenceNum = #{companyReferencenum,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.jkcredit.invoice.model.entity.customer.CustomerRec" >
   update t_customer_rec
@@ -391,6 +391,6 @@
     base64Str = #{base64Str,jdbcType=VARCHAR},
     contractSuc = #{contractSuc,jdbcType=INTEGER},
     contrantNum = #{contrantNum,jdbcType=VARCHAR}
-    where BINARY company_name = #{companyName,jdbcType=VARCHAR} and bussiness_type = #{bussinessType,jdbcType=INTEGER} and company_referenceNum = #{companyReferencenum,jdbcType=VARCHAR}
+    where  company_name = BINARY #{companyName,jdbcType=VARCHAR} and bussiness_type = #{bussinessType,jdbcType=INTEGER} and company_referenceNum = #{companyReferencenum,jdbcType=VARCHAR}
   </update>
 </mapper>

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

@@ -61,25 +61,25 @@
         from t_SelfCarInvoice g
         <where>
             <if test="selfCarInvoice.companyName != null and selfCarInvoice.companyName != ''">
-                and BINARY companyName LIKE CONCAT('%',#{selfCarInvoice.companyName},'%')
+                and  companyName = BINARY  #{selfCarInvoice.companyName}
             </if>
             <if test="selfCarInvoice.tradeId != null and selfCarInvoice.tradeId != ''">
                 and  instr(CONCAT(',',#{selfCarInvoice.tradeId},','),CONCAT(',',tradeId,','))>0
             </if>
             <if test="selfCarInvoice.plateNum != null and selfCarInvoice.plateNum != ''">
-                and BINARY plateNum = #{selfCarInvoice.plateNum}
+                and  plateNum = BINARY #{selfCarInvoice.plateNum}
             </if>
             <if test="selfCarInvoice.buyerTaxpayerCode != null and selfCarInvoice.buyerTaxpayerCode != ''">
-                and BINARY buyerTaxpayerCode = #{selfCarInvoice.buyerTaxpayerCode}
+                and  buyerTaxpayerCode = BINARY #{selfCarInvoice.buyerTaxpayerCode}
             </if>
             <if test="selfCarInvoice.cardId != null and selfCarInvoice.cardId != ''">
                 and instr(CONCAT(',',#{selfCarInvoice.cardId},','),CONCAT(',',cardId,','))>0
             </if>
             <if test="selfCarInvoice.invoiceCode != null and selfCarInvoice.invoiceCode != ''">
-                and BINARY invoiceCode = #{selfCarInvoice.invoiceCode}
+                and  invoiceCode = BINARY #{selfCarInvoice.invoiceCode}
             </if>
             <if test="selfCarInvoice.invoiceNum != null and selfCarInvoice.invoiceNum != ''">
-                and BINARY invoiceNum = #{selfCarInvoice.invoiceNum}
+                and  invoiceNum = BINARY #{selfCarInvoice.invoiceNum}
             </if>
             <if test="selfCarInvoice.invoiceMakeStart != null and selfCarInvoice.invoiceMakeStart != ''">
                 and invoiceMakeTime BETWEEN #{selfCarInvoice.invoiceMakeStart} and #{selfCarInvoice.invoiceMakeEnd}
@@ -155,14 +155,14 @@
         select
         <include refid="baseSql" />
         from t_SelfCarInvoice
-        where BINARY tradeId = #{tradeId,jdbcType=VARCHAR}
+        where  tradeId = BINARY #{tradeId,jdbcType=VARCHAR}
     </select>
 
     <select id="selectByCardId" resultMap="BaseResultMap" parameterType="java.lang.String" >
         select
         <include refid="baseSql" />
         from t_SelfCarInvoice
-        where BINARY cardId = #{cardId,jdbcType=VARCHAR}
+        where  cardId = BINARY #{cardId,jdbcType=VARCHAR}
     </select>
 
 

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

@@ -97,13 +97,13 @@
         from t_waybill_Import
         <where>
             <if test="noCarWayBill.companyName != null and noCarWayBill.companyName != ''">
-                and BINARY companyName = #{noCarWayBill.companyName}
+                and  companyName = BINARY #{noCarWayBill.companyName}
             </if>
             <if test="noCarWayBill.billNum != null and noCarWayBill.billNum != ''">
-                and BINARY billNum = #{noCarWayBill.billNum}
+                and  billNum = BINARY #{noCarWayBill.billNum}
             </if>
             <if test="noCarWayBill.taxplayerCode != null and noCarWayBill.taxplayerCode != ''">
-                and BINARY taxplayerCode = #{noCarWayBill.taxplayerCode}
+                and  taxplayerCode = BINARY #{noCarWayBill.taxplayerCode}
             </if>
             <if test="noCarWayBill.startBegin != null and noCarWayBill.startBegin != ''">
                 and intfaceStartTime BETWEEN #{noCarWayBill.startBegin} and #{noCarWayBill.startEnd}
@@ -198,13 +198,13 @@
         companyTel = #{companyTel,jdbcType=VARCHAR},
         companyNum = #{companyNum,jdbcType=VARCHAR},
         failReason = #{failReason,jdbcType=VARCHAR}
-        where BINARY billNum = #{billNum,jdbcType=VARCHAR} and BINARY batchNumber = #{batchNum,jdbcType=VARCHAR}
+        where  billNum = BINARY #{billNum,jdbcType=VARCHAR} and  batchNumber = BINARY #{batchNum,jdbcType=VARCHAR}
     </update>
     <select id="selectByBillNum" resultMap="BaseResultMap" parameterType="java.lang.String" >
         select
         <include refid="baseSql" />
         from t_waybill_Import
-        where BINARY billNum = #{billNum,jdbcType=VARCHAR}
+        where  billNum = BINARY #{billNum,jdbcType=VARCHAR}
     </select>
     <select id="selectByHisFlagAndBillStatus" resultMap="BaseResultMap" parameterType="com.jkcredit.invoice.model.entity.waybill.NoCarWayBill" >
         select
@@ -219,7 +219,7 @@
         select
         <include refid="baseSql" />
         from t_waybill_Import
-        where BINARY customerName = #{customerName,jdbcType=VARCHAR}
+        where  customerName = BINARY #{customerName,jdbcType=VARCHAR}
     </select>
 
 

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

@@ -38,13 +38,13 @@
         from t_SellCarTrade
         <where>
             <if test="sellCarTrade.companyName != null and sellCarTrade.companyName != ''">
-                and BINARY companyName LIKE CONCAT('%',#{sellCarTrade.companyName},'%')
+                and  companyName =  BINARY #{sellCarTrade.companyName}
             </if>
             <if test="sellCarTrade.cardId != null and sellCarTrade.cardId != ''">
                 and instr(CONCAT(',',#{sellCarTrade.cardId},','),CONCAT(',',cardId,','))>0
             </if>
             <if test="sellCarTrade.companyReferencenum != null and sellCarTrade.companyReferencenum != ''">
-                and BINARY companyReferencenum = #{sellCarTrade.companyReferencenum}
+                and  companyReferencenum = BINARY #{sellCarTrade.companyReferencenum}
             </if>
             <if test="sellCarTrade.tradeId != null and sellCarTrade.tradeId != ''">
                 and  instr(CONCAT(',',#{sellCarTrade.tradeId},','),CONCAT(',',tradeId,','))>0
@@ -119,7 +119,7 @@
         aclTime = #{aclTime,jdbcType=VARCHAR},
         companyName = #{companyName,jdbcType=VARCHAR},
         companyReferencenum = #{companyReferencenum,jdbcType=VARCHAR}
-        where BINARY tradeId = #{tradeId,jdbcType=INTEGER}
+        where  tradeId = BINARY #{tradeId,jdbcType=INTEGER}
     </update>
 
 
@@ -129,7 +129,7 @@
         select
         <include refid="baseSql" />
         from t_SellCarTrade
-        where BINARY cardId = #{cardId,jdbcType=VARCHAR}
+        where  cardId = BINARY #{cardId,jdbcType=VARCHAR}
     </select>