阳光险种修改

src/main/java/com/ydtech/modules/order/components/yangguang/YangGuangRequestApiComponents.java

@@ -214,27 +214,4 @@ public class YangGuangRequestApiComponents {
     public YangGuangElecApplicationSignResponse elecApplicationSign(YangGuangElecApplicationSignRequest yangGuangElecApplicationSignRequest) throws JsonProcessingException {
         return post(yangGuangElecApplicationSignRequest, YangGuangElecApplicationSignResponse.class);
     }
-
-    public static void main(String[] args) throws Exception {
-        String encryptRequestBody = YangGuangEncryption.authcodeEncode("{\n" +
-                "\"Toncount\":\"5\",\n" +
-                "\"AgentCode\":\"U0000A000002\",\n" +
-                "\"UseNatureCode\":\"8A\",\n" +
-                "\"ServiceArea\":\"T30510185\",\n" +
-                "\"ComCode\":\"30512200\",\n" +
-                "\"VehicleType\":\"A0\",\n" +
-                "\"LicenseCategory\":\"K33\",\n" +
-                "\"RequestNo\":\"getNonVehicleProducts\",\n" +
-                "\"HandlerCode\":\"30510688\"\n" +
-                "}", "uYPP7AIc3HYsUh8rFn");
-        System.out.println(encryptRequestBody);
-        String encryptResponse = "eqla36UW0Dm3MmGfY/8CdwLels7gu9oboEyycCLPyAoio1KpOzZntcsTmDtTu3rkNmj23A2sGbWgPTCsqSRdMfzGNuYMGXzFxwQ4w/cSCYaAdNk76x6MIEKmnHNC8KiEGOHGWeuahIi26KFxgziNGHkq5i2J72PE2wxrOD8cSyNidjCIpnaRFT0smrHh6otHTuG9N6CZASkp+WWTXpl0ze195tjkuq4nOJ+Csc3dcP65mr/gIzF+hJspseF0iIsVDVLW/wz1iBvJVlZC8cVA7owmw0f0T3ngE/qb8qARR2dLhd5A2UUsyGcD0hNizV6DXISLGKRMTV3Qenn0ajRsQ0P60v3ckxriw7ux";
-        String decryptRequestBody = YangGuangEncryption.authcodeDecode(encryptResponse, "uYPP7AIc3HYsUh8rFn");
-        System.out.println(decryptRequestBody);
-        System.out.println(new Date());
-        System.out.println(LocalDateTime.now());
-//        ---------> 请求参数:{"AgentCode":"U0000A000002","ComCode":"30512200","HandlerCode":"30510688","LicenseCategory":"K33",
-//                "RequestNo":"getNonVehicleProducts","ServiceArea":"T30510185","Toncount":"5","UseNatureCode":"8A","VehicleType":"A0"}
-
-    }
 }

src/main/java/com/ydtech/modules/order/entity/api/yangguang/request/YangGuangAccuracyCalculateRequest.java

@@ -4,6 +4,7 @@ import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.IdcardUtil;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.ydtech.constants.enums.InsurKind;
+import com.ydtech.constants.enums.InsuranceRisk;
 import com.ydtech.modules.ins.model.vo.CarInfoVo;
 import com.ydtech.modules.ins.model.vo.CustomerInfoVo;
 import com.ydtech.modules.ins.model.vo.KindInfoVo;
@@ -233,46 +234,34 @@ public class YangGuangAccuracyCalculateRequest extends YangGuangBaseRequest{
         this.TongxinNo = ygConfigureParameters.getTongxinNo() == null ? "" : ygConfigureParameters.getTongxinNo();
         this.InfotransNo = getInfotransNo();
         this.Modelinfoid = carmodellist.getModelinfoid();
-        LocalDateTime startTime = LocalDateTime.parse(startDate, formatter);
-        LocalDateTime endTime = startTime.plusYears(1).with(LocalTime.MIDNIGHT).minusSeconds(1);
-
+        List<RiskInfoVo> riskList = quoteInfoVo.getRiskList();
+        for (RiskInfoVo riskInfo : riskList) {
+            if(InsuranceRisk.BUSINESS_CODE.equals(riskInfo.getRiskCode())) {
+                LocalDateTime biStartTime = LocalDateTime.parse(riskInfo.getStartDate(), formatter);
+                LocalDateTime biEndTime = LocalDateTime.parse(riskInfo.getEndDate(), formatter);
+                this.BiStartDate = biStartTime.format(formatter);
+                this.BiEndDate = biEndTime.format(formatter);
+            }
+            if (InsuranceRisk.TRAFFIC_CODE.equals(riskInfo.getRiskCode())) {
+                LocalDateTime ciStartTime = LocalDateTime.parse(riskInfo.getStartDate(), formatter);
+                LocalDateTime ciEndTime = LocalDateTime.parse(riskInfo.getEndDate(), formatter);
+                this.CiStartDate = ciStartTime.format(formatter);
+                this.CiEndDate = ciEndTime.format(formatter);
+            }
+        }
+        if (riskInfoVo.getInstantFlag().equals("1")) {
+            this.BiImmediateFlag = "1";
+            this.CiImmediateFlag = "1";
+        } else {
+            this.BiImmediateFlag = "0";
+            this.CiImmediateFlag = "0";
+        }
         if (quoteInfoVo.getProductId().equals("034001") || quoteInfoVo.getProductId().equals("034002")) {
-            this.BiStartDate = startTime.format(formatter);
-            this.BiEndDate = endTime.format(formatter);
-            this.CiStartDate = "";
-            this.CiEndDate = "";
             this.PolicyType = "1";
-            this.CiImmediateFlag = "0";
-            if (riskInfoVo.getInstantFlag().equals("1")) {
-                this.BiImmediateFlag = "1";
-            } else {
-                this.BiImmediateFlag = "0";
-            }
         } else if (quoteInfoVo.getProductId().equals("0330")) {
-            this.CiStartDate = startTime.format(formatter);
-            this.CiEndDate = endTime.format(formatter);
-            this.BiStartDate = "";
-            this.BiEndDate = "";
             this.PolicyType = "2";
-            this.BiImmediateFlag = "0";
-            if (riskInfoVo.getInstantFlag().equals("1")) {
-                this.CiImmediateFlag = "1";
-            } else {
-                this.CiImmediateFlag = "0";
-            }
         } else {
-            this.CiStartDate = startTime.format(formatter);
-            this.CiEndDate = endTime.format(formatter);
-            this.BiStartDate = startTime.toString();
-            this.BiEndDate = endTime.toString();
             this.PolicyType = "3";
-            if (riskInfoVo.getInstantFlag().equals("1")) {
-                this.CiImmediateFlag = "1";
-                this.BiImmediateFlag = "1";
-            } else {
-                this.CiImmediateFlag = "0";
-                this.BiImmediateFlag = "0";
-            }
         }
         this.IsCreateEpolicyJQ = "1";
         this.ArgueSolution = "1";