修改优惠券返回bug

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 {