Selaa lähdekoodia

商业险险种问题

wks 2 vuotta sitten
vanhempi
commit
6d15d3f240
2 muutettua tiedostoa jossa 12 lisäystä ja 24 poistoa
  1. 0 21
      sql/Online.sql
  2. 12 3
      src/main/java/com/ydtech/modules/order/entity/InsOrders.java

+ 0 - 21
sql/Online.sql

@@ -1,21 +0,0 @@
--- add by  2024-06-20  账户表添加总金额
-ALTER TABLE `sys_user_account` ADD COLUMN `sum_amount` decimal(15,5) DEFAULT 0 COMMENT '账号总金额';
-ALTER TABLE `sys_user_account` ADD COLUMN `sum_amount_withdrawal` decimal(15,5) DEFAULT 0 COMMENT '提现总金额';
-ALTER TABLE `sys_user_account` ADD COLUMN `sum_amount_account` decimal(15,5) DEFAULT 0 COMMENT '已到账总金额';
-ALTER TABLE `sys_user_account` ADD COLUMN `sum_amount_payment` decimal(15,5) DEFAULT 0 COMMENT '支付中总金额';
---  add by   历史表添加业务板块字段
-ALTER TABLE `sys_user_account_history` ADD COLUMN `business_eegments_type` int DEFAULT NULL COMMENT '业务版块';
-
--- add by  审核轨迹表
-DROP TABLE IF EXISTS `sys_amount_auditing_history`;
-CREATE TABLE `sys_amount_auditing_history`  (
-                                                `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
-                                                `amount_auding_id` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '银行卡号',
-                                                `amount` decimal(10, 2) NOT NULL COMMENT '提现金额',
-                                                `user_id` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '用户Id',
-                                                `create_time` datetime NOT NULL COMMENT '创建时间',
-                                                `auditing_status` varchar(10) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '审核状态 1 提现申请  2.处理中 3.驳回  4.提现成功',
-                                                `amount_status` varchar(10) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '金额类型 1 提现',
-                                                `history_id` varchar(30) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '历史记录表id',
-                                                PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 9 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '审核轨迹表' ROW_FORMAT = Dynamic;

+ 12 - 3
src/main/java/com/ydtech/modules/order/entity/InsOrders.java

@@ -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);