修改优惠券返回bug

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

@@ -252,31 +252,31 @@ public class BaseOrder implements Serializable {
 	@Column(name = "member_level")
 	private Integer memberLevel;
 
-//	/**
-//	 * 违约金
-//	 */
-//	@ApiModelProperty(value = "违约金")
-//	@Column(name = "violate_amount")
-//	BigDecimal ViolateAmount;
-//
-//	/**
-//	 * 赔偿金
-//	 */
-//	@ApiModelProperty(value = "赔偿金")
-//	@Column(name = "damages_amount")
-//	BigDecimal damagesAmount;
-//
-//	/**
-//	 * 额外费用
-//	 */
-//	@ApiModelProperty(value = "额外费用")
-//	@Column(name = "extra_amount")
-//	BigDecimal extraAmount;
-//
-//	/**
-//	 * 返还的优惠券
-//	 */
-//	@ApiModelProperty(value = "返回的优惠券")
-//	@Column(name = "back_coupon")
-//	String backCoupon;
+	/**
+	 * 违约金
+	 */
+	@ApiModelProperty(value = "违约金")
+	@Column(name = "violate_amount")
+	BigDecimal ViolateAmount;
+
+	/**
+	 * 赔偿金
+	 */
+	@ApiModelProperty(value = "赔偿金")
+	@Column(name = "damages_amount")
+	BigDecimal damagesAmount;
+
+	/**
+	 * 额外费用
+	 */
+	@ApiModelProperty(value = "额外费用")
+	@Column(name = "extra_amount")
+	BigDecimal extraAmount;
+
+	/**
+	 * 返还的优惠券
+	 */
+	@ApiModelProperty(value = "返回的优惠券")
+	@Column(name = "back_coupon")
+	String backCoupon;
 }

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

 package com.xxfc.platform.order.biz.inner;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.StrUtil;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
@@ -191,6 +193,10 @@ public class OrderCancelBiz {
                             }
                         }
 
+                        //设置订单数据
+                        baseOrder.setViolateAmount(csv.getViolateAmount());
+                        baseOrder.setExtraAmount(inProgressVO.getExtraAmount());
+
                         csv.initParamJson();
                         //orderTemplateBiz.handleCostDetailExtend(csv);
                         orvd.handelCostDetailExtend(csv);
@@ -208,6 +214,11 @@ public class OrderCancelBiz {
                         //退款流程
                         orderAccountBiz.rentRefundProcessCancel(baseOrder, orderItem.getRealAmount(), timeLag, APP_ORDER+ "_"+ RENT_REFUND, orvd.getDeposit(), freeDayAmount, oad, topAmount);
 
+                        //设置订单数据
+                        //baseOrder.setDamagesAmount(csv.getDamagesAmount());
+                        //baseOrder.setExtraAmount(inProgressVO.getExtraAmount());
+                        baseOrder.setBackCoupon(baseOrder.getCouponTickerNos());
+
                         //如果有扣款项，则生成额外的费用明细
                         if(oad.getDeductions().size() > 0) {
                             for(OrderAccountDeduction deduction : oad.getDeductions()) {
@@ -217,10 +228,14 @@ public class OrderCancelBiz {
                                         setViolateDesc(deduction.getName());
                                     }};
 
+                                    //设置订单数据
+                                    baseOrder.setViolateAmount(cnsv.getViolateAmount());
+
                                     cnsv.initParamJson();
                                     //orderTemplateBiz.handleCostDetailExtend(cnsv);
                                     orvd.handelCostDetailExtend(cnsv);
                                     orderRentVehicleBiz.updateSelectiveByIdRe(orvd);
+                                    break;
                                 }
                             }
                         }
@@ -273,7 +288,9 @@ public class OrderCancelBiz {
                                     setViolateDesc(deduction.getName());
                                 }};
 
-                                cnsv.initParamJson();
+                                //设置订单数据
+                                baseOrder.setViolateAmount(cnsv.getViolateAmount());
+
                                 //orderTemplateBiz.handleCostDetailExtend(cnsv);
                                 otd.handelCostDetailExtend(cnsv);
                                 orderTourDetailBiz.updateSelectiveByIdRe(otd);
@@ -322,12 +339,18 @@ public class OrderCancelBiz {
 
             //返还优惠券
             if(StrUtil.isNotBlank(baseOrder.getCouponTickerNos())) {
-                List<String> backCoupons = (null != inProgressVO)? inProgressVO.getBackCoupons(): Convert.convert(List.class, baseOrder.getCouponTickerNos().split(","));
+                List<String> backCoupons = (null == inProgressVO)? Convert.convert(List.class, baseOrder.getCouponTickerNos().split(",")): inProgressVO.getBackCoupons();
+                //设置订单参数
+                baseOrder.setBackCoupon(ArrayUtil.join(backCoupons, ","));
+
                 for(String backCoupon : backCoupons) {
                     activityFeign.cancelUse(backCoupon);
                 }
             }
 
+            //更新baseOrder
+            BeanUtil.copyProperties(baseOrderBiz.updateSelectiveByIdReT(baseOrder), baseOrder);
+
             //发送队列消息
             baseOrderBiz.sendOrderMq(orvd, otd, omd, baseOrder, OrderMQDTO.ORDER_CANCEL);
         }else {