Merge branch 'master-modify-cutAmount' into dev

# Conflicts:
#	xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/price/CostDetailExtend.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderTemplateBiz.java

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

 package com.xxfc.platform.order.pojo.price;
 
 import cn.hutool.json.JSONUtil;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
@@ -27,4 +26,5 @@ public class CostDetailExtend {
     public void initParamJson() {
         paramJson = JSONUtil.toJsonStr(this);
     }
+
 }

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

@@ -94,7 +94,6 @@ public class OrderTemplateBiz extends BaseBiz<OrderTemplateMapper,OrderTemplate>
             default:
                 break;
         }
-
         costDetailExtend.setCostDetail(result(template.getTemplate(), Dict.parse(costDetailExtend)));
     }
 

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

@@ -255,7 +255,9 @@ public class OrderCancelBiz {
                                     setViolateAmount(deduction.getAmount());
                                     setViolateDesc(deduction.getName());
                                 }};
-                                orderTemplateBiz.handleCostDetailExtend(cnsv);
+
+                                cnsv.initParamJson();
+                                //orderTemplateBiz.handleCostDetailExtend(cnsv);
                                 otd.setCostDetailExtend(cnsv.getCostDetail());
                                 orderTourDetailBiz.updateSelectiveByIdRe(otd);
                             }