Merge branch 'master-modify-cutAmount' into dev

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

@@ -342,10 +342,11 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
             );
 
             //设置定损金额
-            csv.setDamagesAmount(crosstown.getDeductionCost());
-            if(crosstown.getDeductionCost().compareTo(BigDecimal.ZERO) > 0) {
+            String handleDedRefundDesc = "";
+            handleDedRefundDesc = handleDed(crosstown, handleDedRefundDesc, csv);
+            if(csv.getDamagesAmount().compareTo(BigDecimal.ZERO) > 0) {
                 oad.getDeductions().add(
-                        initDeduction(crosstown.getDeductionCost(), "定损赔偿金", DeductionTypeEnum.DAMAGES, OrderAccountDeduction.ORIGIN_DEPOSIT)
+                        initDeduction(crosstown.getDeductionCost(), handleDedRefundDesc, DeductionTypeEnum.DAMAGES, OrderAccountDeduction.ORIGIN_DEPOSIT)
                 );
             }
 
@@ -361,7 +362,7 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
                     //crosstown.getRestDeposit().add(crosstown.getDeductionCost()).subtract(illegalReserve);
 
             String refundDesc = "退还押金："+ refundAmont.toString()+ "(已扣除 违章预备金："+ illegalReserve.toString();
-            refundDesc = handleDed(crosstown, refundDesc);
+            refundDesc += handleDedRefundDesc;
             refundDesc += ")";
             refundTrigger(orderMQDTO, orderMQDTO.getOrderRentVehicleDetail(), illegalReserve, originalRefundAmount, refundAmont, refundDesc, RefundStatusEnum.RESIDUE_ILLEGAL.getCode(), AccountTypeEnum.OUT_PART_DEPOSIT, oad);
 
@@ -397,12 +398,13 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
         }
     }
 
-    private String handleDed(OrderVehicleCrosstown crosstown, String refundDesc) {
+    private String handleDed(OrderVehicleCrosstown crosstown, String refundDesc, CancelStartedVO csv) {
         try{
             if(null != crosstown.getDedDetail()) {
                 List<DedDetailDTO> dddList = JSONUtil.toList(JSONUtil.parseArray(crosstown.getDedDetail()), DedDetailDTO.class);
                 for(DedDetailDTO ddd : dddList) {
                     refundDesc += ", "+ ddd.getDeductions()+ ":"+ ddd.getCost();
+                    csv.setDamagesAmount(csv.getDamagesAmount().add(ddd.getCost()));
                 }
             }
         }catch (Exception e) {

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

@@ -311,13 +311,6 @@ public class OrderCancelBiz {
                     }
                 }
 
-                //返还优惠券
-                if(StrUtil.isNotBlank(baseOrder.getCouponTickerNos())) {
-                    List<String> backCoupons = (null == inProgressVO)? inProgressVO.getBackCoupons(): Convert.convert(List.class, baseOrder.getCouponTickerNos().split(","));
-                    for(String backCoupon : backCoupons) {
-                        activityFeign.cancelUse(backCoupon);
-                    }
-                }
             }else if(OrderTypeEnum.TOUR.getCode().equals(baseOrder.getType())) {
                 otd = orderTourDetailBiz.selectOne(new OrderTourDetail(){{
                     setOrderId(baseOrder.getId());
@@ -327,6 +320,14 @@ public class OrderCancelBiz {
                 tourFeign.stock(otd.getSpePriceId(), otd.getTotalNumber(), TourFeign.STOCK_PLUS);
             }
 
+            //返还优惠券
+            if(StrUtil.isNotBlank(baseOrder.getCouponTickerNos())) {
+                List<String> backCoupons = (null != inProgressVO)? inProgressVO.getBackCoupons(): Convert.convert(List.class, baseOrder.getCouponTickerNos().split(","));
+                for(String backCoupon : backCoupons) {
+                    activityFeign.cancelUse(backCoupon);
+                }
+            }
+
             //发送队列消息
             baseOrderBiz.sendOrderMq(orvd, otd, omd, baseOrder, OrderMQDTO.ORDER_CANCEL);
         }else {