zhijiezhao 3 年之前
父节点
当前提交
cbf21f0337

+ 2 - 0
src/main/java/com/caimei365/order/controller/CartSellerApi.java

@@ -3,6 +3,7 @@ package com.caimei365.order.controller;
 import com.caimei365.order.model.ResponseJson;
 import com.caimei365.order.model.dto.AgainBuyDto;
 import com.caimei365.order.model.dto.SellerCartDto;
+import com.caimei365.order.model.vo.CouponVo;
 import com.caimei365.order.service.CartSellerService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -12,6 +13,7 @@ import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
 import java.util.Map;
 
 /**

+ 9 - 2
src/main/java/com/caimei365/order/model/vo/CouponVo.java

@@ -15,6 +15,7 @@ import java.util.List;
  */
 @Data
 public class CouponVo implements Serializable {
+
     /**
      * 用户关联优惠id
      */
@@ -41,12 +42,19 @@ public class CouponVo implements Serializable {
     @JsonFormat(pattern = "yyyy.MM.dd", timezone = "GMT+8")
     private Date startDate;
 
+    /**
+     * 价值优惠券购买金额
+     */
+    private Double moneyCouponPrice;
+    /**
+     * 是否是价值优惠券,1是,2不是
+     */
+    private Integer moneyCouponFlag;
     /**
      * 使用结束时间(有效期)
      */
     @JsonFormat(pattern = "yyyy.MM.dd", timezone = "GMT+8")
     private Date endDate;
-
     /**
      * 劵类型 0活动券 1品类券 2用户专享券 3店铺券 4新用户券
      */
@@ -71,7 +79,6 @@ public class CouponVo implements Serializable {
      * 优惠品类:1产品 2仪器(品类券有效)
      */
     private Integer categoryType;
-
     /**
      * 供应商名称
      */

+ 2 - 0
src/main/java/com/caimei365/order/service/CartSellerService.java

@@ -3,7 +3,9 @@ package com.caimei365.order.service;
 import com.caimei365.order.model.ResponseJson;
 import com.caimei365.order.model.dto.AgainBuyDto;
 import com.caimei365.order.model.dto.SellerCartDto;
+import com.caimei365.order.model.vo.CouponVo;
 
+import java.util.List;
 import java.util.Map;
 
 /**

+ 0 - 1
src/main/java/com/caimei365/order/service/impl/CartSellerServiceImpl.java

@@ -885,5 +885,4 @@ public class CartSellerServiceImpl implements CartSellerService {
         resultData.put("productIds", againBuyProductIds);
         return ResponseJson.success(resultData);
     }
-
 }