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

src/main/java/com/ydtech/modules/fee/dto/vo/RuleAttrMappingVo.java

@@ -393,7 +393,7 @@ public class RuleAttrMappingVo {
                 .map(String::valueOf)
                 .ifPresent(x -> ruleAttrMappingVoList.add(new RuleAttrMappingVo("SeriesTypeActualName", x)));
         //数值型总评分
-        Pattern pattern = Pattern.compile("[0-9]*");
+        Pattern pattern = Pattern.compile("\\d+(\\.\\d+)?");
         if (insAreaCompany.getScore() != null) {
             if (pattern.matcher(insAreaCompany.getScore()).matches()) {
                 //数值型评分

src/main/java/com/ydtech/modules/order/controller/InsCrawlerOrderController.java

@@ -187,7 +187,7 @@ public class InsCrawlerOrderController extends BaseController {
     @ApiOperation(value = "统一发送登录验证码")
     public HttpResult sendLoginSmsCode(@RequestBody PtlAgreementAttributionDto agreementAttributionDto) {
         JSONObject response = insuranceCrawlerOrderService.sendLoginSmsCode(agreementAttributionDto);
-        if (response.getInteger("code") == 400){
+        if (response.getInteger("code") == 200){
             return HttpResult.ok(response.getString("message"),response.getString("secretKey"));
         }else{
             return HttpResult.error("验证码发送失败");

src/main/java/com/ydtech/modules/order/entity/vo/BaseQuoteVo.java

@@ -188,4 +188,7 @@ public class BaseQuoteVo<T> {
     @ApiModelProperty("人保赔付优化申请")
     private String preDiscount;
 
+    @ApiModelProperty("永安商业折扣")
+    private String yaBusinessDiscount;
+
 }

src/main/java/com/ydtech/modules/order/service/impl/InsCrawlerOrderServiceImpl.java

@@ -1,5 +1,6 @@
 package com.ydtech.modules.order.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -156,7 +157,7 @@ public class InsCrawlerOrderServiceImpl implements InsCrawlerOrderService {
         // 是否需要验车
         crawlerQuoteRequest.setIsInspect(t.getIsInspect());
         // 永安商业折扣
-        crawlerQuoteRequest.setYaBusinessDiscount(t.getDiscount());
+        crawlerQuoteRequest.setYaBusinessDiscount(t.getYaBusinessDiscount());
         // 上次订单
         if (StringUtils.isNotEmpty(t.getLastCompanyId())) {
             InsAreaCompany insAreaCompany = insAreaCompanyService.getById(t.getLastCompanyId());
@@ -1150,6 +1151,10 @@ public class InsCrawlerOrderServiceImpl implements InsCrawlerOrderService {
             ctCrawlerLoginRequest.setOther(new LinkedHashMap<>());
             ctCrawlerLoginRequest.getOther().put("phone",agreement.getAttribution().getPhone());
             ctCrawlerLoginRequest.getOther().put("mescoed",agreement.getAgreement().getSmsCode());
+            PtlAgreementAttributionDto attribution = agreement.getAttribution();
+            if(CollUtil.isNotEmpty(attribution.getFields())){
+                ctCrawlerLoginRequest.getOther().putAll(attribution.getFields().stream().collect(LinkedHashMap::new, (m, v) -> m.put(v.getField(), v.getValue()), LinkedHashMap::putAll));
+            }
             ctCrawlerLoginRequest.setCheck("zs");
             // 组装 Other 信息
             Map<String,String> otherMap = new HashMap<>();