投保处理

src/main/java/com/ydtech/modules/order/components/zj/ZijinDuplicateInsuranceComponents.java

@@ -30,8 +30,12 @@ public class ZijinDuplicateInsuranceComponents {
 
     public static final String JQ_REGEX = "交强险.+?终保日期 (.+?);";
 
+    public static final String JQ = "交强险";
+
     public static final String SY_REGEX = "商业险.+?终保日期：(.+?);";
 
+    public static final String SY = "商业险";
+
     private ZijinRequestApiComponents zijinRequestApiComponents;
 
     @Autowired
@@ -80,12 +84,11 @@ public class ZijinDuplicateInsuranceComponents {
         if (ResultEnum.R_4001.getCode().equals(calculatePremiumResponse.getRtnCode())) {
             String rtnMsg = calculatePremiumResponse.getRtnMsg();
             CalculatePremiumRequest.BaseInfoDTO baseInfo = calculatePremiumRequest.getBaseInfo();
-            String calculateFlag = baseInfo.getCalculateFlag();
 
             boolean jq = true;
             boolean sy = true;
             // 交强险
-            if (CalculateFlagEnum.CF_0.getCode().equals(calculateFlag) || CalculateFlagEnum.CF_2.getCode().equals(calculateFlag)) {
+            if (rtnMsg.contains(JQ)) {
                 String jqEndDate = getTheExpiryDate(rtnMsg, JQ_REGEX);
                 if (!jqEndDate.isEmpty()) {
                     baseInfo.setTrafficTime(jqEndDate);
@@ -94,7 +97,7 @@ public class ZijinDuplicateInsuranceComponents {
             }
 
             // 商业险
-            if (CalculateFlagEnum.CF_0.getCode().equals(calculateFlag) || CalculateFlagEnum.CF_1.getCode().equals(calculateFlag)) {
+            if (rtnMsg.contains(SY)) {
                 String syEndDate = getTheExpiryDate(rtnMsg, SY_REGEX);
                 if (!syEndDate.isEmpty()) {
                     baseInfo.setBusinessTime(syEndDate);