Merge remote-tracking branch 'origin/test' into test

README.md

@@ -98,10 +98,13 @@
 
 * 版本号：v0.0.3.6
 * 访问地址：http://sxzgkj.baoxianzhanggui.com/
-* 更新日期:2023-09-04
-* 更新时间：00：00  ~  00：00
+* 更新日期:2023-09-05
+* 更新时间：16：00  ~  16：30
 * 更新内容：
   1. 修改永诚定时获取保单状态时间为早上7点到晚上10点每五分钟执行。
+  2. 永诚报价增加展示光博分。
+  3. 永诚晋中渠道上线。
+  4. 永诚内蒙古身份证地区识别增加准确率。
 
 
 

src/main/java/com/ydtech/modules/ins/model/yc/YcBuildData.java

@@ -218,9 +218,11 @@ public class YcBuildData {
         double sumPermium = StringUtils.toDouble(rd.getBase().getNPrm());
         ;
 
-        quoteRespVo.setCiSumPermium(jqPremium + sumTax);//交强险和车船税合计
-        quoteRespVo.setSumPermium(sumPermium + sumTax);//保费合计
-        quoteRespVo.setTaxAmount(sumTax);//车船税
+
+
+        quoteRespVo.setCiSumPermium(BigDecimal.valueOf(jqPremium).add(BigDecimal.valueOf(sumTax)).doubleValue());//交强险和车船税合计
+        quoteRespVo.setSumPermium(BigDecimal.valueOf(sumPermium).add(BigDecimal.valueOf(sumTax)).doubleValue());//保费合计
+        quoteRespVo.setTaxAmount(BigDecimal.valueOf(sumTax).doubleValue());//车船税
         if(null != rd.getPrmCoef()){
             quoteRespVo.setTotalAdjustRate(StringUtils.toDouble(rd.getPrmCoef().getNTotDisc()));
         }

src/main/java/com/ydtech/modules/ins/model/yc/YcConfigureParameters.java

@@ -64,8 +64,14 @@ public class YcConfigureParameters implements ConfigureParameters {
      */
     public AuthorityDataXml gainAuthorityDataXml() {
         AuthorityDataXml authorityDataXml = new AuthorityDataXml();
-        authorityDataXml.setUserName(userName);
-        authorityDataXml.setPassword(password);
+        authorityDataXml.setUserName(getUserName());
+        authorityDataXml.setPassword(getPassword());
+        return authorityDataXml;
+    }
+    public AuthorityDataXml gainAuthorityDataXml(YcConfigureParameters ycConfigureParamete) {
+        AuthorityDataXml authorityDataXml = new AuthorityDataXml();
+        authorityDataXml.setUserName(ycConfigureParamete.getUserName());
+        authorityDataXml.setPassword(ycConfigureParamete.getPassword());
         return authorityDataXml;
     }
 

src/main/java/com/ydtech/modules/ins/service/impl/InsAlltrustApiServiceImpl.java

@@ -1087,7 +1087,7 @@ public class InsAlltrustApiServiceImpl implements InsAlltrustApiService {
         requestLabel.setProno("0326");
         requestLabel.setMotorTypeCode("11");
         requestLabel.setCFstRegYm(carModelReq.getEnrollDate());
-        requestLabel.setAuthorityData(ycConfigureParameters.gainAuthorityDataXml());
+        requestLabel.setAuthorityData(ycConfigureParameters.gainAuthorityDataXml(ycConfigureParameters));
 
 
         m.setRequestLabel(requestLabel);

src/main/java/com/ydtech/utils/IDCardUtils.java

@@ -340,7 +340,7 @@ public class IDCardUtils {
      * @return
      */
     public static Map<String, String> addressResolution(String address) {
-        String regex = "(?<province>[^省]+自治区|.*?省|.*?行政区|.*?市)(?<city>[^市]+自治州|.*?地区|.*?行政单位|.+盟|市辖区|.*?市|.*?县)(?<district>[^县]+县|.*?区|.+市|.+旗|.+海域|.+岛)?(?<town>[^区]+区|.+镇)?(?<detail>.*)";
+        String regex = "(?<province>[^省]+自治区|.*?省|.*?行政区|.*?市|.*?蒙古)(?<city>[^市]+自治州|.*?地区|.*?行政单位|.+盟|市辖区|.*?市|.*?县)(?<district>[^县]+县|.*?区|.+市|.*?旗|.+海域|.+岛)?(?<town>[^区]+区|.+镇)?(?<detail>.*)";
         Matcher m = Pattern.compile(regex).matcher(address);
         String province = null, city = null, district = null, town = null, detail = null;
 //        List<Map<String, String>> table = new ArrayList<Map<String, String>>();
@@ -364,19 +364,23 @@ public class IDCardUtils {
     }
 
     public static void main(String[] args) throws ParseException {
+
+
+        Map m = addressResolution("内蒙古锡林郭勒盟太仆寺旗红旗镇建中村张油坊营子3组48号");
+
         // String IDCardNum="210102820826411";
         // String IDCardNum="210102198208264114";
         String IDCardNum = "43282219381105414X";
-        IDCardUtils cc = new IDCardUtils();
-        long time = System.currentTimeMillis();
-        System.out.println(cc.idCardValidate(IDCardNum));
-        System.out.println(cc.idCardValidate(IDCardNum));
-        System.out.println(System.currentTimeMillis() - time);
-        cc = new IDCardUtils();
-        time = System.currentTimeMillis();
-        System.out.println(cc.idCardValidate(IDCardNum));
-        System.out.println(System.currentTimeMillis() - time);
-        //				 System.out.println(cc.isDate("19870827"));
-        System.out.println(IDCardUtils.GetBirthday(IDCardNum));
+//        IDCardUtils cc = new IDCardUtils();
+//        long time = System.currentTimeMillis();
+//        System.out.println(cc.idCardValidate(IDCardNum));
+//        System.out.println(cc.idCardValidate(IDCardNum));
+//        System.out.println(System.currentTimeMillis() - time);
+//        cc = new IDCardUtils();
+//        time = System.currentTimeMillis();
+//        System.out.println(cc.idCardValidate(IDCardNum));
+//        System.out.println(System.currentTimeMillis() - time);
+//        //				 System.out.println(cc.isDate("19870827"));
+//        System.out.println(IDCardUtils.GetBirthday(IDCardNum));
     }
 }

src/main/java/com/ydtech/utils/JsonUtils.java

@@ -5,6 +5,7 @@
  */
 package com.ydtech.utils;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.core.JsonGenerationException;
 import com.fasterxml.jackson.core.JsonParseException;
@@ -16,6 +17,9 @@ import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.type.TypeFactory;
 import com.ydtech.modules.base.model.dto.BaseDto;
+import com.ydtech.modules.ins.model.guoRen.CarPriceResp;
+import com.ydtech.modules.ins.model.guoRen.InsuranceSlipResp;
+import com.ydtech.modules.ins.model.guoRen.ResponseDto;
 import org.springframework.util.Assert;
 
 import java.io.IOException;
@@ -222,4 +226,12 @@ public final class JsonUtils {
     }
 
 
+    public static void main(String[] args) {
+        String result = "{\"PLATFORM_STS\":\"0\",\"PLATFORM_TYPE\":\"3\",\"PLATFORM_CODE\":\"T0000000\",\"PLATFORM_MSG\":\"服务转接成功。\",\"RESPONSE_BODY\":{\"resultCode\":1,\"resultMsg\":null,\"data\":null}}";
+        ResponseDto rest = JSON.parseObject(result, ResponseDto.class);
+        CarPriceResp resp = ResponseDto.buildBody(rest, CarPriceResp.class);
+        System.err.println("222222222222");
+    }
+
+
 }