Merge branch 'fix_coupon2' into branch

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

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

@@ -48,31 +48,29 @@ import java.util.stream.Collectors;
 public class MarketServiceImpl implements MarketService {
 
     @Resource
+    TimesCardUsedRecordMapper timesCardUsedRecordMapper;
+    @Resource
+    TimesCardOrderServeDetailMapper timesCardOrderServeDetailMapper;
+    @Resource
     private CouponMapper couponMapper;
-
     @Resource
     private CouponCustomerRelevanceService couponCustomerRelevanceService;
-
     @Resource
     private CouponOrderRelevanceService couponOrderRelevanceService;
-
     @Resource
     private OrderManageMapper orderManageMapper;
     @Resource
     private OrderServeMapper orderServeMapper;
-
     @Resource
     private TimesCardCustomerRelevanceMapper timesCardCustomerRelevanceMapper;
     @Resource
     private CouponCustomerRelevanceMapper couponCustomerRelevanceMapper;
-
     @Resource
     private OrderServeService orderServeService;
     @Resource
     private TimesCardUsedRecordService timesCardUsedRecordService;
     @Resource
     private TimesCardCustomerRelevanceService timesCardCustomerRelevanceService;
-
     @Resource
     private DiscountConfigMapper discountConfigMapper;
 
@@ -264,11 +262,6 @@ public class MarketServiceImpl implements MarketService {
         }
     }
 
-    @Resource
-    TimesCardUsedRecordMapper timesCardUsedRecordMapper;
-    @Resource
-    TimesCardOrderServeDetailMapper timesCardOrderServeDetailMapper;
-
     /**
      * 更新订单 使用次卡 使用外部券 使用内部券之后需要调用这个方法
      * 结算订单
@@ -593,6 +586,9 @@ public class MarketServiceImpl implements MarketService {
                     .filter(couponCustomerRelevance -> couponCustomerRelevance.getType().equals(CouponCustomerRelevance.TYPE_DISCOUNT))
                     .collect(Collectors.toList());
             discountInnerCouponCustomerRelevanceServiceList.forEach(couponCustomerRelevanceConsumer);
+            if (normalInnerCouponCustomerRelevanceServiceList.size() > 1) {
+                throw new RRException("普通内部券只能用一张");
+            }
         }
 
         orderManageMapper.updateById(orderManage);
@@ -600,15 +596,6 @@ public class MarketServiceImpl implements MarketService {
 
     }
 
-    @Data
-    static class CalcFreePay {
-        private Integer orderServeId;
-
-        private List<Integer> serveIds = new ArrayList<>();
-
-        private BigDecimal payPrice;
-    }
-
     private List<OrderServe> queryCanDiscount(OrderManage orderManage, List<Integer> serveIds, Integer counponId) {
 
         List<Integer> freeCouponIds = discountConfigMapper.selectList(new LambdaQueryWrapper<>()).stream().map(DiscountConfig::getCouponId)