Merge remote-tracking branch 'origin/master-modify-cutAmount' into master-modify-cutAmount

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderRentVehicleService.java

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.Dict;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.github.wxiaoqi.security.admin.constant.enumerate.MemberEnum;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
@@ -414,13 +415,13 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
      */
     private void costDetail(RentVehiclePriceVO vo, String children) {
         OrderTemplate template = orderTemplateBiz.selectByCode(OrderCostEnum.RENT_VEHICLE.getCode());
-//        (Map<String, String>)CollUtil.zip(CollUtil.newArrayList("children", "vehicleAmount", "realAmount", "paramJson")
-//                , CollUtil.newArrayList(children, vo.getVehicleAmount()+"", vo.getRealAmount()+"", vo.getParamJson()));
         template.setTemplate(orderTemplateBiz.result(template.getTemplate()
                 , CollUtil.zip(CollUtil.newArrayList("children", "vehicleAmount", "realAmount", "paramJson")
-                                , CollUtil.newArrayList(children, vo.getVehicleAmount()
-                                , vo.getRealAmount(), vo.getParamJson()))));
+                                , CollUtil.newArrayList(children, vo.getVehicleAmount(), vo.getRealAmount(), ""))));
         String result = orderTemplateBiz.result(template, Dict.parse(vo));
+        JSONObject jsonObject = JSONUtil.parseObj(result);
+        jsonObject.put("paramJson", vo.getParamJson());
+        result = JSONUtil.toJsonStr(jsonObject);
         vo.setCostDetail(result);
     }