Merge branch 'master' into 4.1

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

@@ -1369,7 +1369,11 @@ public class MarketServiceImpl implements MarketService {
                     BigDecimal totalCouponDiscount = couponCustomerRelevance.getDiscountAmount();
                     //折扣券
                     if (couponCustomerRelevance.getType().equals(CouponCustomerRelevance.TYPE_DISCOUNT)) {
-                        totalCouponDiscount = orderManage.getTotalPaymentAmount().multiply(BigDecimal.ONE.subtract(couponCustomerRelevance.getDiscountPercent()));
+                        totalCouponDiscount = total.multiply(BigDecimal.ONE.subtract(couponCustomerRelevance.getDiscountPercent()));
+                    }
+                    //一口价
+                    if(couponCustomerRelevance.getType().equals(6)){
+                        totalCouponDiscount= canUserOrderServeList.get(0).getPayPrice().subtract(couponCustomerRelevance.getBuyoutAmount());
                     }
                     //卡券总支付金额
                     BigDecimal totalCouponPay = couponCustomerRelevance.getPayAmount();
@@ -1472,8 +1476,6 @@ public class MarketServiceImpl implements MarketService {
             if (freeInnerCouponCustomerRelevanceServiceList.size() > 1) {
                 throw new RRException("免单券券只能用一张");
             }
-
-
         }
 
 
@@ -1504,6 +1506,8 @@ public class MarketServiceImpl implements MarketService {
         List<Integer> freeCouponIds = discountConfigMapper.selectList(new LambdaQueryWrapper<>()).stream().map(DiscountConfig::getCouponId)
                 .filter(Objects::nonNull).collect(Collectors.toList());
 
+        Coupon coupon = couponMapper.selectById(counponId);
+
         //免单也是用活动价的
         if (freeCouponIds.contains(counponId)) {
 
@@ -1572,7 +1576,22 @@ public class MarketServiceImpl implements MarketService {
                                     .contains(orderServe.getId()))
                     .collect(Collectors.toList());
 
-        } else {
+        }
+        //一口价
+        else if (coupon.getType().equals(6)) {
+            OrderServe result = orderManage.getListOrderServer()
+                    .stream()
+                    .filter(orderServe -> serveIds.contains(orderServe.getServeId()))
+                    .filter(orderServe -> !orderServe.isActivity())
+                    .filter(orderServe -> orderServe.getBindTimesCard() == 2)
+                    .filter(orderServe -> orderServe.getBindInnerCoupon() == 2)
+                    .filter(orderServe -> orderServe.getBindOuterCoupon() == 2)
+                    .max(Comparator.comparing(OrderServe::getPayPrice))
+                    .orElseThrow(() -> new RRException(""));
+            return Lists.newArrayList(result);
+        }
+        //普通内部券
+        else {
             return orderManage.getListOrderServer()
                     .stream()
                     .filter(orderServe -> serveIds.contains(orderServe.getServeId()))

src/main/java/com/gogirl/domain/market/coupon/Coupon.java

@@ -37,8 +37,11 @@ public class Coupon implements Serializable {
 
     private BigDecimal discountRate;
 
+    @ApiModelProperty("一口价")
+    private BigDecimal buyoutAmount;
+
     @DictParam(dictCode = "COUPON_TYPE", dictValueParam = "typeStr")
-    @ApiModelProperty("优惠券类型:1.现金抵扣券;2.免单券；3满减券；4卸甲券；5 = 折扣券")
+    @ApiModelProperty("优惠券类型:1.现金抵扣券;2.免单券；3满减券；4卸甲券；5 = 折扣券 6 = 一口价")
     private Integer type;
 
     @TableField(exist = false)

src/main/java/com/gogirl/domain/market/coupon/CouponCustomerRelevance.java

@@ -94,6 +94,9 @@ public class CouponCustomerRelevance implements Serializable {
     @ApiModelProperty("优惠折扣")
     private BigDecimal discountPercent;
 
+    @ApiModelProperty("一口价")
+    private BigDecimal buyoutAmount;
+
     @DictParam(dictCode = "COUPON_TYPE", dictValueParam = "typeStr")
     @ApiModelProperty("优惠券类型:1.现金抵扣券;2.免单券；3满减券；4卸甲券；5 = 折扣券")
     private Integer type;