update

src/main/java/com/gogirl/application/market/coupon/impl/MarketServiceImpl.java

@@ -1252,6 +1252,38 @@ public class MarketServiceImpl implements MarketService {
             freeInnerCouponCustomerRelevanceServiceList.forEach(couponCustomerRelevanceConsumer);
 
 
+            //6、普通内部券
+            List<CouponCustomerRelevance> normalInnerCouponCustomerRelevanceServiceList = innerCouponCustomerRelevanceServiceList
+                    .stream()
+                    //不是免单券
+                    .filter(couponCustomerRelevance -> !discountConfigListCouponId.contains(couponCustomerRelevance.getCouponId()))
+                    //不是折扣券
+                    .filter(couponCustomerRelevance -> !couponCustomerRelevance.getType().equals(CouponCustomerRelevance.TYPE_DISCOUNT))
+                    .collect(Collectors.toList());
+            if (normalInnerCouponCustomerRelevanceServiceList.size() > 1) {
+                throw new RRException("普通内部券只能用一张");
+            }
+            normalInnerCouponCustomerRelevanceServiceList.forEach(couponCustomerRelevanceConsumer);
+
+
+            //6、折扣内部券
+            List<CouponCustomerRelevance> discountInnerCouponCustomerRelevanceServiceList = innerCouponCustomerRelevanceServiceList
+                    .stream()
+                    //不是免单券
+                    .filter(couponCustomerRelevance -> !discountConfigListCouponId.contains(couponCustomerRelevance.getCouponId()))
+                    //是折扣券
+                    .filter(couponCustomerRelevance -> couponCustomerRelevance.getType().equals(CouponCustomerRelevance.TYPE_DISCOUNT))
+                    .collect(Collectors.toList());
+            discountInnerCouponCustomerRelevanceServiceList.forEach(couponCustomerRelevanceConsumer);
+
+            if (normalInnerCouponCustomerRelevanceServiceList.size() + discountInnerCouponCustomerRelevanceServiceList.size() > 1) {
+                throw new RRException("普通内部券只能用一张");
+            }
+            if (freeInnerCouponCustomerRelevanceServiceList.size() > 1) {
+                throw new RRException("免单券券只能用一张");
+            }
+
+
             //2、次卡
             if (ListUtil.isNotEmpty(timesCardUsedRecordList)) {
                 //次卡使用记录
@@ -1318,37 +1350,6 @@ public class MarketServiceImpl implements MarketService {
 
                         });
             }
-
-            //6、普通内部券
-            List<CouponCustomerRelevance> normalInnerCouponCustomerRelevanceServiceList = innerCouponCustomerRelevanceServiceList
-                    .stream()
-                    //不是免单券
-                    .filter(couponCustomerRelevance -> !discountConfigListCouponId.contains(couponCustomerRelevance.getCouponId()))
-                    //不是折扣券
-                    .filter(couponCustomerRelevance -> !couponCustomerRelevance.getType().equals(CouponCustomerRelevance.TYPE_DISCOUNT))
-                    .collect(Collectors.toList());
-            if (normalInnerCouponCustomerRelevanceServiceList.size() > 1) {
-                throw new RRException("普通内部券只能用一张");
-            }
-            normalInnerCouponCustomerRelevanceServiceList.forEach(couponCustomerRelevanceConsumer);
-
-
-            //6、折扣内部券
-            List<CouponCustomerRelevance> discountInnerCouponCustomerRelevanceServiceList = innerCouponCustomerRelevanceServiceList
-                    .stream()
-                    //不是免单券
-                    .filter(couponCustomerRelevance -> !discountConfigListCouponId.contains(couponCustomerRelevance.getCouponId()))
-                    //是折扣券
-                    .filter(couponCustomerRelevance -> couponCustomerRelevance.getType().equals(CouponCustomerRelevance.TYPE_DISCOUNT))
-                    .collect(Collectors.toList());
-            discountInnerCouponCustomerRelevanceServiceList.forEach(couponCustomerRelevanceConsumer);
-
-            if (normalInnerCouponCustomerRelevanceServiceList.size() + discountInnerCouponCustomerRelevanceServiceList.size() > 1) {
-                throw new RRException("普通内部券只能用一张");
-            }
-            if (freeInnerCouponCustomerRelevanceServiceList.size() > 1) {
-                throw new RRException("免单券券只能用一张");
-            }
         }
         orderManageMapper.updateById(orderManage);
         orderServeService.updateBatchById(orderServeList);