兑换码sku--->时间

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

@@ -87,6 +87,12 @@ public class GoblinNftExActivityVo implements Serializable,Cloneable {
     @ApiModelProperty(position = 17,required = true,value ="sku基本所属信息集合")
     private List<GoblinNftSkuVo> goblinNftSkuVos;
 
+    /**
+     *
+     */
+    @ApiModelProperty(position = 18,required = true,value ="是否展示生效中 0：否  1：是")
+    private Integer isDisplay;
+
 
     private  final  static GoblinNftExActivityVo obj = new GoblinNftExActivityVo();
 
@@ -107,6 +113,7 @@ public class GoblinNftExActivityVo implements Serializable,Cloneable {
         this.setCountNumber(goblinNftExActivity.getCountNumber());
         this.setUseNumber(goblinNftExActivity.getUseNumber());
         this.setUnUseNumber(goblinNftExActivity.getUnUseNumber());
+        this.setIsDisplay(goblinNftExActivity.getIsDisplay());
         return this;
     }
 

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

@@ -3,6 +3,10 @@ package com.liquidnet.service.goblin.dto.vo;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.service.goblin.entity.GoblinNftExSku;
 import io.swagger.annotations.ApiModelProperty;
@@ -76,6 +80,8 @@ public class GoblinNftExSkuVo {
     /**
      * 兑换生效开始时间
      */
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
     @ApiModelProperty(position = 17,required = true,value ="兑换生效开始时间")
     private LocalDateTime exStartTime;
@@ -84,6 +90,8 @@ public class GoblinNftExSkuVo {
     /**
      * 兑换生效结束时间
      */
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
     @ApiModelProperty(position = 18,required = true,value ="兑换生效结束时间")
     private LocalDateTime exStopTime;

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

 package com.liquidnet.service.goblin.service;
 
 import com.github.pagehelper.PageInfo;
+import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.goblin.dto.vo.GoblinNftExActivityVo;
 import com.liquidnet.service.goblin.dto.vo.GoblinNftSkuVo;
 import com.liquidnet.service.goblin.param.GoblinNftExActivityParam;
@@ -16,7 +17,7 @@ public interface IGoblinNftExActivityService {
      * @param goblinNftExActivityParam
      * @return
      */
-    String add(GoblinNftExActivityParam goblinNftExActivityParam);
+    ResponseDto<Object> add(GoblinNftExActivityParam goblinNftExActivityParam);
 
     /**
      * 分页查询

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

 package com.liquidnet.service.goblin.service;
 
 import com.github.pagehelper.PageInfo;
+import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.goblin.dto.vo.GoblinNftExCodeVo;
 import com.liquidnet.service.goblin.param.GoblinNftExCodeParam;
 
@@ -25,7 +26,7 @@ public interface IGoblinNftExCodeService {
      * @param goblinNftExCodeParam
      * @return
      */
-    Boolean addAirdrop(GoblinNftExCodeParam goblinNftExCodeParam);
+    ResponseDto<Object> addAirdrop(GoblinNftExCodeParam goblinNftExCodeParam);
 
     /**
      * 兑换码导出

liquidnet-bus-do/liquidnet-service-adam-do/src/main/java/com/liquidnet/service/adam/mapper/AdamUserMapper.java

@@ -5,6 +5,7 @@ import com.liquidnet.service.adam.dto.AdamUserInfoDto;
 import com.liquidnet.service.adam.entity.AdamUser;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
@@ -16,6 +17,7 @@ import java.util.List;
  * @author liquidnet
  * @since 2021-05-10
  */
+@Repository
 public interface AdamUserMapper extends BaseMapper<AdamUser> {
 
     int executeForDM(@Param("tn") String tn);
@@ -44,4 +46,11 @@ public interface AdamUserMapper extends BaseMapper<AdamUser> {
             "limit #{rows},#{offset}"
     })
     List<AdamUserInfoDto> selectMultiForUserInfoDto(@Param("rows") int rows, @Param("offset") int offset);
+
+    /**
+     * 根据手机号获取 用户信息
+     * @param phone
+     * @return
+     */
+    AdamUserInfoDto selectByPhone(@Param("mobile") String mobile);
 }

liquidnet-bus-do/liquidnet-service-adam-do/src/main/resources/com/liquidnet/service/adam/mapper/AdamUserMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.liquidnet.service.adam.mapper.AdamUserMapper">
+    <resultMap id="BaseResult" type="com.liquidnet.service.adam.dto.AdamUserInfoDto">
+        <result column="uid" property="uid" jdbcType="VARCHAR"/>
+        <result column="mobile" property="mobile" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <select id="selectByPhone" resultMap="BaseResult">
+        select uid,mobile from adam_user where phone = #{mobile,jdbcType=VARCHAR}
+    </select>
 
     <update id="executeForDM">
         TRUNCATE TABLE ${tn}

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

@@ -60,6 +60,8 @@ public class GoblinNftExActivity implements Serializable,Cloneable {
      */
     private Integer unUseNumber;
 
+    private Integer isDisplay;
+
 
     private  final  static GoblinNftExActivity obj = new GoblinNftExActivity();
 

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

+package com.liquidnet.service.goblin.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author jiangxiulong
+ * @since 2022-04-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class GoblinNftExCodeTask implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "mid", type = IdType.AUTO)
+    private Long mid;
+
+    private String taskId;
+
+    private String activityId;
+
+    private String storeId;
+
+    private String spuId;
+
+    private String skuId;
+
+    private String unbox;
+
+    private Integer exStock;
+
+    private Integer exLimit;
+
+    private Integer typ;
+
+    private LocalDateTime exStartTime;
+
+    private LocalDateTime exStopTime;
+
+    private LocalDateTime createdAt;
+
+    private LocalDateTime updatedAt;
+
+    private  final  static GoblinNftExCodeTask obj = new GoblinNftExCodeTask();
+
+    public static GoblinNftExCodeTask getNew(){
+        try {
+            return  (GoblinNftExCodeTask) obj.clone();
+        }catch (CloneNotSupportedException e){
+            return new GoblinNftExCodeTask();
+        }
+    }
+
+
+
+}

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

@@ -42,4 +42,11 @@ public interface GoblinNftExActivityMapper extends BaseMapper<GoblinNftExActivit
      * @return
      */
     GoblinNftExActivity selectByActivityId(@Param("activityId") String activityId);
+
+    /**
+     * 验重
+     * @param title
+     * @return
+     */
+    GoblinNftExActivity selectByTitle(@Param("title") String title);
 }

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

+package com.liquidnet.service.goblin.mapper;
+
+import com.liquidnet.service.goblin.entity.GoblinNftExCodeTask;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import lombok.experimental.PackagePrivate;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wanglele
+ * @since 2022-04-27
+ */
+@Repository
+public interface GoblinNftExCodeTaskMapper extends BaseMapper<GoblinNftExCodeTask> {
+
+    /**
+     * 获取所有定时任务
+     * @return
+     */
+    List<GoblinNftExCodeTask> selectByActivity();
+
+    /**
+     * 批量添加定时任务
+     * @param goblinNftExCodeTasks
+     * @return
+     */
+    int addGoblinNftExCodeTasks(@Param("goblinNftExCodeTasks") List<GoblinNftExCodeTask> goblinNftExCodeTasks);
+
+    /**
+     * 批量删除定时
+     * @param taskIds
+     * @return
+     */
+    int deleteByTaskIds(@Param("taskIds") String taskIds);
+
+    /**
+     * 批量修改定时
+     * @param taskIds
+     * @return
+     */
+    int updateByTaskIds(@Param("taskIds") String taskIds);
+
+    /**
+     * 根据活动ids获取定时
+     * @param activityIds
+     * @return
+     */
+    List<GoblinNftExCodeTask> selectByActivityIds(@Param("activityIds") String activityIds);
+}

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

@@ -2,6 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.liquidnet.service.goblin.mapper.GoblinGoodsSkuMapper">
     <resultMap id="BaseResult" type="com.liquidnet.service.goblin.entity.GoblinGoodsSku">
+        <result column="spu_id" property="spuId" jdbcType="VARCHAR"/>
         <result column="sku_id" property="skuId" jdbcType="VARCHAR"/>
         <result column="name" property="name" jdbcType="VARCHAR"/>
         <result column="unbox" property="unbox" jdbcType="VARCHAR"/>
@@ -31,7 +32,7 @@
     </select>
 
     <select id="selectBySpuIds" resultMap="BaseResult">
-        select sku_id,hit_ratio,unbox,sku_type,status,shelves_status,sku_appear,del_flg,soldout_status,sale_start_time from goblin_goods_sku where
+        select spu_id,sku_id,hit_ratio,unbox,sku_type,status,shelves_status,sku_appear,del_flg,soldout_status,sale_start_time from goblin_goods_sku where
         spu_id in
         <foreach collection="spuIds.split(',')" item="spuId" open="(" separator="," close=")">
             #{spuId,jdbcType=VARCHAR}

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

@@ -8,6 +8,10 @@
         <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>
 
     <select id="selectPageList" resultMap="BaseResult">
         select activity_id,title,created_at from goblin_nft_ex_activity

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

@@ -25,7 +25,7 @@
     </select>
 
     <select id="selectGoblinNftCodeByCode" resultMap="BeseResult">
-        select code_id, activity_id, code, box_sku_id
+        select code_id, activity_id, code, box_sku_id from goblin_nft_ex_code where code = #{code}
     </select>
 
     <insert id="addGoblinNftExCodes">

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.liquidnet.service.goblin.mapper.GoblinNftExCodeTaskMapper">
+    <resultMap id="BaseResult" type="com.liquidnet.service.goblin.entity.GoblinNftExCodeTask">
+        <result column="task_id" property="taskId" jdbcType="VARCHAR"/>
+        <result column="activity_id" property="activityId" jdbcType="VARCHAR"/>
+        <result column="store_id" property="storeId" jdbcType="VARCHAR"/>
+        <result column="spu_id" property="spuId" jdbcType="VARCHAR"/>
+        <result column="sku_id" property="skuId" jdbcType="VARCHAR"/>
+        <result column="unbox" property="unbox" jdbcType="VARCHAR"/>
+        <result column="ex_stock" property="exStock" jdbcType="INTEGER"/>
+        <result column="ex_limit" property="exLimit" jdbcType="INTEGER"/>
+        <result column="ex_start_time" property="exStartTime" jdbcType="TIMESTAMP"/>
+        <result column="ex_stop_time" property="exStopTime" jdbcType="TIMESTAMP"/>
+        <result column="typ" property="typ" jdbcType="INTEGER"/>
+        <result column="created_at" property="createdAt" jdbcType="TIMESTAMP"/>
+        <result column="updated_at" property="updatedAt" jdbcType="TIMESTAMP"/>
+    </resultMap>
+
+
+    <select id="selectByActivity" resultMap="BaseResult">
+        SELECT a.task_id,
+               a.activity_id,
+               a.store_id,
+               a.spu_id,
+               a.sku_id,
+               a.unbox,
+               a.ex_stock,
+               a.ex_limit,
+               a.ex_start_time,
+               a.ex_stop_time,
+               a.created_at
+        FROM goblin_nft_ex_code_task a,
+             (
+                 SELECT activity_id
+                 FROM goblin_nft_ex_code_task where typ = 1
+                 GROUP BY activity_id LIMIT 1
+             ) b
+        where a.activity_id = b.activity_id
+          and a.typ = 1
+
+    </select>
+
+    <select id="selectByActivityIds" resultMap="BaseResult">
+        select activity_id from goblin_nft_ex_code_task where typ = 1 and activity_id in
+        <foreach collection="activityIds.split(',')" item="activityId" open="(" separator="," close=")">
+            #{activityId}
+        </foreach>
+
+        group by activity_id
+    </select>
+
+    <insert id="addGoblinNftExCodeTasks">
+        insert into goblin_nft_ex_code_task
+        (task_id,activity_id,store_id,spu_id,sku_id,unbox,ex_stock,ex_limit,ex_start_time,ex_stop_time,typ,created_at)
+        values
+        <foreach collection="goblinNftExCodeTasks" item="goblinNftExCodeTask" separator=",">
+            (
+            #{goblinNftExCodeTask.taskId},
+            #{goblinNftExCodeTask.activityId},
+            #{goblinNftExCodeTask.storeId},
+            #{goblinNftExCodeTask.spuId},
+            #{goblinNftExCodeTask.skuId},
+            #{goblinNftExCodeTask.unbox},
+            #{goblinNftExCodeTask.exStock},
+            #{goblinNftExCodeTask.exLimit},
+            #{goblinNftExCodeTask.exStartTime},
+            #{goblinNftExCodeTask.exStopTime},
+            #{goblinNftExCodeTask.typ},
+            #{goblinNftExCodeTask.createdAt}
+            )
+        </foreach>
+    </insert>
+
+
+    <delete id="deleteByTaskIds">
+        delete from goblin_nft_ex_code_task where task_id in
+        <foreach collection="taskIds.split(',')" item="taskId" open="(" separator="," close=")">
+            #{taskId}
+        </foreach>
+    </delete>
+
+    <update id="updateByTaskIds">
+        update goblin_nft_ex_code_task
+        <set>
+            typ = 0 , updated_at = now()
+        </set>
+        where task_id in
+        <foreach collection="taskIds.split(',')" item="taskId" index="index" open="(" separator="," close=")">
+            #{taskId}
+        </foreach>
+    </update>
+
+</mapper>

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/goblin/activity/GoblinNftExActivityController.java

@@ -37,8 +37,8 @@ public class GoblinNftExActivityController {
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "添加nft兑换活动")
     @PostMapping("add")
-    public ResponseDto<String> add(@Valid @RequestBody GoblinNftExActivityParam goblinNftExActivityParam) {
-        return ResponseDto.success(iGoblinNftExActivityService.add(goblinNftExActivityParam));
+    public ResponseDto<Object> add(@Valid @RequestBody GoblinNftExActivityParam goblinNftExActivityParam) {
+        return iGoblinNftExActivityService.add(goblinNftExActivityParam);
     }
 
     @ApiOperationSupport(order = 2)

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/goblin/code/GoblinNftExCodeController.java

@@ -48,7 +48,7 @@ public class GoblinNftExCodeController {
     @ApiOperationSupport(order = 3)
     @ApiOperation(value = "空投发送")
     @PostMapping("addAirdrop")
-    public ResponseDto<Boolean> addAirdrop(@RequestBody GoblinNftExCodeParam goblinNftExCodeParam){
+    public ResponseDto<Object> addAirdrop(@RequestBody GoblinNftExCodeParam goblinNftExCodeParam){
         return ResponseDto.success(iGoblinNftExCodeService.addAirdrop(goblinNftExCodeParam));
     }
 

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

@@ -8,6 +8,7 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.commons.lang.util.StringUtil;
+import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.goblin.dto.vo.GoblinNftExActivityVo;
 import com.liquidnet.service.goblin.dto.vo.GoblinNftExSkuVo;
 import com.liquidnet.service.goblin.dto.vo.GoblinNftSkuVo;
@@ -49,9 +50,19 @@ public class GoblinNftExActivityServiceImpl implements IGoblinNftExActivityServi
     private GoblinNftExSkuMapper goblinNftExSkuMapper;
     @Autowired
     private GoblinGoodsSkuMapper goblinGoodsSkuMapper;
+    @Autowired
+    GoblinNftExCodeTaskMapper goblinNftExCodeTaskMapper;
 
     @Override
-    public String add(GoblinNftExActivityParam goblinNftExActivityParam) {
+    public ResponseDto<Object> add(GoblinNftExActivityParam goblinNftExActivityParam) {
+
+        // 根据名称查询
+        String title = goblinNftExActivityParam.getTitle();
+        GoblinNftExActivity goblinNftExActivityShow = goblinNftExActivityMapper.selectByTitle(title);
+        if (goblinNftExActivityShow != null){
+            return ResponseDto.failure("活动名称已存在!");
+        }
+
         LocalDateTime now = LocalDateTime.now();
         GoblinNftExActivity goblinNftExActivity = GoblinNftExActivity.getNew();
         BeanUtils.copyProperties(goblinNftExActivityParam, goblinNftExActivity);
@@ -61,7 +72,7 @@ public class GoblinNftExActivityServiceImpl implements IGoblinNftExActivityServi
         long s = System.currentTimeMillis();
         goblinNftExActivityMapper.addGoblinNftExActivity(goblinNftExActivity);
         log.debug("#MYS耗时:{}ms", System.currentTimeMillis() - s);
-        return goblinNftExActivity.getActivityId();
+        return ResponseDto.success(goblinNftExActivity.getActivityId());
     }
 
     @Override
@@ -84,15 +95,27 @@ public class GoblinNftExActivityServiceImpl implements IGoblinNftExActivityServi
         }
 
 
+
+
         ArrayList<GoblinNftExActivityVo> goblinNftExActivityArrayList = ObjectUtil.getGoblinNftExActivityArrayList();
         if (StringUtil.isNotBlank(activityIds)) {
             activityIds.deleteCharAt(activityIds.length() - 1);
 
+            // 根据活动ids查询正在生成的兑换码
+            List<GoblinNftExCodeTask> goblinNftExCodeTasks = goblinNftExCodeTaskMapper.selectByActivityIds(activityIds.toString());
+
             long k = System.currentTimeMillis();
             List<GoblinNftExCode> goblinNftExCodes = goblinNftExCodeMapper.selectByActivityIds(activityIds.toString());
             log.debug("#MYS耗时:{}ms", System.currentTimeMillis() - k);
 
             for (GoblinNftExActivity goblinNftExActivity : goblinNftExActivities) {
+                for (GoblinNftExCodeTask goblinNftExCodeTask: goblinNftExCodeTasks) {
+                    if (goblinNftExActivity.getActivityId().equals(goblinNftExCodeTask.getActivityId())){
+                        goblinNftExActivity.setIsDisplay(1);
+                        break;
+                    }
+                }
+                
                 Integer countNumber = 0;
                 Integer useNumber = 0;
                 Integer unUseNumber = 0;
@@ -112,6 +135,7 @@ public class GoblinNftExActivityServiceImpl implements IGoblinNftExActivityServi
                 goblinNftExActivity.setCountNumber(countNumber);
                 goblinNftExActivity.setUseNumber(useNumber);
                 goblinNftExActivity.setUnUseNumber(unUseNumber);
+
                 goblinNftExActivityArrayList.add(GoblinNftExActivityVo.getNew().copy(goblinNftExActivity));
             }
         }

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

@@ -8,7 +8,12 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.commons.lang.util.DateUtil;
+import com.liquidnet.commons.lang.util.HttpUtil;
 import com.liquidnet.commons.lang.util.StringUtil;
+import com.liquidnet.service.adam.dto.AdamUserInfoDto;
+import com.liquidnet.service.adam.entity.AdamUser;
+import com.liquidnet.service.adam.mapper.AdamUserMapper;
+import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.goblin.dto.vo.CodeExcelVo;
 import com.liquidnet.service.goblin.dto.vo.GoblinNftExActivityVo;
 import com.liquidnet.service.goblin.dto.vo.GoblinNftExCodeVo;
@@ -56,6 +61,10 @@ public class GoblinNftExCodeServiceImpl implements IGoblinNftExCodeService {
     private GoblinNftExSkuMapper goblinNftExSkuMapper;
     @Autowired
     private GoblinRedisUtils goblinRedisUtils;
+    @Autowired
+    private AdamUserMapper adamUserMapper;
+/*    @Autowired
+    private */
 
     @Override
     public PageInfo<GoblinNftExCodeVo> selectCodePageList(GoblinNftExCodeParam goblinNftExCodeParam) {
@@ -179,7 +188,7 @@ public class GoblinNftExCodeServiceImpl implements IGoblinNftExCodeService {
             String skuId = "";
             if (StringUtil.isNotBlank(goblinNftExCode.getBoxSkuId())) {
                 skuId = goblinNftExCode.getBoxSkuId();
-            } else  {
+            } else {
                 skuId = goblinNftExCode.getSkuId();
             }
 
@@ -208,13 +217,21 @@ public class GoblinNftExCodeServiceImpl implements IGoblinNftExCodeService {
     }
 
     @Override
-    public Boolean addAirdrop(GoblinNftExCodeParam goblinNftExCodeParam) {
+    public ResponseDto<Object> addAirdrop(GoblinNftExCodeParam goblinNftExCodeParam) {
         String code = goblinNftExCodeParam.getCode();
         String phone = goblinNftExCodeParam.getPhone();
+
+        AdamUserInfoDto adamUserInfoDto = adamUserMapper.selectByPhone(phone);
+        if (adamUserInfoDto == null){
+            return ResponseDto.failure("兑换码不正确或已失效");
+        }
+
         // 根据兑换code查询兑换码信息
         GoblinNftExCode goblinNftExCode = goblinNftExCodeMapper.selectGoblinNftCodeByCode(code);
 
 
+        // HttpUtil.post();
+
         return null;
     }
 
@@ -232,7 +249,7 @@ public class GoblinNftExCodeServiceImpl implements IGoblinNftExCodeService {
             String skuName = goblinNftExCodeParam.getSkuName();
             List<GoblinGoodsSku> goblinGoodsSkus = goblinGoodsSkuMapper.selectSkuLikeName(skuName);
             if (goblinGoodsSkus.size() <= 0) {
-                return ;
+                return;
             }
             StringBuffer skuIds = new StringBuffer();
             for (GoblinGoodsSku goblinGoodsSku : goblinGoodsSkus) {
@@ -341,7 +358,6 @@ public class GoblinNftExCodeServiceImpl implements IGoblinNftExCodeService {
         }
 
 
-
         try {
             writeExcel(httpServletResponse, codeExcelVoArrayList, "兑换码excel", "sheet1", CodeExcelVo.class);
         } 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

@@ -9,9 +9,11 @@ import com.liquidnet.service.goblin.dto.vo.GoblinNftExCodeVo;
 import com.liquidnet.service.goblin.dto.vo.GoblinNftExSkuVo;
 import com.liquidnet.service.goblin.entity.GoblinGoodsSku;
 import com.liquidnet.service.goblin.entity.GoblinNftExCode;
+import com.liquidnet.service.goblin.entity.GoblinNftExCodeTask;
 import com.liquidnet.service.goblin.entity.GoblinNftExSku;
 import com.liquidnet.service.goblin.mapper.GoblinGoodsSkuMapper;
 import com.liquidnet.service.goblin.mapper.GoblinNftExCodeMapper;
+import com.liquidnet.service.goblin.mapper.GoblinNftExCodeTaskMapper;
 import com.liquidnet.service.goblin.mapper.GoblinNftExSkuMapper;
 import com.liquidnet.service.goblin.param.GoblinNftExSkuParam;
 import com.liquidnet.service.goblin.service.IGoblinNftExSkuService;
@@ -46,6 +48,8 @@ public class GoblinNftExSkuServiceImpl implements IGoblinNftExSkuService {
     private GoblinRedisUtils goblinRedisUtils;
     @Autowired
     private GoblinGoodsSkuMapper goblinGoodsSkuMapper;
+    @Autowired
+    GoblinNftExCodeTaskMapper goblinNftExCodeTaskMapper;
 
 
     @Transactional
@@ -58,6 +62,7 @@ public class GoblinNftExSkuServiceImpl implements IGoblinNftExSkuService {
         ArrayList<GoblinNftExCodeVo> goblinNftExCodeArrayList = ObjectUtil.getGoblinNftExCodeArrayList();*/
 
 
+/*
         Boolean bol = false;
         String spuId = "";
         for (GoblinNftExSkuParam goblinNftExSkuParam : goblinNftExSkuParams) {
@@ -83,26 +88,40 @@ public class GoblinNftExSkuServiceImpl implements IGoblinNftExSkuService {
                 }
             }
         }
+*/
 
 
         List<GoblinNftExSku> goblinNftExSkus = new ArrayList<>();
-        List<GoblinNftExCode> goblinNftExCodes = new ArrayList<>();
+        List<GoblinNftExCodeTask> goblinNftExCodeTasks = new ArrayList<>();
+        // List<GoblinNftExCode> goblinNftExCodes = new ArrayList<>();
 
 
         // 构建对象
-        long startr = System.currentTimeMillis();
-
-        Map<String, GoblinNftExSkuParam> goblinNftExSkuParamMap = new HashMap<>();
-
         for (GoblinNftExSkuParam goblinNftExSkuParam : goblinNftExSkuParams) {
 
             GoblinNftExSku goblinNftExSku = new GoblinNftExSku();
             BeanUtils.copyProperties(goblinNftExSkuParam, goblinNftExSku);
             goblinNftExSku.setCreatedAt(now);
+            goblinNftExSkus.add(goblinNftExSku);
 
+            // 定时任务对象构建
+            GoblinNftExCodeTask goblinNftExCodeTask = GoblinNftExCodeTask.getNew();
+            goblinNftExCodeTask.setTaskId(IDGenerator.nextSnowId());
+            goblinNftExCodeTask.setActivityId(goblinNftExSkuParam.getActivityId());
+            goblinNftExCodeTask.setStoreId(goblinNftExSkuParam.getStoreId());
+            goblinNftExCodeTask.setSpuId(goblinNftExSkuParam.getSpuId());
+            goblinNftExCodeTask.setSkuId(goblinNftExSkuParam.getSkuId());
+            goblinNftExCodeTask.setUnbox(goblinNftExSkuParam.getUnbox());
+            goblinNftExCodeTask.setExStock(goblinNftExSkuParam.getExStock());
+            goblinNftExCodeTask.setExLimit(goblinNftExSkuParam.getExLimit());
+            goblinNftExCodeTask.setExStartTime(goblinNftExSkuParam.getExStartTime());
+            goblinNftExCodeTask.setExStopTime(goblinNftExSkuParam.getExStopTime());
+            goblinNftExCodeTask.setTyp(1);
+            goblinNftExCodeTask.setCreatedAt(now);
+            goblinNftExCodeTasks.add(goblinNftExCodeTask);
 
             // 盲盒  概率
-            switch (goblinNftExSkuParam.getUnbox()) {
+            /*switch (goblinNftExSkuParam.getUnbox()) {
                 case "1":
 
                     // sku ---> 库存
@@ -206,13 +225,12 @@ public class GoblinNftExSkuServiceImpl implements IGoblinNftExSkuService {
 
 
                     // goblinNftExSkuArrayList.add(GoblinNftExSkuVo.getNew().copy(goblinNftExSku));
-            }
+            }*/
 
-            goblinNftExSkus.add(goblinNftExSku);
 
         }
 
-
+        /*
         for (String key : goblinNftExSkuParamMap.keySet()) {
             GoblinNftExSkuVo goblinNftExSkuVo = goblinRedisUtils.getSkuTime(key);
 
@@ -243,13 +261,13 @@ public class GoblinNftExSkuServiceImpl implements IGoblinNftExSkuService {
 
             goblinRedisUtils.addSkuTime(key,goblinNftExSku);
         }
-
-        log.debug("RDM耗时：ms", System.currentTimeMillis() - startr);
+*/
 
         // 数据库操作
         long startm = System.currentTimeMillis();
         goblinNftExSkuMapper.addGoblinNftExSkus(goblinNftExSkus);
-        goblinNftExCodeMapper.addGoblinNftExCodes(goblinNftExCodes);
+        goblinNftExCodeTaskMapper.addGoblinNftExCodeTasks(goblinNftExCodeTasks);
+        // goblinNftExCodeMapper.addGoblinNftExCodes(goblinNftExCodes);
         log.debug("MSQ耗时：ms", System.currentTimeMillis() - startm);
 
         return true;