|
|
@@ -17,6 +17,7 @@ import com.ydtech.modules.admin.model.SysDept;
|
|
|
import com.ydtech.modules.admin.model.SysUser;
|
|
|
import com.ydtech.modules.ins.model.vo.KindInfoVo;
|
|
|
import com.ydtech.modules.ins.model.vo.RiskInfoVo;
|
|
|
+import com.ydtech.modules.order.entity.api.zijin.constants.enums.RiskCodeEnum;
|
|
|
import com.ydtech.modules.order.entity.vo.BaseQuoteInfoVo;
|
|
|
import io.swagger.annotations.ApiModelProperty;
|
|
|
import lombok.*;
|
|
|
@@ -24,7 +25,9 @@ import lombok.*;
|
|
|
import java.io.Serializable;
|
|
|
import java.math.BigDecimal;
|
|
|
import java.time.LocalDateTime;
|
|
|
+import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
* 保险订单表
|
|
|
@@ -287,8 +290,6 @@ public class InsOrders implements Serializable {
|
|
|
private BigDecimal noCostsProportion;
|
|
|
|
|
|
|
|
|
-
|
|
|
-
|
|
|
public InsOrders(SysUser user, SysDept dept, BaseQuoteInfoVo quoteInfoVo) {
|
|
|
// 2. 组装订单
|
|
|
this.setQuoteno(String.valueOf(quoteInfoVo.getQuoteno()));
|
|
|
@@ -318,7 +319,15 @@ public class InsOrders implements Serializable {
|
|
|
|
|
|
// 2.3.1 险种信息
|
|
|
this.setRisk(JSON.parseArray(JSON.toJSONString(quoteInfoVo.getRiskList())));
|
|
|
- this.setKing(JSON.parseArray(JSON.toJSONString(quoteInfoVo.getKindList())));
|
|
|
+ List<RiskInfoVo> riskInfoVoList = quoteInfoVo.getRiskList().stream().filter(x -> RiskCodeEnum.RC_050A.getCode().equals(x.getRiskCode())).collect(Collectors.toList());
|
|
|
+
|
|
|
+ // 处理商业险险种为空的时候 存入商业险信息问题
|
|
|
+ if (!riskInfoVoList.isEmpty()) {
|
|
|
+ this.setKing(JSON.parseArray(JSON.toJSONString(quoteInfoVo.getKindList())));
|
|
|
+ } else {
|
|
|
+ this.setKing(JSON.parseArray(JSON.toJSONString(new ArrayList<RiskInfoVo>())));
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
// 2.4 产品信息
|
|
|
this.productInformation(risks, kinds);
|