Merge branch 'master-modify-cutAmount' into dev

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/OrderRentVehicleDetail.java

@@ -330,7 +330,7 @@ public class OrderRentVehicleDetail implements Serializable {
 	private String costDetailExtend;
 
 
-	public void setCostDetailExtend(CostDetailExtend costDetailExtend) {
+	public void handelCostDetailExtend(CostDetailExtend costDetailExtend) {
 		this.costDetailExtend = JsonUtil.objectToJson(((CostDetailExtend)costDetailExtend));
 	}
 }

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/OrderTourDetail.java

 package com.xxfc.platform.order.entity;
 
 import com.github.wxiaoqi.security.admin.vo.AppUserVo;
+import com.github.wxiaoqi.security.common.util.JsonUtil;
+import com.xxfc.platform.order.pojo.price.CostDetailExtend;
 import com.xxfc.platform.tour.entity.TourUser;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -251,4 +253,8 @@ public class OrderTourDetail implements Serializable {
 
 	@Transient
 	private List<TourUser> userVoList;
+
+	public void handelCostDetailExtend(CostDetailExtend costDetailExtend) {
+		this.costDetailExtend = JsonUtil.objectToJson(((CostDetailExtend)costDetailExtend));
+	}
 }

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

@@ -6,7 +6,6 @@ import cn.hutool.core.util.StrUtil;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.common.exception.BaseException;
-import com.github.wxiaoqi.security.common.util.JsonUtil;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.xxfc.platform.activity.feign.ActivityFeign;
 import com.xxfc.platform.order.biz.*;
@@ -18,7 +17,6 @@ import com.xxfc.platform.order.pojo.calculate.InProgressVO;
 import com.xxfc.platform.order.pojo.mq.OrderMQDTO;
 import com.xxfc.platform.order.pojo.price.CancelNoStartVO;
 import com.xxfc.platform.order.pojo.price.CancelStartedVO;
-import com.xxfc.platform.order.pojo.price.CostDetailExtend;
 import com.xxfc.platform.tour.feign.TourFeign;
 import com.xxfc.platform.universal.feign.ThirdFeign;
 import com.xxfc.platform.vehicle.common.RestResponse;
@@ -177,7 +175,7 @@ public class OrderCancelBiz {
                             }
                         }
                         orderTemplateBiz.handleCostDetailExtend(csv);
-                        orvd.setCostDetailExtend(csv);
+                        orvd.handelCostDetailExtend(csv);
                         orderRentVehicleBiz.updateSelectiveByIdRe(orvd);
                     }else {
                         //没到出车时间
@@ -203,7 +201,7 @@ public class OrderCancelBiz {
                                         setViolateDesc(deduction.getName());
                                     }};
                                     orderTemplateBiz.handleCostDetailExtend(cnsv);
-                                    orvd.setCostDetailExtend(cnsv);
+                                    orvd.handelCostDetailExtend(cnsv);
                                     orderRentVehicleBiz.updateSelectiveByIdRe(orvd);
                                 }
                             }