兑换码相关

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

@@ -16,12 +16,9 @@ public class GoblinNftExActivityParam implements Serializable {
     @ApiModelProperty(position = 10,required = false,value = "nft活动id")
     private String activityId;
 
-
-
     @ApiModelProperty(position = 11,required = true,value = "活动标题" ,example = "草莓音乐节")
     private String title;
 
-
     @ApiModelProperty(position = 12,required = false,value = "开始时间")
     private LocalDateTime startTime;
 

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

@@ -7,6 +7,7 @@ import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * @Author: wll

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

@@ -2,30 +2,30 @@
 <!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.GoblinNftExActivityMapper">
 
-    <resultMap id="BaseResult" type="com.liquidnet.service.goblin.dto.vo.GoblinNftExActivityVo">
+    <resultMap id="BaseResult" type="com.liquidnet.service.goblin.dto.vo.GoblinNftExActivity">
         <result column="activity_id" property="activityId"/>
         <result column="title" property="title"/>
         <result column="created_at" property="createdAt"/>
         <result column="updated_at" property="updatedAt"/>
     </resultMap>
 
-    <select id="selectPageList" resultMap="BaseResult">
+    <select id="selectPageList" resultType="BaseResult">
         select activity_id,title,created_at from goblin_nft_ex_activity
         <where>
             <if test="title != null and title != ''">
                 <bind name="likeTitle" value="'%'+title+'%'"/>
-                and  title like #{likeTitle}
+                and  title like ${likeTitle}
             </if>
             <if test="startTime != null">
-                and created_at &gt; #{startTime}
+                and created_at &gt; ${startTime}
             </if>
             <if test="endTime != null">
-                and created_at &lt; #{endTime}
+                and created_at &lt; ${endTime}
             </if>
         </where>
     </select>
 
-    <insert id="addGoblinNftExActivity" parameterType="com.liquidnet.service.goblin.dto.vo.GoblinNftExActivityVo">
+    <insert id="addGoblinNftExActivity" parameterType="com.liquidnet.service.goblin.dto.vo.GoblinNftExActivity">
         insert into goblin_nft_ex_activity
         (
          <if test="activityId != null and activityId != null">

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/GoblinNftOrderServiceImpl.java

@@ -207,6 +207,7 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
         }
     }
 
+    // @TODO 33
     private GoblinGoodsSkuInfoVo lotteryDraw(List<String> skuIdList, int number) {
         try {
             ArrayList<GoblinGoodsSkuInfoVo> skuInfoVos = ObjectUtil.cloneArrayGoblinGoodsSkuInfoListVo();

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

@@ -41,7 +41,7 @@ public class GoblinNftExActivityController {
 
     @ApiOperationSupport(order = 2)
     @ApiOperation(value = "活动列表")
-    @PostMapping("pageist")
+    @PostMapping("pageList")
     public ResponseDto<Object> pageList(@Valid @RequestBody GoblinNftExActivityParam goblinNftExActivityParam){
         return ResponseDto.success(iGoblinNftExActivityService.pageList(goblinNftExActivityParam));
     }

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

@@ -44,7 +44,9 @@ public  class GoblinNftExActivityServiceImpl implements IGoblinNftExActivityServ
         goblinNftExActivity.setActivityId(IDGenerator.nextSnowId());
         goblinNftExActivity.setCreatedAt(now);
         // mysql数据
+        long s = System.currentTimeMillis();
         goblinNftExActivityMapper.addGoblinNftExActivity(goblinNftExActivity);
+        log.debug("#MYS耗时:{}ms", System.currentTimeMillis() - s);
         return goblinNftExActivity.getActivityId();
     }
 
@@ -53,12 +55,14 @@ public  class GoblinNftExActivityServiceImpl implements IGoblinNftExActivityServ
 
         PageHelper.startPage(goblinNftExActivityParam.getPageNum(),20,true);
 
+
         /*
          * 获取分页nft兑换活动数据
          */
+        long s = System.currentTimeMillis();
         List<GoblinNftExActivity> goblinNftExActivities = goblinNftExActivityMapper.selectPageList(goblinNftExActivityParam.getTitle(), goblinNftExActivityParam.getStartTime(),
                 goblinNftExActivityParam.getEndTime());
-
+        log.debug("#MYS耗时:{}ms", System.currentTimeMillis() - s);
 
         StringBuffer activityIds = new StringBuffer();
         for (GoblinNftExActivity GoblinNftExActivity : goblinNftExActivities) {
@@ -67,8 +71,10 @@ public  class GoblinNftExActivityServiceImpl implements IGoblinNftExActivityServ
 
         if (StringUtil.isNotBlank(activityIds)){
             activityIds.deleteCharAt(activityIds.length()-1);
-            List<GoblinNftExCode> goblinNftExCodes =  goblinNftExCodeMapper.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) {
                 Integer countNumber = 0;
@@ -78,7 +84,7 @@ public  class GoblinNftExActivityServiceImpl implements IGoblinNftExActivityServ
                     if (goblinNftExActivity.getActivityId().equals(goblinNftExCode.getActivityId())){
                         countNumber++;
                         switch (goblinNftExCode.getState()){
-                            case 1:
+                            case 2:
                                 useNumber++;
                                 break;
                             default:

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

@@ -47,9 +47,11 @@ public class GoblinNftExSkuServiceImpl implements IGoblinNftExSkuService {
 
         LocalDateTime now = LocalDateTime.now();
 
-        ArrayList<GoblinNftExSkuVo> goblinNftExSkuArrayList = ObjectUtil.getGoblinNftExSkuArrayList();
-        ArrayList<GoblinNftExCodeVo> goblinNftExCodeArrayList = ObjectUtil.getGoblinNftExCodeArrayList();
+/*        ArrayList<GoblinNftExSkuVo> goblinNftExSkuArrayList = ObjectUtil.getGoblinNftExSkuArrayList();
+        ArrayList<GoblinNftExCodeVo> goblinNftExCodeArrayList = ObjectUtil.getGoblinNftExCodeArrayList();*/
 
+        List<GoblinNftExSku> goblinNftExSkus = new ArrayList<>();
+        List<GoblinNftExCode> goblinNftExCodes = new ArrayList<>();
 
         String activityId = "";
 
@@ -66,32 +68,56 @@ public class GoblinNftExSkuServiceImpl implements IGoblinNftExSkuService {
                 GoblinNftExCode goblinNftExCode = GoblinNftExCode.getNew();
                 goblinNftExCode.setCodeId(IDGenerator.nextSnowId());
                 goblinNftExCode.setActivityId(goblinNftExSkuParam.getActivityId());
+                // 获取code码
+                // 样例 2978-6496-9269-0694-XX
+
                 goblinNftExCode.setCode("");
                 goblinNftExCode.setSkuId(goblinNftExSkuParam.getSkuId());
                 goblinNftExCode.setState(1);
                 goblinNftExCode.setCreatedAt(now);
-
-                goblinNftExCodeArrayList.add(GoblinNftExCodeVo.getNew().copy(goblinNftExCode));
+                goblinNftExCodes.add(goblinNftExCode);
+                // goblinNftExCodeArrayList.add(GoblinNftExCodeVo.getNew().copy(goblinNftExCode));
             }
-            goblinNftExSkuArrayList.add(GoblinNftExSkuVo.getNew().copy(goblinNftExSku));
-        }
-
-
-        // redis 数据
-
-        // 并联sku信息
-/*        List<GoblinNftExSku> goblinNftExSkusVos = goblinRedisUtils.getSku(activityId);
-        goblinRedisUtils.incrSku(activityId, goblinNftExSkusVos, goblinNftExSkuArrayList);
 
-        // 兑换码信息
-        List<GoblinNftExCode> goblinNftExCodes = goblinRedisUtils.getCode(activityId);
-        goblinRedisUtils.incrCode(activityId, goblinNftExCodes, goblinNftExCodeArrayList);*/
+            goblinNftExSkus.add(goblinNftExSku);
+            // goblinNftExSkuArrayList.add(GoblinNftExSkuVo.getNew().copy(goblinNftExSku));
+        }
+        goblinNftExSkuMapper.addGoblinNftExSkus(goblinNftExSkus);
+        goblinNftExCodeMapper.addGoblinNftExCodes(goblinNftExCodes);
+        return true;
+    }
 
-        // goblinNftExSkuMapper.addGoblinNftExSkus(goblinNftExSkuArrayList);
-        // goblinNftExCodeMapper.addGoblinNftExCodes(goblinNftExCodeArrayList);
+    /**
+     *
+     * @function 生成num位的随机字符串(数字、大写字母随机混排)
+     * @param num
+     * @return
+     */
+    public static String createBigSmallLetterStrOrNumberRadom(int num) {
+
+        StringBuffer str = new StringBuffer();
+        for (int k=0;k<num;k++) {
+            for(int i=0;i < 4;i++){
+                int intVal=(int)(Math.random()*58+65);
+                if(intVal >= 91 && intVal <= 96){
+                    i--;
+                }
+                if(intVal < 91 || intVal > 96){
+                    if(intVal%2==0){
+                        str.append((char)intVal);
+                    }else{
+                        str.append((int)(Math.random()*10));
+                    }
+                }
+            }
+            str.append("-");
+        }
 
+        return str.toString()+"CH";
+    }
 
-        return null;
+    public static void main(String[] args) {
+        System.out.println(createBigSmallLetterStrOrNumberRadom(3));
     }