Commit 934d63ea authored by 周健威's avatar 周健威

修改代码

parent a3e446e2
package com.xxfc.platform.order.pojo.price; package com.xxfc.platform.order.pojo.price;
import cn.hutool.json.JSONUtil;
import lombok.Data; import lombok.Data;
@Data @Data
...@@ -16,4 +17,14 @@ public class CostDetailExtend { ...@@ -16,4 +17,14 @@ public class CostDetailExtend {
* type:1--取消违约金;2--取消费用明细;3--提前还车费用明细;4--延期还车费用明细 * type:1--取消违约金;2--取消费用明细;3--提前还车费用明细;4--延期还车费用明细
*/ */
protected Integer type; protected Integer type;
/**
* 参数json
*/
public String paramJson = "";
public void initParamJson() {
paramJson = JSONUtil.toJsonStr(this);
}
} }
...@@ -71,12 +71,18 @@ public class OrderTemplateBiz extends BaseBiz<OrderTemplateMapper,OrderTemplate> ...@@ -71,12 +71,18 @@ public class OrderTemplateBiz extends BaseBiz<OrderTemplateMapper,OrderTemplate>
} }
public <T extends CostDetailExtend> void handleCostDetailExtend(T costDetailExtend) { public <T extends CostDetailExtend> void handleCostDetailExtend(T costDetailExtend) {
OrderTemplate template = new OrderTemplate();
switch (costDetailExtend.getType()) { switch (costDetailExtend.getType()) {
case CostDetailExtend.CANCEL_NO_START : case CostDetailExtend.CANCEL_NO_START :
template = selectByCode(OrderCostEnum.RENT_VEHICLE.getCode());
template.setTemplate(result(template.getTemplate(), new HashMap(){{
put("paramJson", costDetailExtend.getParamJson());
}}));
break; break;
case CostDetailExtend.CANCEL_STARTED : case CostDetailExtend.CANCEL_STARTED :
OrderTemplate template = selectByCode(OrderCostEnum.RENT_VEHICLE.getCode()); template = selectByCode(OrderCostEnum.RENT_VEHICLE.getCode());
template.setTemplate(result(template.getTemplate(), new HashMap(){{ template.setTemplate(result(template.getTemplate(), new HashMap(){{
put("paramJson", costDetailExtend.getParamJson());
put("children", handleChildren(costDetailExtend)); put("children", handleChildren(costDetailExtend));
put("consumeAmount", ((CancelStartedVO)costDetailExtend).getConsumeAmount()); put("consumeAmount", ((CancelStartedVO)costDetailExtend).getConsumeAmount());
}})); }}));
...@@ -88,7 +94,6 @@ public class OrderTemplateBiz extends BaseBiz<OrderTemplateMapper,OrderTemplate> ...@@ -88,7 +94,6 @@ public class OrderTemplateBiz extends BaseBiz<OrderTemplateMapper,OrderTemplate>
default: default:
break; break;
} }
OrderTemplate template = selectByCode(OrderCostEnum.CANCEL_NO_START.getCode());
costDetailExtend.setCostDetail(result(template.getTemplate(), Dict.parse(costDetailExtend))); costDetailExtend.setCostDetail(result(template.getTemplate(), Dict.parse(costDetailExtend)));
} }
......
...@@ -174,7 +174,9 @@ public class OrderCancelBiz { ...@@ -174,7 +174,9 @@ public class OrderCancelBiz {
} }
} }
} }
orderTemplateBiz.handleCostDetailExtend(csv);
csv.initParamJson();
//orderTemplateBiz.handleCostDetailExtend(csv);
orvd.handelCostDetailExtend(csv); orvd.handelCostDetailExtend(csv);
orderRentVehicleBiz.updateSelectiveByIdRe(orvd); orderRentVehicleBiz.updateSelectiveByIdRe(orvd);
}else { }else {
...@@ -251,7 +253,9 @@ public class OrderCancelBiz { ...@@ -251,7 +253,9 @@ public class OrderCancelBiz {
setViolateAmount(deduction.getAmount()); setViolateAmount(deduction.getAmount());
setViolateDesc(deduction.getName()); setViolateDesc(deduction.getName());
}}; }};
orderTemplateBiz.handleCostDetailExtend(cnsv);
cnsv.initParamJson();
//orderTemplateBiz.handleCostDetailExtend(cnsv);
otd.setCostDetailExtend(cnsv.getCostDetail()); otd.setCostDetailExtend(cnsv.getCostDetail());
orderTourDetailBiz.updateSelectiveByIdRe(otd); orderTourDetailBiz.updateSelectiveByIdRe(otd);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment