update

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

@@ -238,7 +238,7 @@ public class MarketServiceImpl implements MarketService {
                 .list(new LambdaQueryWrapper<CouponCustomerRelevance>()
                         .eq(CouponCustomerRelevance::getOrderId, orderId)
                         .eq(CouponCustomerRelevance::getState, 1)
-                        .eq(CouponCustomerRelevance::getType, 0));
+                        .eq(CouponCustomerRelevance::getSourceType, 0));
         innerCouponCustomerRelevanceServiceList.forEach(couponCustomerRelevance -> couponCustomerRelevance.setState(CouponCustomerRelevance.STATE_USED));
         if (ListUtil.isNotEmpty(innerCouponCustomerRelevanceServiceList)) {
             couponCustomerRelevanceService.saveOrUpdateBatch(innerCouponCustomerRelevanceServiceList);
@@ -253,7 +253,7 @@ public class MarketServiceImpl implements MarketService {
                 .list(new LambdaQueryWrapper<CouponCustomerRelevance>()
                         .eq(CouponCustomerRelevance::getOrderId, orderId)
                         .eq(CouponCustomerRelevance::getState, 1)
-                        .eq(CouponCustomerRelevance::getType, 1));
+                        .eq(CouponCustomerRelevance::getSourceType, 1));
         outerCouponCustomerRelevanceServiceList.forEach(couponCustomerRelevance -> couponCustomerRelevance.setState(CouponCustomerRelevance.STATE_USED));
         if (ListUtil.isNotEmpty(outerCouponCustomerRelevanceServiceList)) {
             couponCustomerRelevanceService.saveOrUpdateBatch(outerCouponCustomerRelevanceServiceList);
@@ -498,7 +498,7 @@ public class MarketServiceImpl implements MarketService {
                     BigDecimal totalCouponDiscount = couponCustomerRelevance.getDiscountAmount();
                     //折扣券
                     if (couponCustomerRelevance.getType().equals(CouponCustomerRelevance.TYPE_DISCOUNT)) {
-                        totalCouponDiscount = orderManage.getTotalPaymentAmount().multiply(couponCustomerRelevance.getDiscountPercent());
+                        totalCouponDiscount = orderManage.getTotalPaymentAmount().multiply(BigDecimal.ONE.subtract(couponCustomerRelevance.getDiscountPercent()));
                     }
                     //卡券总支付金额
                     BigDecimal totalCouponPay = couponCustomerRelevance.getPayAmount();

src/main/java/com/gogirl/application/store/store/impl/TakeLeaveEventCmdServiceImpl.java

@@ -254,5 +254,4 @@ public class TakeLeaveEventCmdServiceImpl implements TakeLeaveEventCmdService {
             storeTechnician = storeTechnicianRepository.selectById((storeManage.getMasterUserId()));
         return Lists.newArrayList(storeTechnician);
     }
-
 }

src/main/java/com/gogirl/interfaces/market/coupon/CouponCustomerRelevanceController.java

@@ -78,6 +78,7 @@ public class CouponCustomerRelevanceController {
         List<Integer> innerCouponIds = StringUtils.isNotEmpty(couponRelevanceIds)
                 ? Lists.newArrayList(couponRelevanceIds.split(",")).stream().map(Integer::valueOf).collect(Collectors.toList())
                 : Lists.newArrayList();
+
         //1、使用内部券
         marketService.setUpInnerCoupon(SetUpInnerCouponCommand.builder()
                 .innerCouponCustomerRelevanceIds(innerCouponIds)