后端代码提交

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

@@ -77,6 +77,13 @@ public class NoCarController {
     @LoginRequired
     public RespR getCustomersByPage(Page page, CustomerCarRec customerCarRec) {
         try {
+            if(!StringUtils.isEmpty(customerCarRec.getStartTime()) && !"null".equals(customerCarRec.getStartTime())){
+                String [] res = customerCarRec.getStartTime().split(",");
+                customerCarRec.setStartTime(res[0]);
+                customerCarRec.setEndTime(res[1]);
+            }else{
+                customerCarRec.setStartTime(null);
+            }
             RespR respR = new RespR(noCarRecService.findByPageAndCarRec(page, customerCarRec));
             return respR;
         }catch (Exception e){
@@ -415,10 +422,24 @@ public class NoCarController {
     }
     public void buildDate(List<NoCarWayBill> list){
         DateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        int i = 0;
         for(NoCarWayBill noCarWayBill:list){
-            noCarWayBill.setStartTime(format.format(noCarWayBill.getStartTimeDate()));
-            noCarWayBill.setPredictEndTime(format.format(noCarWayBill.getPredictEndTimeDate()));
-            noCarWayBill.setFee(Math.round(noCarWayBill.getFeeD()*100));
+            try {
+                noCarWayBill.setStartTime(format.format(noCarWayBill.getStartTimeDate()));
+                noCarWayBill.setPredictEndTime(format.format(noCarWayBill.getPredictEndTimeDate()));
+                if(noCarWayBill.getFeeD() !=null){
+                    noCarWayBill.setFee(Math.round(noCarWayBill.getFeeD()*100));
+                }
+                noCarWayBill.setTaxplayerCode(noCarWayBill.getTaxplayerCode().trim());
+                noCarWayBill.setBillNum(noCarWayBill.getBillNum().trim());
+            }catch (Exception e){
+                log.info(noCarWayBill.getBillNum());
+                i++;
+            }
+
+        }
+        if(i>0){
+            throw new RuntimeException("数据存在错误，请检查文件中数据，金额是否有空的，时间是否全是时间格式");
         }
     }
     public void buildDateEnd(List<NoCarWayBill> list){

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

@@ -22,6 +22,7 @@ public interface CustomerCarRecMapper extends BaseMapper<CustomerCarRec> {
     CustomerCarRec selectByETC(String etcNum);
     CustomerCarRec selectByCarNum(String carNum);
     List<CustomerCarRec> selectBySelfCarNum(String carNum);
+    List<CustomerCarRec> selectAllEtcBySelfCarNum(String carNum);
 
     int updateByPrimaryKeySelective(CustomerCarRec record);
 
@@ -32,6 +33,6 @@ public interface CustomerCarRecMapper extends BaseMapper<CustomerCarRec> {
     int updateETCByPrimaryKey(CustomerCarRec record);
 
     int updateWaitETCStatus(CustomerCarRec record);
-    List<CustomerCarRec> selectAllBindEtc();
+    List<CustomerCarRec> selectAllBindEtcNoGetInvoice();
     IPage<List<CustomerCarRec>> selectAllByPage(Page page, @Param("query") CustomerCarRec customerCarRec);
 }

src/main/java/com/jkcredit/invoice/model/entity/customer/CustomerCarRec.java

@@ -20,6 +20,13 @@ public class CustomerCarRec {
     private String succTime;
 
     private String failTime;
+
+    /***
+     * 查询备案的起止时间使用
+     */
+    private String startTime;
+
+    private String endTime;
     /**
      * 0-备案失败 1-备案成功 2-解绑
      */
@@ -151,6 +158,22 @@ public class CustomerCarRec {
         this.interType = interType;
     }
 
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
     @Override
     public String toString() {
         return "CustomerCarRec{" +

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

@@ -118,6 +118,18 @@ public class CustomerLowerServiceImpl implements CustomeLowerService {
 
     @Override
     public RespR customeRecQueryList(CustomerRec customerRec) {
+        List<CustomerRec> customerRecs = customerRecMapper.selectByCustomerName(customerRec.getCustomerName());
+        if(customerRec.getBussinessType()!=null){
+            List<CustomerRec> customerRecsN = new ArrayList<>();
+            if(customerRecs!=null && customerRecs.size()>0){
+                customerRecs.forEach(customerRec1 -> {
+                    if(customerRec.getBussinessType().equals(customerRec1.getBussinessType())){
+                        customerRecsN.add(customerRec1);
+                    }
+                });
+            }
+            return new RespR(customerRecsN);
+        }
 
         return new RespR(customerRecMapper.selectByCustomerName(customerRec.getCustomerName()));
     }

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

@@ -193,12 +193,13 @@ public class NoCarServiceImpl implements NoCarService{
             log.info("车辆备案查询失败NoCarServiceImpl.customerCarRecQueryUpper{},msg{}",customerCarRec,respR.getMsg());
             return new RespR(false,respR.getMsg());
         }else{
+            customerCarRec.setRecStatus(1);
             updateCustomerCarRec(customerCarRec);
         }
         return new RespR(respR.getData());
     }
 
-    public void updateCustomerCarRec(CustomerCarRec customerCarRec){
+    public synchronized void updateCustomerCarRec(CustomerCarRec customerCarRec){
         //根据车牌号查询是新增还是更新
         CustomerCarRec customerCarRec1 = customerCarRecMapper.selectByCarNum(customerCarRec.getCarNum());
         if (customerCarRec1 == null) {
@@ -320,11 +321,11 @@ public class NoCarServiceImpl implements NoCarService{
         noCarWayBill1.setPredictEndTime(noCarWayBill.getPredictEndTime());
         noCarWayBill1.setBatchNumEnd(noCarWayBill.getBatchNumEnd());
         if(DateUtil.getDistanceHours(noCarWayBill.getStartTime(),DateUtil.StringToDate(noCarWayBill.getPredictEndTime()))<-96){
-            noCarWayBill1.setBillwayStatus(4);
+            //noCarWayBill1.setBillwayStatus(4);
             noCarWayBill1.setFailReason("失败，承运时长超96小时");
             noCarWaybillMapper.updateByBillNum(noCarWayBill1);
             log.info("运单结束失败：NoCarServiceImpl.noCarWaybillEnd{},msg{}",noCarWayBill,"运单已经超时，请拆分");
-            return new RespR(false,"运单已经超时，请拆分");
+            return new RespR(false,"失败，承运时长超96小时");
         }
 
         WaybillEndRequest waybillEndRequest = new WaybillEndRequest();
@@ -345,7 +346,7 @@ public class NoCarServiceImpl implements NoCarService{
             noCarWayBill1.setBillwayStatus(4);
             noCarWayBill1.setFailReason(waybillEndResponseRespR.getMsg());
             noCarWaybillMapper.updateByBillNum(noCarWayBill1);
-            return new RespR(false,"运单已经超时，请拆分");
+            return new RespR(false,"运单已经超时");
         }
         noCarWayBill1.setInterfaceEndTime(DateUtil.getCurrentDateStr());
         noCarWayBill1.setBillwayStatus(2);

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

@@ -83,6 +83,16 @@ public class NoCarBillWayServiceImpl extends ServiceImpl<NoCarWaybillMapper,NoCa
                     CustomerRec customerRec = new CustomerRec();
                     customerRec.setCustomerName(customerName);
                     customerRec.setCompanyReferencenum(noCarWayBill.getTaxplayerCode());
+                    noCarWayBill.setBatchNum(batchNumber);
+                    noCarWayBill.setCustomerName(customerName);
+                    noCarWayBill.setBillwayStatus(-2);
+                    noCarWayBill.setHisFlag(0);
+                    noCarWayBill.setIntfaceStartTime(DateUtil.getCurrentDateStr());
+                    noCarWaybillMapperImprt.insertImport(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);
+                    }
                     customerRec = customerRecMapper.selectByCustomerNameAndCompanyReference(customerRec);
                     if(customerRec == null){
                         noCarWaybillMapperImprt.updateBillway(-2,"企业税号未备案",noCarWayBill);
@@ -93,13 +103,7 @@ public class NoCarBillWayServiceImpl extends ServiceImpl<NoCarWaybillMapper,NoCa
                         return;
                     }
                     noCarWayBill.setCompanyName(customerRec.getCompanyName());
-                    noCarWayBill.setCustomerName(customerName);
                     noCarWayBill.setCompanyNum(customerRec.getCompanyNum());
-                    noCarWayBill.setBatchNum(batchNumber);
-                    noCarWayBill.setBillwayStatus(-2);
-                    noCarWayBill.setHisFlag(0);
-                    noCarWayBill.setIntfaceStartTime(DateUtil.getCurrentDateStr());
-                    noCarWaybillMapperImprt.insertImport(noCarWayBill);
                     insertOrUpdateBill(noCarWayBill);
                     if(DateUtil.getDistanceHours(noCarWayBill.getStartTime(),new Date())<-72){
                         noCarWaybillMapperImprt.updateBillway(-2,"失败，运单开始时间超72小时#",noCarWayBill);
@@ -158,8 +162,11 @@ public class NoCarBillWayServiceImpl extends ServiceImpl<NoCarWaybillMapper,NoCa
                         noCarWayBill.setFailReason(respR.getMsg());
                         insertOrUpdateBill(noCarWayBill);
                         stringBuffer.append("#").append(noCarWayBill.getBillNum()).append(":").append(respR.getMsg()).append("#");
+                    }else{
+                        noCarWaybillMapperImprt.updateBillway(1,"",noCarWayBill);
+                        return;
                     }
-                    noCarWaybillMapperImprt.updateBillway(1,"",noCarWayBill);
+
                 });
                 log.error("开始平台指令上传失败NoCarBillWayServiceImpl.batchBillWayStart:{}",stringBuffer.toString());
             }
@@ -188,6 +195,17 @@ public class NoCarBillWayServiceImpl extends ServiceImpl<NoCarWaybillMapper,NoCa
                         customerRec.setCustomerName(customerName);
                         customerRec.setCompanyReferencenum(noCarWayBill.getTaxplayerCode());
                         customerRec = customerRecMapper.selectByCustomerNameAndCompanyReference(customerRec);
+                        noCarWayBill.setIntfaceStartTime(DateUtil.getCurrentDateStr());
+                        noCarWayBill.setBatchNum(batchNumber);
+                        noCarWayBill.setTitleType(2);
+                        noCarWayBill.setBillwayStatus(-2);
+                        noCarWayBill.setHisFlag(1);
+                        noCarWayBill.setCustomerName(customerName);
+                        noCarWaybillMapperImprt.insertImport(noCarWayBill);
+                        NoCarWayBill noCarWayBillDb = noCarWaybillMapper.selectByBillNum(noCarWayBill.getBillNum());
+                        if(noCarWayBillDb!=null && (noCarWayBillDb.getBillwayStatus() == 2 || noCarWayBillDb.getBillwayStatus() == 3 || noCarWayBillDb.getBillwayStatus() == 4)){
+                            noCarWaybillMapperImprt.updateBillway(-2,"失败，运单号重复",noCarWayBill);
+                        }
                         if(customerRec == null || customerRec.getRecStatus()!=1){
                             stringBuffer.append("#").append(noCarWayBill.getBillNum()).append(":").append("企业税号未备案#");
                             noCarWaybillMapperImprt.updateBillway(-2,"企业税号未备案#",noCarWayBill);
@@ -197,14 +215,8 @@ public class NoCarBillWayServiceImpl extends ServiceImpl<NoCarWaybillMapper,NoCa
                             return;
                         }
                         noCarWayBill.setCompanyName(customerRec.getCompanyName());
-                        noCarWayBill.setCustomerName(customerName);
                         noCarWayBill.setCompanyNum(customerRec.getCompanyNum());
-                        noCarWayBill.setIntfaceStartTime(DateUtil.getCurrentDateStr());
-                        noCarWayBill.setBatchNum(batchNumber);
-                        noCarWayBill.setTitleType(2);
-                        noCarWayBill.setBillwayStatus(-2);
-                        noCarWayBill.setHisFlag(1);
-                        noCarWaybillMapperImprt.insertImport(noCarWayBill);
+
                         insertOrUpdateBill(noCarWayBill);
 
                         if(DateUtil.getDistanceDays(noCarWayBill.getStartTime(),new Date())>-20){

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

@@ -7,9 +7,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jkcredit.invoice.mapper.customer.CustomerCarRecMapper;
+import com.jkcredit.invoice.mapper.customer.CustomerRecMapper;
 import com.jkcredit.invoice.model.entity.customer.CustomerCarRec;
+import com.jkcredit.invoice.model.entity.customer.CustomerRec;
 import com.jkcredit.invoice.service.nocar.NoCarRecService;
 import com.jkcredit.invoice.service.upService.SelfCarInterface;
+import com.jkcredit.invoice.util.DateUtil;
 import com.jkcredit.invoice.util.RespR;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -21,38 +24,72 @@ public class NoCarRecServiceImpl extends ServiceImpl<CustomerCarRecMapper,Custom
     @Autowired
     CustomerCarRecMapper customerCarRecMapper;
     @Autowired
+    CustomerRecMapper customerRecMapper;
+    @Autowired
     SelfCarInterface selfCarInterface;
     @Override
     public IPage<List<CustomerCarRec>> findByPageAndCarRec(Page page, CustomerCarRec customerCarRec) {
         if("0".equals(customerCarRec.getBusinessType()) && !StringUtils.isEmpty(customerCarRec.getCarNum())){
-            //
-            List<CustomerCarRec> customerCarRecs = customerCarRecMapper.selectBySelfCarNum(customerCarRec.getCarNum());
-            if(customerCarRecs!=null && customerCarRecs.size()>0){
+            CustomerRec customerRec = new CustomerRec();
+            customerRec.setCompanyName(customerCarRec.getCompanyName());
+            customerRec.setCustomerName(customerCarRec.getCustomerName());
+            customerRec = customerRecMapper.selectByCustomerNameAndCompany(customerRec);
+            if(customerRec != null){
+                List<CustomerCarRec> customerCarRecs = customerCarRecMapper.selectAllEtcBySelfCarNum(customerCarRec.getCarNum());
                 CardBindQueryListToBRequest cardBindQueryListToBRequest = new CardBindQueryListToBRequest();
-                cardBindQueryListToBRequest.setPlateNum(customerCarRecs.get(0).getCarNum());
-                cardBindQueryListToBRequest.setCompanyNum(customerCarRecs.get(0).getCompanyNum());
+                cardBindQueryListToBRequest.setPlateNum(customerCarRec.getCarNum());
+                cardBindQueryListToBRequest.setCompanyNum(customerRec.getCompanyNum());
                 RespR<CardBindQueryListToBResponse> responseRespR = selfCarInterface.cardBindQueryListToB(cardBindQueryListToBRequest);
                 if(responseRespR.getCode() !=1){
                     List<CardBindQueryListToBModel> cardBindQueryListToBResponses = responseRespR.getData().getResult();
                     if(cardBindQueryListToBResponses!=null && cardBindQueryListToBResponses.size()>0){
-                        customerCarRecs.forEach(customerCarRec1 -> {
-                            boolean has = false;
-                            for(CardBindQueryListToBModel cardBindQueryListToBModel:cardBindQueryListToBResponses){
-                                if(cardBindQueryListToBModel.getCardId().equals(customerCarRec1.getEtcNum())){
-                                    has = true;
+                        if(customerCarRecs!=null && customerCarRecs.size()>0){
+                            customerCarRecs.forEach(customerCarRec1 -> {
+                                boolean has = false;
+                                for(CardBindQueryListToBModel cardBindQueryListToBModel:cardBindQueryListToBResponses){
+                                    if(cardBindQueryListToBModel.getCardId().equals(customerCarRec1.getEtcNum())){
+                                        has = true;
+                                    }
+                                }
+                                if(!has){
+                                    customerCarRec1.setRecStatus(2);
+                                    customerCarRecMapper.updateETCByPrimaryKeySelective(customerCarRec1);
+                                }else{
+                                    customerCarRec1.setRecStatus(1);
+                                    customerCarRecMapper.updateETCByPrimaryKeySelective(customerCarRec1);
                                 }
-                            }
-                            if(!has){
-                                customerCarRec1.setRecStatus(2);
-                                customerCarRecMapper.updateETCByPrimaryKeySelective(customerCarRec1);
-                            }
-                        });
+                            });
+                        }
+
+                        for(CardBindQueryListToBModel cardBindQueryListToBModel:cardBindQueryListToBResponses){
+                            boolean has = false;
+                           for(CustomerCarRec customerCarRec1:customerCarRecs){
+
+                               if(cardBindQueryListToBModel.getCardId().equals(customerCarRec1.getEtcNum())){
+                                   has = true;
+                               }
+                           }
+                           if(!has){
+                               CustomerCarRec customerCarRecDb = new CustomerCarRec();
+                               customerCarRecDb.setInterType(1);
+                               customerCarRecDb.setCompanyNum(cardBindQueryListToBModel.getCompanyNum());
+                               customerCarRecDb.setCarNum(cardBindQueryListToBModel.getPlateNum());
+                               customerCarRecDb.setBusinessType("0");
+                               customerCarRecDb.setCustomerName(customerCarRec.getCustomerName());
+                               customerCarRecDb.setSuccTime(DateUtil.getCurrentDateStr());
+                               customerCarRecDb.setCompanyName(customerRec.getCompanyName());
+                               customerCarRecDb.setEtcNum(cardBindQueryListToBModel.getCardId());
+                               customerCarRecDb.setCarColor(cardBindQueryListToBModel.getPlateColor()+"");
+                               customerCarRecDb.setRecStatus(1);
+                               customerCarRecMapper.insert(customerCarRecDb);
+                           }
+
+                        }
                     }
 
-                }
             }
 
-
+            }
         }
         return customerCarRecMapper.selectAllByPage(page,customerCarRec);
     }

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

@@ -85,7 +85,7 @@ public class ScheduledBillTask {
         * 1.查询所有的etc卡
         * 2.按照etc卡号取最近两天的发票
         */
-       List<CustomerCarRec> lst =  customerCarRecMapper.selectAllBindEtc();
+       List<CustomerCarRec> lst =  customerCarRecMapper.selectAllBindEtcNoGetInvoice();
 
        lst.stream().forEach(customerCarRec -> {
           try {

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

@@ -51,6 +51,12 @@
       <if test="query.businessType != null and query.businessType != ''">
         and bussiness_type = #{query.businessType}
       </if>
+      <if test="query.startTime != null and query.startTime != ''">
+        and (succ_time BETWEEN #{query.startTime} and #{query.endTime}
+
+            or fail_time  BETWEEN #{query.startTime} and #{query.endTime}
+        )
+      </if>
     </where>
   </select>
   <select id="selectByCustName" parameterType="java.lang.String" resultMap="BaseResultMap">
@@ -71,6 +77,12 @@
     from t_customer_carRec
     where car_num = #{customerName,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 car_num = #{customerName,jdbcType=VARCHAR} and bussiness_type=0
+  </select>
   <select id="selectByETC" parameterType="java.lang.String" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List" />

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

@@ -43,7 +43,7 @@
     from t_customer_rec
     <where>
     <if test="customerRec.customerName != null and customerRec.customerName != ''">
-      AND  customerName LIKE CONCAT('%',#{customerRec.customerName},'%')
+      AND  customerName =#{customerRec.customerName}
     </if>
     <if test="customerRec.companyLeaderPhone != null and customerRec.companyLeaderPhone != ''">
       and company_leader_Phone = #{customerRec.companyLeaderPhone}
@@ -95,7 +95,7 @@
     select
     <include refid="Base_Column_List" />
     from t_customer_rec
-    where customerName = #{customerName,jdbcType=VARCHAR}
+    where customerName = #{customerName,jdbcType=VARCHAR} and rec_status =1
   </select>
     <select id="selectByCustomerNameAndCompany" resultMap="BaseResultMap" parameterType="com.jkcredit.invoice.model.entity.customer.CustomerRec" >
         select

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

@@ -62,7 +62,7 @@
             <if test="noCarWayBill.billNum != null and noCarWayBill.billNum != ''">
                 and billNum = #{noCarWayBill.billNum}
             </if>
-            <if test="noCarWayBill.plateNum != null and noCarWayBill.plateNum != ''">plateNum
+            <if test="noCarWayBill.plateNum != null and noCarWayBill.plateNum != ''">
                 and plateNum = #{noCarWayBill.plateNum}
             </if>
             <if test="noCarWayBill.taxplayerCode != null and noCarWayBill.taxplayerCode != ''">