785834757 преди 1 година
родител
ревизия
7464080702
променени са 1 файла, в които са добавени 9 реда и са изтрити 3 реда
  1. 9 3
      src/main/java/com/ydtech/modules/order/components/InsOrdersComponents.java

+ 9 - 3
src/main/java/com/ydtech/modules/order/components/InsOrdersComponents.java

@@ -16,6 +16,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.util.ObjectUtils;
 
 import java.util.List;
+import java.util.Objects;
 
 
 @Component
@@ -75,13 +76,18 @@ public class InsOrdersComponents {
             // 缓存中不存在,在数据库中取
             InsOrders insOrders = insOrdersService.getById(orderNo);
             quoteInfoVo = new BaseQuoteInfoVo(insOrders);
+        }else {
+            quoteInfoVo.setRiskList(JSON.parseArray(JSON.toJSONString(quoteInfoObj.getJSONArray("risk")), RiskInfoVo.class));
+            quoteInfoVo.setInsuredPersonInfo(JSON.parseObject(JSON.toJSONString(quoteInfoObj.getJSONObject("insureinfo")), CustomerInfoVo.class));
+            quoteInfoVo.setPolicyHolderInfo(JSON.parseObject(JSON.toJSONString(quoteInfoObj.getJSONObject("applyinfo")), CustomerInfoVo.class));
         }
-        quoteInfoVo.setRiskList(JSON.parseArray(JSON.toJSONString(quoteInfoObj.getJSONArray("risk")),RiskInfoVo.class));
-        quoteInfoVo.setInsuredPersonInfo(JSON.parseObject(JSON.toJSONString(quoteInfoObj.getJSONObject("insureinfo")), CustomerInfoVo.class));
-        quoteInfoVo.setPolicyHolderInfo(JSON.parseObject(JSON.toJSONString(quoteInfoObj.getJSONObject("applyinfo")), CustomerInfoVo.class));
         quoteInfoVo.setOrderNo(orderNo);
         //替换商业险信息
         quoteInfoVo.setKindList(kindInfoVoList);
+        //赋值 userid
+        if(Objects.isNull(quoteInfoVo.getUserid()) && quoteInfoVo.getUserid().equals("")) {
+            quoteInfoVo.setUserid(quoteInfoVo.getUserId());
+        }
         return quoteInfoVo;
     }