兑换活动增加uid

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

@@ -25,7 +25,7 @@ import java.util.List;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class GoblinNftExActivityVo implements Serializable,Cloneable {
+public class GoblinNftExActivityVo implements Serializable, Cloneable {
 
 
     private static final long serialVersionUID = 1L;
@@ -37,74 +37,80 @@ public class GoblinNftExActivityVo implements Serializable,Cloneable {
     /**
      * 活动id
      */
-    @ApiModelProperty(position = 10,required = true,value ="活动id")
+    @ApiModelProperty(position = 10, required = true, value = "活动id")
     private String activityId;
 
+    /**
+     * 用户id
+     */
+    @ApiModelProperty(position = 11, required = true, value = "用户id")
+    private String uid;
+
     /**
      * 活动标题
      */
     @ExcelProperty(value = "活动标题", index = 0)//”0“表示excel中的第一列
-    @ApiModelProperty(position = 11,required = true,value ="活动标题")
+    @ApiModelProperty(position = 12, required = true, value = "活动标题")
     private String title;
 
     /**
      * 创建时间
      */
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
-    @ApiModelProperty(position = 12,required = true,value ="创建时间")
+    @ApiModelProperty(position = 13, required = true, value = "创建时间")
     private LocalDateTime createdAt;
 
 
-
     /**
      * 更新时间
      */
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
-    @ApiModelProperty(position = 13,required = true,value ="更新时间")
+    @ApiModelProperty(position = 14, required = true, value = "更新时间")
     private LocalDateTime updatedAt;
 
     /**
      * 总数量
      */
     @ExcelProperty(value = "优惠券总数量", index = 2)//”0“表示excel中的第一列
-    @ApiModelProperty(position = 14,required = true,value ="总数量")
+    @ApiModelProperty(position = 15, required = true, value = "总数量")
     private Integer countNumber;
 
     /**
      * 使用数量
      */
     @ExcelProperty(value = "优惠券使用数量", index = 3)//”0“表示excel中的第一列
-    @ApiModelProperty(position = 15,required = true,value ="使用数量")
+    @ApiModelProperty(position = 16, required = true, value = "使用数量")
     private Integer useNumber;
 
     /**
      * 未使用数量
      */
     @ExcelProperty(value = "兑换码未使用数量", index = 4)//”0“表示excel中的第一列
-    @ApiModelProperty(position = 16,required = true,value ="未使用数量")
+    @ApiModelProperty(position = 17, required = true, value = "未使用数量")
     private Integer unUseNumber;
 
 
     /**
      *
      */
-    @ApiModelProperty(position = 18,required = true,value ="是否展示生效中 0：否  1：是")
+    @ApiModelProperty(position = 18, required = true, value = "是否展示生效中 0：否  1：是")
     private Integer isDisplay;
 
 
     private final static GoblinNftExActivityVo obj = new GoblinNftExActivityVo();
 
-    public static GoblinNftExActivityVo getNew(){
+    public static GoblinNftExActivityVo getNew() {
         try {
             return (GoblinNftExActivityVo) obj.clone();
-        }catch (CloneNotSupportedException e){
+        } catch (CloneNotSupportedException e) {
             return new GoblinNftExActivityVo();
         }
     }
 
-    public GoblinNftExActivityVo copy(GoblinNftExActivity goblinNftExActivity){
+    public GoblinNftExActivityVo copy(GoblinNftExActivity goblinNftExActivity) {
         if (null == goblinNftExActivity) return this;
         this.setActivityId(goblinNftExActivity.getActivityId());
+        this.setUid(goblinNftExActivity.getUid());
         this.setTitle(goblinNftExActivity.getTitle());
         this.setCreatedAt(goblinNftExActivity.getCreatedAt());
         this.setUpdatedAt(goblinNftExActivity.getUpdatedAt());

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/GoblinNftExActivityParam.java

@@ -21,6 +21,9 @@ public class GoblinNftExActivityParam implements Serializable {
     @ApiModelProperty(position = 11,required = true,value = "活动标题" ,example = "草莓音乐节")
     private String title;
 
+    @ApiModelProperty(position = 12,required = true,value = "用户id",example = "用户id")
+    private String uid;
+
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
     @ApiModelProperty(position = 12,required = false,value = "开始时间")
     private LocalDateTime startTime;

liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/entity/GoblinNftExActivity.java

@@ -30,6 +30,8 @@ public class GoblinNftExActivity implements Serializable,Cloneable {
      */
     private String activityId;
 
+    private String uid;
+
     /**
      * 活动标题
      */

liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/mapper/GoblinNftExActivityMapper.java

@@ -34,7 +34,7 @@ public interface GoblinNftExActivityMapper extends BaseMapper<GoblinNftExActivit
      * @param endTime
      * @return
      */
-    List<GoblinNftExActivity> selectPageList(@Param("title") String title, @Param("startTime") LocalDateTime startTime,@Param("endTime") LocalDateTime endTime);
+    List<GoblinNftExActivity> selectPageList(@Param("title") String title, @Param("startTime") LocalDateTime startTime,@Param("endTime") LocalDateTime endTime,@Param("uid")String uid);
 
     /**
      * 根据活动ids 获取活动

liquidnet-bus-do/liquidnet-service-goblin-do/src/main/resources/com.liquidnet.service.goblin.mapper/GoblinNftExActivityMapper.xml

@@ -4,18 +4,24 @@
 
     <resultMap id="BaseResult" type="com.liquidnet.service.goblin.entity.GoblinNftExActivity">
         <result column="activity_id" property="activityId" jdbcType="VARCHAR"/>
+        <result column="uid" property="uid" jdbcType="VARCHAR"/>
         <result column="title" property="title" jdbcType="VARCHAR"/>
         <result column="created_at" property="createdAt" jdbcType="TIMESTAMP"/>
         <result column="updated_at" property="updatedAt" jdbcType="TIMESTAMP"/>
     </resultMap>
 
     <select id="selectByTitle" resultMap="BaseResult">
-        select activity_id,title,created_at from goblin_nft_ex_activity where  title = #{title}
+        select activity_id, uid, title, created_at
+        from goblin_nft_ex_activity
+        where title = #{title}
     </select>
 
     <select id="selectPageList" resultMap="BaseResult">
-        select activity_id,title,created_at from goblin_nft_ex_activity
+        select activity_id,uid,title,created_at from goblin_nft_ex_activity
         <where>
+            <if test="uid != null and uid != ''">
+                and uid = #{uid,jdbcType=VARCHAR}
+            </if>
             <if test="title != null and title != ''">
                 <bind name="likeTitle" value="'%' + title + '%'"/>
                 and title like #{likeTitle}
@@ -30,11 +36,15 @@
     </select>
 
     <select id="selectByActivityId" resultMap="BaseResult">
-        select activity_id,title,created_at from goblin_nft_ex_activity where activity_id = #{activityId}
+        select activity_id, title, created_at
+        from goblin_nft_ex_activity
+        where activity_id = #{activityId,jdbcType=VARCHAR}
     </select>
 
     <select id="selectActivityCount" resultType="java.lang.Integer">
-        select count(0) from goblin_nft_ex_activity
+        select count(0)
+        from goblin_nft_ex_activity
+        where uid = #{uid}
     </select>
 
     <insert id="addGoblinNftExActivity" parameterType="com.liquidnet.service.goblin.entity.GoblinNftExActivity">
@@ -43,6 +53,9 @@
         <if test="activityId != null and activityId != null">
             activity_id,
         </if>
+        <if test="uid != null and uid != ''">
+            uid,
+        </if>
         <if test="title != null and title != ''">
             title,
         </if>
@@ -53,6 +66,9 @@
         <if test="activityId != null and activityId != null">
             #{activityId,jdbcType=VARCHAR},
         </if>
+        <if test="uid != null and uid != ''">
+            #{uid,jdbcType=VARCHAR},
+        </if>
         <if test="title != null and title != ''">
             #{title,jdbcType=VARCHAR},
         </if>

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

@@ -65,6 +65,7 @@ public class GoblinNftExActivityServiceImpl implements IGoblinNftExActivityServi
         BeanUtils.copyProperties(goblinNftExActivityParam, goblinNftExActivity);
         goblinNftExActivity.setActivityId(IDGenerator.nextSnowId());
         goblinNftExActivity.setCreatedAt(now);
+        goblinNftExActivity.setUid(goblinNftExActivityParam.getUid());
         // mysql数据
         long s = System.currentTimeMillis();
         goblinNftExActivityMapper.addGoblinNftExActivity(goblinNftExActivity);
@@ -83,7 +84,7 @@ public class GoblinNftExActivityServiceImpl implements IGoblinNftExActivityServi
          */
         long s = System.currentTimeMillis();
         List<GoblinNftExActivity> goblinNftExActivities = goblinNftExActivityMapper.selectPageList(goblinNftExActivityParam.getTitle(), goblinNftExActivityParam.getStartTime(),
-                goblinNftExActivityParam.getEndTime());
+                goblinNftExActivityParam.getEndTime(), goblinNftExActivityParam.getUid());
 
         //
         int count = goblinNftExActivityMapper.selectActivityCount();
@@ -188,7 +189,6 @@ public class GoblinNftExActivityServiceImpl implements IGoblinNftExActivityServi
                 }
                 codeMap.get(goblinNftExCode.getSkuId()).add(goblinNftExCode);
             }
-
         }
 
 
@@ -237,7 +237,7 @@ public class GoblinNftExActivityServiceImpl implements IGoblinNftExActivityServi
          */
         long s = System.currentTimeMillis();
         List<GoblinNftExActivity> goblinNftExActivities = goblinNftExActivityMapper.selectPageList(goblinNftExActivityParam.getTitle(), goblinNftExActivityParam.getStartTime(),
-                goblinNftExActivityParam.getEndTime());
+                goblinNftExActivityParam.getEndTime(), goblinNftExActivityParam.getUid());
         log.debug("#MYS耗时:{}ms", System.currentTimeMillis() - s);
 
         StringBuffer activityIds = new StringBuffer();

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

@@ -134,8 +134,6 @@ public class GoblinNftExCodeServiceImpl implements IGoblinNftExCodeService {
                             break;
                         }
                     }
-
-
                 }
             }
         }
@@ -153,25 +151,30 @@ public class GoblinNftExCodeServiceImpl implements IGoblinNftExCodeService {
         }
 
 
+        LocalDateTime now = LocalDateTime.now();
         for (GoblinNftExCodeVo gnc : goblinNftExCodeArrayList) {
             List<GoblinNftExSku> goblinNftExSkuList = map.get(gnc.getActivityId());
             for (GoblinNftExSku goblinNftExSku : goblinNftExSkuList) {
-
                 if (StringUtil.isNotBlank(gnc.getBoxSkuId()) && gnc.getSkuId().equals(goblinNftExSku.getSkuId())) {
                     gnc.setExStartTime(goblinNftExSku.getExStartTime());
                     gnc.setExStopTime(goblinNftExSku.getExStopTime());
+                    if (now.isBefore(goblinNftExSku.getExStartTime()) || now.isAfter(goblinNftExSku.getExStopTime())) {
+                        gnc.setState(3);
+                    }
                     break;
                 } else {
                     if (gnc.getSkuId().equals(goblinNftExSku.getSkuId())) {
                         gnc.setExStartTime(goblinNftExSku.getExStartTime());
                         gnc.setExStopTime(goblinNftExSku.getExStopTime());
+                        if (now.isBefore(goblinNftExSku.getExStartTime()) || now.isAfter(goblinNftExSku.getExStopTime())) {
+                            gnc.setState(3);
+                        }
                         break;
                     }
                 }
             }
         }
 
-
         PageInfoVo pageInfo = new PageInfoVo(goblinNftExCodeArrayList, count);
 
         return pageInfo;
@@ -266,7 +269,7 @@ public class GoblinNftExCodeServiceImpl implements IGoblinNftExCodeService {
                 goblinNftExCode.setAdminUid(goblinNftExCodeParam.getAdminUid());
                 goblinNftExCodeMapper.updateCodeAdminUid(goblinNftExCode);
                 return ResponseDto.success(true);
-            }else {
+            } else {
                 return ResponseDto.failure(rsp.getMessage());
             }
         } catch (Exception e) {

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

@@ -123,6 +123,7 @@ public class GoblinNftExSkuServiceImpl implements IGoblinNftExSkuService {
                 // sku ---> 库存
                 Map<String, Integer> skuMap = getSkuHitRatio(goblinNftExSkuParam.getExStock(), map);
 
+                if (skuMap.size() > 0){
                     Integer sNumber = 0;
                     for (String key : skuMap.keySet()) {
                         Integer stockNum = skuMap.get(key);
@@ -142,6 +143,7 @@ public class GoblinNftExSkuServiceImpl implements IGoblinNftExSkuService {
                     }
                     goblinNftExCodeTaskRelationMapper.inserts(goblinNftExCodeTaskRelations);
                     goblinNftExCodeTask.setExStock(sNumber);
+                }
 
             } else {
                 int stock = goblinRedisUtils.decrSkuStock(null, goblinNftExSkuParam.getSkuId(), goblinNftExSkuParam.getExStock());