折扣券

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

@@ -470,8 +470,6 @@ public class MarketServiceImpl implements MarketService {
                     });
         }
         //4、内部券
-
-
         if (ListUtil.isNotEmpty(innerCouponCustomerRelevanceServiceList)) {
 
             //删除之前的内部券抵扣情况记录
@@ -496,6 +494,10 @@ public class MarketServiceImpl implements MarketService {
                 if (!total.setScale(2, BigDecimal.ROUND_HALF_UP).equals(BigDecimal.ZERO.setScale(2, BigDecimal.ROUND_HALF_UP))) {
                     //卡券的总折扣金额
                     BigDecimal totalCouponDiscount = couponCustomerRelevance.getDiscountAmount();
+//                    //折扣券
+//                    if (couponCustomerRelevance.getType().equals(CouponCustomerRelevance.TYPE_DISCOUNT)) {
+//                        totalCouponDiscount = orderManage.getTotalPaymentAmount().multiply(couponCustomerRelevance.getDiscountPercent());
+//                    }
 
                     //卡券总支付金额
                     BigDecimal totalCouponPay = couponCustomerRelevance.getPayAmount();
@@ -571,9 +573,23 @@ 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());
             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);
         }
 
         orderManageMapper.updateById(orderManage);

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

@@ -26,6 +26,8 @@ public class CouponCustomerRelevance implements Serializable {
     public static Integer STATE_USED = 2;
     public static Integer SOURCE_TYPE_INNER = 0;
     public static Integer SOURCE_TYPE_OUTER = 1;
+
+    public static Integer TYPE_DISCOUNT = 6;
     @TableId(type = IdType.AUTO)
     private Integer id;
 

src/main/java/com/gogirl/shared/market/command/SetUpInnerCouponCommand.java

 package com.gogirl.shared.market.command;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -13,9 +14,9 @@ import java.util.List;
 @AllArgsConstructor
 public class SetUpInnerCouponCommand {
 
+    @ApiModelProperty("订单id")
     private Integer orderId;
 
-//    private OrderManageDTO orderManageDTO;
-
+    @ApiModelProperty("内部券Id")
     private List<Integer> innerCouponCustomerRelevanceIds;
 }

src/main/java/com/gogirl/shared/order/serve/query/qry/IdleTimeQuery.java

@@ -21,6 +21,7 @@ public class IdleTimeQuery {
     @ApiModelProperty("预约")
     private List<ScheduleServeQuery> listScheduleServer;
 
+    @ApiModelProperty("是否返回节点详情")
     private Boolean showNodeDetail;
 
 }