update

src/main/java/com/qtzl/alterSales/dao/entity/primary/AflBindVehicleInfo.java

@@ -75,6 +75,11 @@ public class AflBindVehicleInfo extends AbstractInsertTimeEntity {
      */
     private String registerDate;
 
+    private String driverId;
+
+    private String driverIdType;
+
+
     @Column(name = "bind_info_id")
     public String getBindInfoId() {
         return bindInfoId;
@@ -196,4 +201,22 @@ public class AflBindVehicleInfo extends AbstractInsertTimeEntity {
     public void setRegisterDate(String registerDate) {
         this.registerDate = registerDate;
     }
+
+    @Column(name = "driver_id")
+    public String getDriverId() {
+        return driverId;
+    }
+
+    public void setDriverId(String driverId) {
+        this.driverId = driverId;
+    }
+
+    @Column(name = "driver_id_type")
+    public String getDriverIdType() {
+        return driverIdType;
+    }
+
+    public void setDriverIdType(String driverIdType) {
+        this.driverIdType = driverIdType;
+    }
 }

src/main/java/com/qtzl/alterSales/dao/repo/jpa/primary/AflBindVehicleInfoRepo.java

@@ -4,6 +4,8 @@ import com.qtzl.alterSales.dao.entity.primary.AflBindVehicleInfo;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 
+import java.util.List;
+
 /***
  * <p>
  * 车辆信息
@@ -14,4 +16,7 @@ public interface AflBindVehicleInfoRepo extends JpaRepository<AflBindVehicleInfo
 
     @Query("FROM AflBindVehicleInfo  WHERE plateNum =?1 AND plateColor =?2")
     AflBindVehicleInfo findByPlateNumAndPlateColor(String plateNum, Integer plateColor);
+
+    @Query("FROM AflBindVehicleInfo  WHERE plateNum =?1 AND plateColor =?2 ORDER BY insertTime DESC")
+    List<AflBindVehicleInfo> findByPlate(String plateNum, Integer plateColor);
 }

src/main/java/com/qtzl/alterSales/manager/quartz/AflPapersDesensitizationTask.java

@@ -29,7 +29,7 @@ public class AflPapersDesensitizationTask extends AbstractManager {
     @Resource
     private EtcOrderUserInfoService etcOrderUserInfoService;
 
-    @Scheduled(cron = "0 0/60 9-10 * * ?")
+    @Scheduled(cron = "0 0 0/1 * * ?")
     // @Scheduled(cron = "0/2 * * * * ?")
     public void desensitizationHandler() {
         final List<AflPapersDesensitizationVo> desensitizationVo = etcOrderUserInfoRepo.getPapersDesensitizationVo();

src/main/java/com/qtzl/alterSales/manager/service/ChoiceBillsOperationServiceImpl.java

@@ -213,7 +213,7 @@ public class ChoiceBillsOperationServiceImpl implements ChoiceBillsOperationServ
                 //进行统计累加已收款金额
                 aflPaccountRefundCountService.saveFind(pay);
             } catch (Exception e) {
-                log.error("进行统计累加已收款金额失败... payId:{},{}", pay.getPayId(),e.getMessage());
+                log.error("进行统计累加已收款金额失败... payId:{},{}", pay.getPayId(), e.getMessage());
             }
             pay.setStatus(1);
             pay.setMsg("请款成功");
@@ -251,6 +251,10 @@ public class ChoiceBillsOperationServiceImpl implements ChoiceBillsOperationServ
         if (null == wechatSign) {
             return mchConfigManager.findBySubMchId("1648725759");
         }
+        if ("深交行".equals(wechatSign.getChannelName())) {
+            // 深交行的，补缴时进入 2973 商户号
+            return mchConfigManager.findBySubMchId("1638682973");
+        }
         return mchConfigManager.findBySubMchId(wechatSign.getSubMchId());
     }
 }

src/main/java/com/qtzl/alterSales/manager/service/EtcOrderUserInfoServiceImpl.java

@@ -2,7 +2,9 @@ package com.qtzl.alterSales.manager.service;
 
 import cn.com.taiji.common.manager.net.http.ServiceHandleException;
 import cn.hutool.core.collection.CollectionUtil;
+import com.qtzl.alterSales.dao.entity.primary.AflBindVehicleInfo;
 import com.qtzl.alterSales.dao.entity.third.EtcOrderUserInfo;
+import com.qtzl.alterSales.dao.repo.jpa.primary.AflBindVehicleInfoRepo;
 import com.qtzl.alterSales.dao.repo.jpa.second.AflCenterVehicleInfoRepo;
 import com.qtzl.alterSales.dao.repo.jpa.third.EtcOrderUserInfoRepo;
 import com.qtzl.alterSales.manager.model.protocol.UcServiceError;
@@ -31,6 +33,8 @@ public class EtcOrderUserInfoServiceImpl implements EtcOrderUserInfoService {
     private EtcOrderUserInfoRepo etcOrderUserInfoRepo;
     @Resource
     private AflCenterVehicleInfoRepo aflCenterVehicleInfoRepo;
+    @Resource
+    private AflBindVehicleInfoRepo aflBindVehicleInfoRepo;
 
     @Override
     public void desensitizationHandler(AflPapersDesensitizationVo desensitizationVo) throws ServiceHandleException {
@@ -39,18 +43,34 @@ public class EtcOrderUserInfoServiceImpl implements EtcOrderUserInfoService {
         if (null == orderUserInfo) {
             throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("未获取到对应的订单用户信息");
         }
-        final List<String> userIdNum = aflCenterVehicleInfoRepo.getUserIdNum(desensitizationVo.getPlateNum(), desensitizationVo.getPlateColor());
+        final String newIdNum = getIdNum(desensitizationVo.getPlateNum(), desensitizationVo.getPlateColor(), desensitizationVo.getIdentNo());
+        orderUserInfo.setIdentNo(newIdNum);
+        etcOrderUserInfoRepo.save(orderUserInfo);
+    }
+
+    private String getIdNum(String plateNum, Integer plateColor, String identNo) throws ServiceHandleException {
+        // 先查绑定信息
+        final List<AflBindVehicleInfo> vehicleInfoList = aflBindVehicleInfoRepo.findByPlate(plateNum, plateColor);
+        if (!CollectionUtil.isEmpty(vehicleInfoList)) {
+            for (AflBindVehicleInfo vehicleInfo : vehicleInfoList) {
+                final boolean condition = !StringUtils.isEmpty(vehicleInfo.getDriverId()) && vehicleInfo.getDriverId().endsWith(identNo.substring(identNo.lastIndexOf("*") + 1));
+                if (condition) {
+                    return vehicleInfo.getDriverId();
+                }
+            }
+        }
+        // 再查全量
+        final List<String> userIdNum = aflCenterVehicleInfoRepo.getUserIdNum(plateNum, plateColor);
         if (CollectionUtil.isEmpty(userIdNum)) {
             throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("未获取到每日下载的人车卡签数据，进入下一周期处理");
         }
         final String newIdNum = userIdNum.stream()
-                .filter(idNum -> !StringUtils.isEmpty(idNum) && idNum.endsWith(desensitizationVo.getIdentNo().substring(desensitizationVo.getIdentNo().lastIndexOf("*") + 1)))
+                .filter(idNum -> !StringUtils.isEmpty(idNum) && idNum.endsWith(identNo.substring(identNo.lastIndexOf("*") + 1)))
                 .findFirst().orElse(null);
         if (StringUtils.isEmpty(newIdNum)) {
             throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("每日下载数据未匹配到对应的证件号");
         }
-        orderUserInfo.setIdentNo(newIdNum);
-        etcOrderUserInfoRepo.save(orderUserInfo);
+        return newIdNum;
     }
 
 }

src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: prod
+    active: dev
   # Redis数据源
 #  redis:
 #    # Redis数据库索引（默认为0）