添加订单参数

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/OrderAboutParamDTO.java

 package com.xxfc.platform.order.pojo.order;
 
+import com.xxfc.platform.universal.entity.Dictionary;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 @Data
 public class OrderAboutParamDTO {
@@ -25,6 +29,8 @@ public class OrderAboutParamDTO {
     @ApiModelProperty(value = "免赔费用")
     private BigDecimal damageSafe;
 
+    List<Dictionary> personInsurances;
+
 //    @ApiModelProperty(value = "违章保留金")
 //    private BigDecimal ;
 }
\ No newline at end of file

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderAccountBiz.java

@@ -352,7 +352,7 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
         Integer dayLag = Long.valueOf(timeLag/(1000L * 60L * 60L * 24L)).intValue() + remainder > 0? 1: 0;
 
         Map<String, Dictionary> dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
-        Set<Dictionary> personInsurances = dictionaryMap.get(RENT_PERSON_INSURANCE).getChildrens();
+        Set<Dictionary> personInsurances = dictionaryMap.get(DictionaryKey.APP_ORDER+ "_"+ RENT_PERSON_INSURANCE).getChildrens();
 
         for(com.xxfc.platform.universal.entity.Dictionary dic : personInsurances) {
             if(StrUtil.isBlank(dic.getName())) {

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java

@@ -54,6 +54,7 @@ import tk.mybatis.mapper.weekend.WeekendSqls;
 
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -61,6 +62,7 @@ import java.util.stream.Collectors;
 import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE;
 import static com.xxfc.platform.order.entity.BaseOrder.ORDER_TYPE_VEHICLE;
 import static com.xxfc.platform.universal.constant.DictionaryKey.APP_ORDER;
+import static com.xxfc.platform.universal.constant.DictionaryKey.RENT_PERSON_INSURANCE;
 
 @Controller
 @RequestMapping("baseOrder")
@@ -155,6 +157,8 @@ public class BaseOrderController extends CommonBaseController implements UserRes
             setActMember(new Long(dictionaryMap.get(APP_ORDER + "_" + DictionaryKey.ACT_MEMBER).getDetail()));
             setDamageSafe(new BigDecimal(dictionaryMap.get(APP_ORDER + "_" + DictionaryKey.DAMAGE_SAFE).getDetail()));
             setDriverPrice(new BigDecimal(dictionaryMap.get(APP_ORDER + "_" + DictionaryKey.DRIVER_PRICE).getDetail()));
+            setPersonInsurances(dictionaryMap.get(DictionaryKey.APP_ORDER+ "_"+ RENT_PERSON_INSURANCE).getChildrens()
+                    .parallelStream().sorted(Comparator.comparing(Dictionary::getId)).collect(Collectors.toList()));
         }});
     }