~API:商城活动:优惠券领取;

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinUserCouponBasicVo.java

 package com.liquidnet.service.goblin.dto.vo;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import io.swagger.annotations.ApiModel;
+import com.liquidnet.commons.lang.util.IDGenerator;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -52,4 +52,32 @@ public class GoblinUserCouponBasicVo implements Serializable, Cloneable {
             return new GoblinUserCouponBasicVo();
         }
     }
+
+    public GoblinUserCouponBasicVo initByStoreCouponVo(GoblinStoreCouponVo source) {
+        if (null == source) return this;
+        this.setUcouponId(IDGenerator.get32UUID());
+        this.setStoreCouponId(source.getStoreCouponId());
+//        this.setUid();
+        this.setState(1);
+//        this.setBindAt();
+        this.setDuedAt(source.getEndTime());
+//        this.setUsedAt();
+//        this.setUsedFor();
+//        this.setOperator();
+//        this.setCreatedAt();
+//        this.setUpdatedAt();
+        this.setStoreId(source.getStoreId());
+        this.setTitle(source.getTitle());
+        this.setLabel(source.getLabel());
+        this.setNotice(source.getNotice());
+        this.setType(source.getType());
+        this.setTriggers(source.getTriggers());
+        this.setValFace(source.getValFace());
+        this.setDiscount(source.getDiscount());
+        this.setValOver(source.getValOver());
+        this.setValMinus(source.getValMinus());
+        this.setDeduction(source.getDeduction());
+        this.setUseScope(source.getUseScope());
+        return this;
+    }
 }

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinUserCouponVo.java

 package com.liquidnet.service.goblin.dto.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.liquidnet.commons.lang.util.DateUtil;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -22,10 +24,13 @@ public class GoblinUserCouponVo implements Serializable, Cloneable {
     @ApiModelProperty(position = 12, value = "用户券状态[1-可用|2-无效|3-已过期|5-已使用]")
     private Integer state;
     @ApiModelProperty(position = 13, value = "激活时间")
+    @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
     private LocalDateTime bindAt;
     @ApiModelProperty(position = 14, value = "到期时间")
+    @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
     private LocalDateTime duedAt;
     @ApiModelProperty(position = 15, value = "使用时间")
+    @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
     private LocalDateTime usedAt;
     @ApiModelProperty(position = 16, value = "用于记录购买的内容")
     private String usedFor;
@@ -63,4 +68,27 @@ public class GoblinUserCouponVo implements Serializable, Cloneable {
             return new GoblinUserCouponVo();
         }
     }
+
+    public GoblinUserCouponVo copy(GoblinUserCouponBasicVo source) {
+        if (null == source) return this;
+        this.setUcouponId(source.getUcouponId());
+        this.setStoreCouponId(source.getStoreCouponId());
+        this.setState(source.getState());
+        this.setBindAt(source.getBindAt());
+        this.setDuedAt(source.getDuedAt());
+        this.setUsedAt(source.getUsedAt());
+        this.setUsedFor(source.getUsedFor());
+        this.setTitle(source.getTitle());
+        this.setLabel(source.getLabel());
+        this.setNotice(source.getNotice());
+        this.setType(source.getType());
+        this.setTriggers(source.getTriggers());
+        this.setValFace(source.getValFace());
+        this.setDiscount(source.getDiscount());
+        this.setValOver(source.getValOver());
+        this.setValMinus(source.getValMinus());
+        this.setDeduction(source.getDeduction());
+        this.setUseScope(source.getUseScope());
+        return this;
+    }
 }

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinCouponImpl.java

@@ -3,6 +3,7 @@ package com.liquidnet.service.goblin.service.impl;
 import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.service.goblin.constant.GoblinStatusConst;
 import com.liquidnet.service.goblin.dto.vo.GoblinStoreCouponVo;
+import com.liquidnet.service.goblin.dto.vo.GoblinUserCouponBasicVo;
 import com.liquidnet.service.goblin.dto.vo.GoblinUserCouponVo;
 import com.liquidnet.service.goblin.service.GoblinCouponService;
 import com.liquidnet.service.goblin.util.GoblinRedisUtils;
@@ -57,6 +58,15 @@ public class GoblinCouponImpl implements GoblinCouponService {
 
     @Override
     public Boolean receiveCoupon(String uid, List<GoblinUserCouponVo> userCouponVoList, GoblinStoreCouponVo storeCouponVo, Integer number) {
+        LocalDateTime now = LocalDateTime.now();
+
+        GoblinUserCouponBasicVo receiveUserCouponBasicVo = GoblinUserCouponBasicVo.getNew().initByStoreCouponVo(storeCouponVo);
+        receiveUserCouponBasicVo.setUid(uid);
+        receiveUserCouponBasicVo.setBindAt(now);
+        receiveUserCouponBasicVo.setOperator(uid);
+        receiveUserCouponBasicVo.setCreatedAt(now);
+
+        GoblinUserCouponVo receiveUserCouponVo = GoblinUserCouponVo.getNew().copy(receiveUserCouponBasicVo);