批量空投修改

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

@@ -11,22 +11,11 @@ public class PageInfoVo {
      */
     private int total;
     private Object list;
+    private int skuNumber;
 
     public PageInfoVo() {
     }
 
-/*
-    public PageInfoVo(ArrayList<GoblinNftExActivityVo> goblinNftExActivityArrayList, int count, int num) {
-        this.list = goblinNftExActivityArrayList;
-        this.total = count;
-    }
-
-    public PageInfoVo(ArrayList<GoblinNftExCodeVo> goblinNftExCodeVos, int count, String vio) {
-        this.list = goblinNftExCodeVos;
-        this.total = count;
-    }
-*/
-
     private static final PageInfoVo obj = new PageInfoVo();
 
     public static PageInfoVo getNew() {

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-kylin/src/main/java/com/liquidnet/service/consumer/kylin/receiver/AbstractHttpRedisReceiver.java

@@ -54,10 +54,11 @@ public abstract class AbstractHttpRedisReceiver implements StreamListener<String
         try {
             String codestr = message.get("codes");
             String userIds = message.get("userIds");
+            String phonestr = message.get("phones");
             String adminUid = message.get("adminUid");
             List<String> codeList = Arrays.asList(codestr.split(","));
             List<String> userIdList = Arrays.asList(userIds.split(","));
-
+            List<String> phoneList = Arrays.asList(phonestr.split(","));
             LinkedList<Object[]> addLink = CollectionUtil.linkedListObjectArr();
             for (int i = 0; i < userIdList.size(); i++) {
                 MultiValueMap<String, String> params = new LinkedMultiValueMap();
@@ -69,17 +70,17 @@ public abstract class AbstractHttpRedisReceiver implements StreamListener<String
                 ResponseDto<Boolean> rsp = JsonUtils.fromJson(post, new TypeReference<ResponseDto<Boolean>>() {
                 });
                 if (rsp.isSuccess()) {
-                    addLink.add(new Object[]{adminUid,codeList.get(i)});
-                }else {
-                    log.error("airdrop send fail:[{}]"+userIdList.get(i));
+                    addLink.add(new Object[]{adminUid, codeList.get(i)});
+                } else {
+                    log.error("airdrop send fail:[{}]" + phoneList.get(i));
                 }
             }
 
-            if (addLink!= null && !addLink.isEmpty()){
+            if (addLink != null && !addLink.isEmpty()) {
                 LinkedList<String> sqls = CollectionUtil.linkedListString();
                 sqls.add(SqlMapping.get("goblin_activity.code.admin"));
                 String sqlData = SqlMapping.gets(sqls, addLink);
-                sendMsgByRedis(MQConst.GoblinQueue.GOBLIN_CODE_OPERA.getKey(),sqlData);
+                sendMsgByRedis(MQConst.GoblinQueue.GOBLIN_CODE_OPERA.getKey(), sqlData);
             }
 
         } catch (Exception e) {

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

@@ -44,10 +44,7 @@ import java.io.OutputStream;
 import java.net.URLEncoder;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
+import java.util.*;
 
 /**
  * @Author: wll
@@ -133,7 +130,6 @@ public class GoblinNftExCodeServiceImpl implements IGoblinNftExCodeService {
                             goblinNftExCodeVo.setResultSkuName(goblinGoodsSku.getName());
                         }
                     }
-
                 }
                 goblinNftExCodeArrayList.add(goblinNftExCodeVo);
             }
@@ -144,6 +140,12 @@ public class GoblinNftExCodeServiceImpl implements IGoblinNftExCodeService {
         List<GoblinNftExSku> goblinNftExSkus = goblinNftExSkuMapper.selectGoblinNftExSkuByActivityIds(acticityIds.toString());
 
 
+        HashSet<String> skuIdSet = CollectionUtil.getStringArraySet();
+        for (GoblinNftExSku goblinNftExSku : goblinNftExSkus) {
+            skuIdSet.add(goblinNftExSku.getSkuId());
+        }
+
+
         LocalDateTime now = LocalDateTime.now();
         for (GoblinNftExCodeVo gnc : goblinNftExCodeArrayList) {
             for (GoblinNftExSku goblinNftExSku : goblinNftExSkus) {
@@ -172,6 +174,7 @@ public class GoblinNftExCodeServiceImpl implements IGoblinNftExCodeService {
         PageInfoVo pageInfoVo = PageInfoVo.getNew();
         pageInfoVo.setList(goblinNftExCodeArrayList);
         pageInfoVo.setTotal(count);
+        pageInfoVo.setSkuNumber(skuIdSet.size());
         return pageInfoVo;
     }
 
@@ -381,6 +384,7 @@ public class GoblinNftExCodeServiceImpl implements IGoblinNftExCodeService {
         // 手机号集合
         StringBuffer phonestr = new StringBuffer();
         List<String> phoneList = CollectionUtil.arrayListString();
+
         try {
             EasyExcel.read(file.getInputStream(), GoblinNftExCodeFetchExcelVo.class, new PageReadListener<GoblinNftExCodeFetchExcelVo>(dataList -> {
                 for (GoblinNftExCodeFetchExcelVo data : dataList) {
@@ -389,6 +393,7 @@ public class GoblinNftExCodeServiceImpl implements IGoblinNftExCodeService {
                     }
                     phonestr.append(data.getPhone()).append(",");
                     phoneList.add(data.getPhone());
+
                 }
             })).sheet().doRead();
 
@@ -403,7 +408,7 @@ public class GoblinNftExCodeServiceImpl implements IGoblinNftExCodeService {
 
         // 根据手机号获取用户
         List<AdamUserInfoDto> adamUserInfoDtoList = adamUserMapper.selectByPhones(phonestr.toString());
-        if (adamUserInfoDtoList == null || adamUserInfoDtoList.size() <= 0 ){
+        if (adamUserInfoDtoList == null || adamUserInfoDtoList.size() <= 0) {
             return ResponseDto.failure("根据手机号未能查询到用户！");
         }
 
@@ -418,10 +423,12 @@ public class GoblinNftExCodeServiceImpl implements IGoblinNftExCodeService {
             return ResponseDto.failure("可用兑换码数量不足!");
         }
 
+
         // 页条数
         int pageSize = 50;
         ArrayList<String> userIdList = CollectionUtil.arrayListString();
         StringBuffer userIds = new StringBuffer();
+        StringBuffer phones = new StringBuffer();
         int pageNumber = 1;
         for (String phone : phoneList) {
             if (!phoneCheckList.contains(phone)) {
@@ -439,6 +446,7 @@ public class GoblinNftExCodeServiceImpl implements IGoblinNftExCodeService {
 
             userIdList.add(adamUserInfo.getUid());
             userIds.append(adamUserInfo.getUid()).append(",");
+            phones.append(adamUserInfo.getMobile()).append(",");
             if (userIdList.size() == pageSize) {
                 StringBuffer codes = new StringBuffer();
                 PageHelper.startPage(pageNumber, pageSize, true);
@@ -451,10 +459,12 @@ public class GoblinNftExCodeServiceImpl implements IGoblinNftExCodeService {
                 userIds.deleteCharAt(userIds.length() - 1);
                 hashMap.put("codes", codes.toString());
                 hashMap.put("userIds", userIds.toString());
+                hashMap.put("phones",phones.toString());
                 hashMap.put("adminUid", adminUid);
                 queueUtils.sendMssPhoneCodeRedis(hashMap);
                 userIdList.clear();
                 userIds = new StringBuffer();
+                phones = new StringBuffer();
                 pageNumber++;
             }
         }
@@ -470,21 +480,16 @@ public class GoblinNftExCodeServiceImpl implements IGoblinNftExCodeService {
             codes.deleteCharAt(codes.length() - 1);
             userIds.deleteCharAt(userIds.length() - 1);
             hashMap.put("codes", codes.toString());
+            hashMap.put("phones",phones.toString());
             hashMap.put("userIds", userIds.toString());
             hashMap.put("adminUid", adminUid);
             queueUtils.sendMssPhoneCodeRedis(hashMap);
             userIdList.clear();
         }
 
-
         return ResponseDto.success(true);
     }
 
-    public static void main(String[] args) {
-
-
-    }
-
     /**
      * 导出
      *