Merge remote-tracking branch 'origin/dev' into dev

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

 package com.xxfc.platform.order.pojo.price;
 
+import cn.hutool.json.JSONUtil;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -8,11 +9,18 @@ import java.math.BigDecimal;
 @Data
 public class OrderPriceVO {
     @ApiModelProperty(value = "订单总金额")
-    public BigDecimal orderAmount;
+    public BigDecimal orderAmount = BigDecimal.ZERO;
     @ApiModelProperty(value = "商品价格")
-    public BigDecimal goodsAmount;
+    public BigDecimal goodsAmount = BigDecimal.ZERO;
     @ApiModelProperty(value = "实际价格")
-    public BigDecimal realAmount;
+    public BigDecimal realAmount = BigDecimal.ZERO;
     @ApiModelProperty(value = "优惠券扣除的费用")
-    public BigDecimal couponAmount;
+    public BigDecimal couponAmount = BigDecimal.ZERO;
+
+    @ApiModelProperty(value = "参数json")
+    public String paramJson = "";
+
+    public void initParamJson() {
+        paramJson = JSONUtil.toJsonStr(this);
+    }
 }

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

@@ -58,4 +58,5 @@ public class RentVehiclePriceVO extends OrderPriceVO{
      * 优惠描述
      */
     private String couponDesc = "";
+
 }

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

@@ -344,6 +344,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
         rvp.setBuyVehicleAmount(vehicleOrderItem.getBuyAmount());
         rvp.setCouponDesc(couponDesc);
 
+        rvp.initParamJson();
         //设置收费明细
         costDetail(rvp, handleChildren(detail, vehicleDayNum));
         return rvp;

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

@@ -279,6 +279,7 @@ public class OrderTourService extends AbstractOrderHandle<OrderTourDetailBiz, To
         tpv.setInsureAmount(insureAmount);
         tpv.setTotalNumber(detail.getTotalNumber());
 
+        tpv.initParamJson();
         //设置收费明细
         costDetail(tpv, handleChildren(detail));
         return tpv;