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

src/main/java/com/ydtech/modules/fee/service/impl/FeeRuleSchemeServiceNewImpl.java

@@ -539,7 +539,11 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
                 return true;
             } else {
                 logs.append("规则匹配失败:" + ptlAgreementUndwrtRulesAttrLinks.get(i).getAttrCode() + "\n");
-                logs.append("校验的值:" + ptlAgreementUndwrtRulesAttrLinks.get(i).getMin() + "\n");
+                if(ptlAgreementUndwrtRulesAttrLinks.get(i).getMin() != null) {
+                    logs.append("校验的值:" + ptlAgreementUndwrtRulesAttrLinks.get(i).getMin() + "\n");
+                }else{
+                    logs.append("校验的值:" + ptlAgreementUndwrtRulesAttrLinks.get(i).getMax() + "\n");
+                }
                 logs.append("传入的值:" + ruleAttrMappingVo.getValue());
             }
         }

src/main/java/com/ydtech/modules/ins/model/vo/QuoteRespVo.java

@@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ydtech.modules.order.entity.TaxArrears;
 import com.ydtech.modules.order.entity.crawler.response.CrawlerQuoteResponse;
 import com.ydtech.modules.order.entity.vo.CoreModelsVo;
+import com.ydtech.utils.StringUtils;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -168,6 +169,15 @@ public class QuoteRespVo {
     @ApiModelProperty("商业出险次数")
     private String syClaims;
 
+
+    public void setJqClaims(String jqClaims) {
+        this.jqClaims = StringUtils.isEmpty(jqClaims) ? null : jqClaims;
+    }
+
+    public void setSyClaims(String syClaims) {
+        this.syClaims = StringUtils.isEmpty(jqClaims) ? null : syClaims;
+    }
+
     public List<AccidentResponseVo> getAccidentInfo() {
         return accident == null ? Collections.emptyList() : accident;
     }

src/main/java/com/ydtech/modules/order/components/gouren/GuorenDuplicateInsuranceComponent.java

@@ -137,7 +137,10 @@ public class GuorenDuplicateInsuranceComponent {
                 PremiumReq.CiDTO ci = req.getCi();
                 ci.setTrafficTime(jqEndDate);
             }
-            return true;
+            if (StringUtils.isNotEmpty(jqEndDate) || StringUtils.isNotEmpty(syEndDate)) {
+                return true;
+            }
+            return false;
         }
 
         return false;

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

@@ -16,9 +16,7 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.http.HttpHeaders;
 import org.springframework.stereotype.Component;
 
-import java.text.SimpleDateFormat;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
+import java.util.Optional;
 
 
 /**
@@ -56,6 +54,9 @@ public class ZijinDuplicateInsuranceComponents extends ResponseMessageAbstractHa
                                                    String message,
                                                    QueryActualValueRequest queryActualValueRequest,
                                                    boolean retry) {
+
+
+
         InsuranceLog.infoLog(InsuranceEnum.ZKIC.getPinyin(), "\n\t---------> {}\n\t---------> {}", "紫金财险重复投保处理",
                 calculatePremiumResponse.getRtnMsg());
         String rtnMsg = calculatePremiumResponse.getRtnMsg();

src/main/java/com/ydtech/modules/order/components/zijin/ZijinRequestApiComponents.java

@@ -262,6 +262,10 @@ public class ZijinRequestApiComponents {
                 .map(CalculatePremiumResponse.BasePartDTO::getReinsureMessage)
                 .orElse("");
 
+        if (reinsureMessage.contains(ResultEnum.R_ZGD_001.getDesc())) {
+            throw new SystemException(reinsureMessage);
+        }
+
         if (StringUtils.isNotEmpty(reinsureMessage)) {
             calculatePremiumResponse.setRtnCode(ResultEnum.C_4001);
             calculatePremiumResponse.setRtnMsg(reinsureMessage);

src/main/java/com/ydtech/modules/order/entity/api/zijin/constants/enums/ResultEnum.java

@@ -22,6 +22,7 @@ public enum ResultEnum {
     R_9980("9980", "转保标志"),
     R_1557("1557", "车型不一致"),
     R_9999("9999", "系统异常"),
+    R_ZGD_001("001", "保单状态为待支付"),
     R_999("999", "中保信异常");
 
     private final String code;

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

@@ -740,6 +740,7 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
         quoteRespVo.setJqPremium(jqPremiumBig.doubleValue());
         quoteRespVo.setSyPremium(syPremiumBig.doubleValue());
 
+
         // 出险次数
         List<PremiumResp.DataDTO.CiInsureDemandDTO> ciInsureDemandDTOS = rd.getCiInsureDemandDTOS();
         for (PremiumResp.DataDTO.CiInsureDemandDTO ciInsureDemandDTO : ciInsureDemandDTOS) {

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

@@ -496,27 +496,12 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
             quoteRespVo.setJqLossRation(StringUtils.toDouble(priceInfoListDTO.getLrRecomAdjust()));
             quoteRespVo.setSyLossRation(StringUtils.toDouble(priceInfoListDTO.getLrRecom()));
             quoteRespVo.setAccidentInfoStr(priceInfoListDTO.getClaimTimes());
-        }
-
-        // 车辆信息
-        for (CalculatePremiumResponse.PriceInfoListDTO priceInfoListDTO : priceInfoList) {
-
+            quoteRespVo.setSyClaims(priceInfoListDTO.getClaimTimes());
             // 鼎然分
             String score = Optional.ofNullable(priceInfoListDTO.getUbiPredictedInfo())
                     .map(CalculatePremiumResponse.PriceInfoListDTO.UbiPredictedInfoDTO::getScore)
                     .orElse(null);
             quoteRespVo.setUbiPredictedInfoScore(score);
-
-            switch (priceInfoListDTO.getRiskCode()) {
-                case RiskCodeEnum.TRAFFIC_CODE:
-                    quoteRespVo.setJqClaims(priceInfoListDTO.getClaimTimes());
-                    break;
-                case RiskCodeEnum.BUSINESS_CODE:
-                    quoteRespVo.setSyClaims(priceInfoListDTO.getClaimTimes());
-                    break;
-                default:
-                    break;
-            }
         }
 
         List<QuoteKindRespVo> kindList1 = new ArrayList<>();

src/main/java/com/ydtech/modules/protocols/controller/PtlNewAgreementController.java

@@ -149,6 +149,12 @@ public class PtlNewAgreementController extends BaseController {
         return ptlAgreementProductCostsNewService.costsAuditBatch(costsAuditVo) ? HttpResult.ok("费用批量审核成功") : HttpResult.error("费用批量审核失败");
     }
 
+    @ApiOperation(value = "费用批量修改止期")
+    @PostMapping("/costs/endDateBatch")
+    public HttpResult costsEndDateBatch(@RequestBody AgreementProductCostsEndDateVo agreementProductCostsEndDateVo){
+        return ptlAgreementProductCostsNewService.costsEndDateBatch(agreementProductCostsEndDateVo) ? HttpResult.ok("费用批量修改成功") : HttpResult.error("费用批量修改失败");
+    }
+
     @ApiOperation(value = "获取承保规则列表")
     @PostMapping("/undwrt/rules/list")
     public PageResult getRulesList(@RequestBody AgreementUndwrtRulesQueryVo agreementUndwrtRulesQueryVo){

src/main/java/com/ydtech/modules/protocols/entity/vo/AgreementProductCostsEndDateVo.java

@@ -0,0 +1,15 @@
+package com.ydtech.modules.protocols.entity.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AgreementProductCostsEndDateVo {
+    @ApiModelProperty(value = "产品ids")
+    private List<String> ids;
+
+    @ApiModelProperty(value = "费用止期")
+    private String costsEndDate;
+}

src/main/java/com/ydtech/modules/protocols/entity/vo/AgreementProductQueryVo.java

@@ -6,6 +6,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.time.LocalDate;
+import java.util.List;
+
 @Data
 public class AgreementProductQueryVo extends PageRequest {
     @ApiModelProperty(value = "保险公司id")
@@ -21,7 +23,7 @@ public class AgreementProductQueryVo extends PageRequest {
     private String isAudit;
 
     @ApiModelProperty(value = "产品id")
-    private String productCode;
+    private List<String> productCode;
 
     @ApiModelProperty(value = "费用起期")
     private String costStartDate;

src/main/java/com/ydtech/modules/protocols/service/PtlAgreementProductCostsNewService.java

@@ -84,6 +84,13 @@ public interface PtlAgreementProductCostsNewService extends IService<PtlAgreemen
      */
     boolean costsAuditBatch(CostsAuditVo costsAuditVo);
 
+    /**
+     * 费用批量更改费用止期
+     * @param agreementProductCostsEndDateVo
+     * @return
+     */
+    boolean costsEndDateBatch(AgreementProductCostsEndDateVo agreementProductCostsEndDateVo);
+
     /**
      * 调整费用
      * @param feeOrderNewRecordVo

src/main/java/com/ydtech/modules/protocols/service/impl/PtlAgreementProductCostsNewServiceImpl.java

@@ -91,8 +91,8 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
         }
 
         //产品code
-        if (agreementProductQueryVo.getProductCode() != null){
-            ptlAgreementProductCostsNewLambdaQueryWrapper.eq(PtlAgreementProductCostsNew::getProductId, agreementProductQueryVo.getProductCode());
+        if (agreementProductQueryVo.getProductCode() != null && !agreementProductQueryVo.getProductCode().isEmpty()){
+            ptlAgreementProductCostsNewLambdaQueryWrapper.in(PtlAgreementProductCostsNew::getProductId, agreementProductQueryVo.getProductCode());
         }
 
         //费用时间
@@ -193,7 +193,7 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
         }
 
         //产品code
-        if(agreementProductQueryVo.getProductCode() != null){
+        if(agreementProductQueryVo.getProductCode() != null && !agreementProductQueryVo.getProductCode().isEmpty()){
             ptlAgreementProductCostsNewLambdaQueryWrapper.eq(PtlAgreementProductCostsNew::getProductId, agreementProductQueryVo.getProductCode());
         }
 
@@ -675,6 +675,10 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
         BeanUtils.copyProperties(agreementProductCosts, ptlAgreementProductCostsNew);
         //修改审核状态为未审核
         ptlAgreementProductCostsNew.setIsAudit(0);
+        String newProjectId = agreementProductCosts.getProductId().get(0);
+        String newProjectName = agreementProductCosts.getProductName().get(0);
+        ptlAgreementProductCostsNew.setProductId(newProjectId);
+        ptlAgreementProductCostsNew.setProductName(newProjectName);
         int update = baseMapper.updateById(ptlAgreementProductCostsNew);
 
         //更新费用出口表信息
@@ -966,6 +970,27 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
         return true;
     }
 
+    @Override
+    @Transactional
+    public boolean costsEndDateBatch(AgreementProductCostsEndDateVo agreementProductCostsEndDateVo){
+        for (String id : agreementProductCostsEndDateVo.getIds()){
+            PtlAgreementProductCostsNew ptlAgreementProductCostsNew = this.getById(id);
+            if(ptlAgreementProductCostsNew == null){
+                throw new SystemException("费用不存在");
+            }
+            if (agreementProductCostsEndDateVo.getCostsEndDate() == null) {
+                throw new SystemException("费用止期不可为空");
+            }
+            ptlAgreementProductCostsNew.setCostsEndDate(agreementProductCostsEndDateVo.getCostsEndDate());
+            String desc = "修改费用因子";
+            //添加费用因子轨迹
+            ptlAgreementProductCostsTrajectoryService.addCostsTrajectory(ptlAgreementProductCostsNew.getId(),desc,BaseController.getUser().getId());
+            baseMapper.updateById(ptlAgreementProductCostsNew);
+        }
+        return true;
+    }
+
+
     @Autowired
     PtlAgreementService ptlAgreementService;