优惠券

src/main/java/com/chelvc/cloud/maintain/controller/UserCouponController.java

@@ -1,5 +1,7 @@
 package com.chelvc.cloud.maintain.controller;
 
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -9,6 +11,7 @@ import javax.validation.constraints.Min;
 import com.chelvc.cloud.maintain.copier.UserCouponCopier;
 import com.chelvc.cloud.maintain.vo.UserCouponVO;
 import com.chelvc.cloud.vehicle.client.UserCouponClient;
+import com.chelvc.cloud.vehicle.client.constant.PlatformConstant;
 import com.chelvc.cloud.vehicle.client.dto.UserCouponDTO;
 import com.chelvc.cloud.vehicle.client.param.UserCouponPagingParam;
 import com.chelvc.cloud.vehicle.client.param.UserCouponQueryParam;
@@ -62,15 +65,16 @@ public class UserCouponController {
      * @return 用户已领取的优惠券信息列表
      */
     @GetMapping("/usercoupons")
-    public List<UserCouponVO> listUserCoupons(@Valid UserCouponQueryParam param) {
-        List<UserCouponDTO> userCoupons = this.userCouponClient.listUserCoupons(param);
+    public List<UserCouponDTO> listUserCoupons(@Valid UserCouponQueryParam param) {
+        return this.userCouponClient.listUserCoupons(param);
+        /*List<UserCouponDTO> userCoupons = this.userCouponClient.listUserCoupons(param);
         if (CollectionUtils.isEmpty(userCoupons)) {
             return Collections.emptyList();
         }
         return userCoupons
                 .stream()
                 .map(o -> UserCouponCopier.INSTANCE.copying(o, o.getCouponDTO()))
-                .collect(Collectors.toList());
+                .collect(Collectors.toList());*/
     }
 
     /**
@@ -80,15 +84,16 @@ public class UserCouponController {
      * @return 用户可用优惠券信息列表
      */
     @GetMapping("/canusecoupons")
-    public List<UserCouponVO> listUserCanUseCoupons(@Valid UserCouponQueryParam param) {
-        List<UserCouponDTO> userCoupons = this.userCouponClient.listUserCanUseCoupons(param);
+    public List<UserCouponDTO> listUserCanUseCoupons(@Valid UserCouponQueryParam param) {
+        return this.userCouponClient.listUserCanUseCoupons(param);
+        /*List<UserCouponDTO> userCoupons = this.userCouponClient.listUserCanUseCoupons(param);
         if (CollectionUtils.isEmpty(userCoupons)) {
             return Collections.emptyList();
         }
         return userCoupons
                 .stream()
                 .map(o -> UserCouponCopier.INSTANCE.copying(o, o.getCouponDTO()))
-                .collect(Collectors.toList());
+                .collect(Collectors.toList());*/
     }
 
     /**

src/main/java/com/chelvc/cloud/maintain/copier/UserCouponCopier.java

@@ -40,8 +40,8 @@ public interface UserCouponCopier {
      */
     List<UserCouponVO> copying(Collection<UserCouponDTO> userCoupons);
 
-    @Mapping(source = "userCoupon.id", target = "id")
-    @Mapping(source = "userCoupon.type", target = "type")
-    @Mapping(source = "coupon", target = "couponVO")
-    UserCouponVO copying(UserCouponDTO userCoupon, CouponDTO coupon);
+//    @Mapping(source = "userCoupon.id", target = "id")
+//    @Mapping(source = "userCoupon.type", target = "type")
+//    @Mapping(source = "coupon", target = "couponVO")
+//    UserCouponVO copying(UserCouponDTO userCoupon, CouponDTO coupon);
 }

src/main/java/com/chelvc/cloud/maintain/vo/UserCouponVO.java

@@ -1,12 +1,14 @@
 package com.chelvc.cloud.maintain.vo;
 
 import com.chelvc.cloud.vehicle.client.constant.CouponType;
+import com.chelvc.cloud.vehicle.client.constant.UserCouponStatus;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -20,18 +22,15 @@ import java.util.Date;
 @NoArgsConstructor
 @AllArgsConstructor
 public class UserCouponVO implements Serializable {
-    /**
-     * 主键
-     */
     private Long id;
 
     /**
-     * 用户id
+     * 用户ID
      */
     private Long userId;
 
     /**
-     * 优惠券id
+     * 优惠券ID
      */
     private Long couponId;
 
@@ -41,7 +40,86 @@ public class UserCouponVO implements Serializable {
     private CouponType type;
 
     /**
-     * 优惠券
+     * 商户ID
+     */
+    private Long merchantId;
+
+    /**
+     * 优惠金额/折扣
+     */
+    private BigDecimal amount;
+
+    /**
+     * 门槛金额
+     */
+    private BigDecimal doorsillAmount;
+
+    /**
+     * 是否已使用
+     */
+    private Integer used;
+
+    /**
+     * 开始时间
+     */
+    private Date startTime;
+
+    /**
+     * 核销时间
+     */
+    private Date consumptionTime;
+
+    /**
+     * 截止时间
+     */
+    private Date endTime;
+
+    /**
+     * 标识：0-新消息；1-已查看
+     */
+    private Integer flag;
+
+    /**
+     * 是否是平台优惠券
+     */
+    private Integer platformFlag;
+
+    /**
+     * 优惠券描述
+     */
+    private String description;
+
+    /**
+     * 用户优惠券状态
+     */
+    private UserCouponStatus status;
+
+    /**
+     * 是否显示
      */
-    private CouponVO couponVO;
+    private boolean display = true;
+//    /**
+//     * 主键
+//     */
+//    private Long id;
+//
+//    /**
+//     * 用户id
+//     */
+//    private Long userId;
+//
+//    /**
+//     * 优惠券id
+//     */
+//    private Long couponId;
+//
+//    /**
+//     * 优惠券类型
+//     */
+//    private CouponType type;
+//
+//    /**
+//     * 优惠券
+//     */
+//    private CouponVO couponVO;
 }