代码优化

ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/weishi/Insure.java

@@ -73,6 +73,11 @@ public class Insure extends TenantEntity {
      */
     private String batchNum;
 
+    /**
+     * 产品id
+     */
+    private Integer productId;
+
     /**
      * 产品计划代码，需联系客户经理提供
      */

ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/weishi/impl/InsureServiceImpl.java

@@ -105,6 +105,7 @@ public class InsureServiceImpl extends AbstractBaseService<InsureVo, InsureBo, I
         BeanUtil.copyProperties(req, insure, true);
         ProductResponse productRes = weishiService.productDetail(token, req.getProductId());
         ProductsResponse productsRes = StreamUtils.findFirst(productList, p -> Objects.equals(p.getProductID(), req.getProductId()));
+        ProductResponse.Plan plan = StreamUtils.findFirst(productRes.getPlans(), p -> StringUtils.equals(req.getProductNum(), p.getPlanNum()));
         insure.setUserId(LoginHelper.getUserId())
             .setMemberId(LoginHelper.getMemberId())
             .setReqJson(JSONUtil.toJsonStr(req))
@@ -115,10 +116,12 @@ public class InsureServiceImpl extends AbstractBaseService<InsureVo, InsureBo, I
             .setOrderUrl(res.getOrderUrl())
             .setOrderId(res.getOrderID())
             .setStatus(OrderStatus.P.getKey())
+            .setProductId(req.getProductId())
+            .setPlanId(Optional.ofNullable(plan).map(ProductResponse.Plan::getPlanID).orElse(null))
             .setInsuredCount(req.getUnits().get(0).getInsureds().size())
             .setInsuredName(req.getUnits().get(0).getPolicyHolder().getName())
-            .setInsuredAbbr(productRes.getInsureAbbr())
-            .setPlanName(productRes.getInsureAbbr() + " - " + Optional.ofNullable(StreamUtils.findFirst(productRes.getPlans(), p -> StringUtils.equals(req.getProductNum(), p.getPlanNum()))).map(ProductResponse.Plan::getPlanName).orElse(null))
+            .setInsuredAbbr(productsRes.getInsurerAbbr())
+            .setPlanName(productsRes.getInsurerAbbr() + " - " + Optional.ofNullable(plan).map(ProductResponse.Plan::getPlanName).orElse(null))
             .setOrderTime(new Date());
         insure.setCreateDept(LoginHelper.getDeptId());
         baseMapper.insert(insure);