Merge remote-tracking branch 'origin/dev_goblin' into dev_goblin

# Conflicts:
#	liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/util/ObjectUtil.java

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

+package com.liquidnet.service.goblin.dto.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+@ApiModel(value = "GoblinStoreMarketRelationVo", description = "前端用 商铺活动 关联 spu sku")
+@Data
+public class GoblinMarketSpuListVo implements Serializable, Cloneable {
+    private static final long serialVersionUID = 2353354057235207502L;
+    @ApiModelProperty(position = 11, value = "spuId")
+    private String marketSpuId;
+    @ApiModelProperty(position = 12, value = "封面图片地址")
+    private String coverPic;
+    @ApiModelProperty(position = 12, value = "价格区间MIN[20,2]")
+    private BigDecimal priceGe;
+    @ApiModelProperty(position = 12, value = "价格区间MAX[20,2]")
+    private BigDecimal priceLe;
+    @ApiModelProperty(position = 12, value = "商品名称")
+    private String name;
+
+    private static final GoblinMarketSpuListVo obj = new GoblinMarketSpuListVo();
+    public static GoblinMarketSpuListVo getNew() {
+        try {
+            return (GoblinMarketSpuListVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new GoblinMarketSpuListVo();
+        }
+    }
+}

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

+package com.liquidnet.service.goblin.dto.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@ApiModel(value = "GoblinStoreMarketRelationVo", description = "前端用 商铺活动 关联 spu sku")
+@Data
+public class GoblinStoreMarketIsConfigVo implements Serializable, Cloneable {
+    private static final long serialVersionUID = 2353354057235207502L;
+    @ApiModelProperty(position = 11, value = "spuId")
+    private String spuId;
+    @ApiModelProperty(position = 12, value = "spuId 活动")
+    private String marketSpuId;
+
+    private static final GoblinStoreMarketIsConfigVo obj = new GoblinStoreMarketIsConfigVo();
+    public static GoblinStoreMarketIsConfigVo getNew() {
+        try {
+            return (GoblinStoreMarketIsConfigVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new GoblinStoreMarketIsConfigVo();
+        }
+    }
+}

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

@@ -4,6 +4,7 @@ import com.github.pagehelper.PageInfo;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.goblin.dto.manage.GoblinStorePurchaseCommonParam;
 import com.liquidnet.service.goblin.dto.manage.GoblinStorePurchaseItemParam;
+import com.liquidnet.service.goblin.dto.vo.GoblinMarketSpuListVo;
 import com.liquidnet.service.goblin.dto.vo.GoblinStoreMarketVo;
 
 import java.util.List;
@@ -66,13 +67,13 @@ public interface IGoblinStorePurchasingService {
     ResponseDto<GoblinStoreMarketVo> purchasingDetails(String marketId, String storeId);
 
     /**
-     * 获取活动内sku列表
+     * 获取活动内spu列表
      *
      * @param marketId 活动秒杀id
      * @param page     页数
      * @return
      */
-    ResponseDto<String> purchasingSkuList(String marketId, String storeId, int page);//TODO 返回值
+    ResponseDto<List<GoblinMarketSpuListVo>> purchasingSpuList(String marketId, String storeId, int page);
 
     /**
      * 添加活动相关sku

liquidnet-bus-common/liquidnet-common-cache/liquidnet-common-cache-redis/src/main/java/com.liquidnet.common.cache/redis/util/RedisUtil.java

@@ -17,7 +17,7 @@ import org.springframework.stereotype.Component;
  */
 @Slf4j
 @Component("redisUtil")
-public final class RedisUtil extends AbstractRedisUtil{
+public final class RedisUtil extends AbstractRedisUtil {
     @Autowired
     private RedisConfig redisConfig;
 
@@ -34,8 +34,8 @@ public final class RedisUtil extends AbstractRedisUtil{
 
     public static void main(String[] args) {
         String[] keys = {
-                "stone:user:773650",
-                "stone:item:logs:list:773650"
+                "sweet:luckDraw:num:20211230:surplus",
+                "sweet:luckDraw:num:20211230:all"
         };
         for (String key : keys) {
             long value = key.hashCode();

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/controller/manage/GoblinStorePurchasingController.java

@@ -3,13 +3,10 @@ package com.liquidnet.service.goblin.controller.manage;
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.goblin.dto.manage.GoblinStorePurchaseCommonParam;
-import com.liquidnet.service.goblin.dto.manage.GoblinStorePurchaseItemParam;
 import com.liquidnet.service.goblin.dto.manage.GoblinStorePurchaseParam;
-import com.liquidnet.service.goblin.dto.vo.GoblinPurchasingVo;
-import com.liquidnet.service.goblin.dto.vo.GoblinStoreInfoVo;
+import com.liquidnet.service.goblin.dto.vo.GoblinMarketSpuListVo;
 import com.liquidnet.service.goblin.dto.vo.GoblinStoreMarketVo;
 import com.liquidnet.service.goblin.service.manage.IGoblinStorePurchasingService;
-import com.sun.org.apache.xpath.internal.operations.Bool;
 import io.swagger.annotations.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -91,7 +88,7 @@ public class GoblinStorePurchasingController {
         return goblinStorePurchasingService.purchasingDetails(marketId, storeId);
     }
 
-    @GetMapping("purchasing/sku")
+    @GetMapping("purchasing/spu")
     @ApiOperation("活动详情-限时秒杀-sku列表")
     @ApiResponse(code = 200, message = "接口返回对象参数")
     @ApiImplicitParams({
@@ -99,10 +96,10 @@ public class GoblinStorePurchasingController {
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "storeId", value = "商铺id", example = "1"),
             @ApiImplicitParam(type = "form", required = true, dataType = "Integer", name = "page", value = "页数", example = "1"),
     })
-    public ResponseDto<String> purchasingSkuList(@RequestParam("marketId") @Valid String marketId,
+    public ResponseDto<List<GoblinMarketSpuListVo>> purchasingSpuList(@RequestParam("marketId") @Valid String marketId,
                                                                       @RequestParam("storeId") @Valid String storeId,
                                                                       @RequestParam("page") @Valid Integer page) {
-        return goblinStorePurchasingService.purchasingSkuList(marketId, storeId, page);
+        return goblinStorePurchasingService.purchasingSpuList(marketId, storeId, page);
     }
 
     @PostMapping("purchasing/sku")

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

@@ -10,15 +10,13 @@ import com.liquidnet.service.base.constant.MQConst;
 import com.liquidnet.service.goblin.constant.GoblinStatusConst;
 import com.liquidnet.service.goblin.dto.manage.GoblinStorePurchaseCommonParam;
 import com.liquidnet.service.goblin.dto.manage.GoblinStorePurchaseItemParam;
-import com.liquidnet.service.goblin.dto.vo.GoblinGoodsInfoVo;
-import com.liquidnet.service.goblin.dto.vo.GoblinGoodsSkuInfoVo;
-import com.liquidnet.service.goblin.dto.vo.GoblinMarketRelationVo;
-import com.liquidnet.service.goblin.dto.vo.GoblinStoreMarketVo;
+import com.liquidnet.service.goblin.dto.vo.*;
 import com.liquidnet.service.goblin.entity.GoblinStoreMarketPurchasing;
 import com.liquidnet.service.goblin.entity.GoblinStoreMarketing;
 import com.liquidnet.service.goblin.service.manage.IGoblinStorePurchasingService;
 import com.liquidnet.service.goblin.util.GoblinMongoUtils;
 import com.liquidnet.service.goblin.util.GoblinRedisUtils;
+import com.liquidnet.service.goblin.util.ObjectUtil;
 import com.liquidnet.service.goblin.util.QueueUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,6 +26,7 @@ import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import static com.liquidnet.commons.lang.util.DateUtil.DTF_YMD_HMS;
 
@@ -165,8 +164,28 @@ public class GoblinStorePurchasingServiceImpl implements IGoblinStorePurchasingS
     }
 
     @Override
-    public ResponseDto<String> purchasingSkuList(String marketId, String storeId, int page) {
-        return null;
+    public ResponseDto<List<GoblinMarketSpuListVo>> purchasingSpuList(String marketId, String storeId, int page) {
+        int size = 20;
+        List<GoblinStoreMarketIsConfigVo> spuIds = goblinRedisUtils.getStoreMarketIsConfig(marketId, storeId);
+        List<String> marketSpuList = spuIds.stream().map(GoblinStoreMarketIsConfigVo::getMarketSpuId).collect(Collectors.toList());
+        List<GoblinMarketSpuListVo> voList = ObjectUtil.getGoblinMarketSpuListVoArrayList();
+        int count = page * 40;
+        int startCount = (page - 1) * 40;
+        if (count >= marketSpuList.size()) {
+            count = marketSpuList.size();
+        }
+        for (int i = startCount; i < count; i++) {
+            GoblinMarketSpuListVo vo = GoblinMarketSpuListVo.getNew();
+            String marketSpuId = marketSpuList.get(i);
+            GoblinGoodsInfoVo spuVo = goblinRedisUtils.getGoodsInfoVo(marketSpuId);
+            vo.setMarketSpuId(marketSpuId);
+            vo.setCoverPic(spuVo.getCoverPic());
+            vo.setName(spuVo.getName());
+            vo.setPriceGe(spuVo.getPriceGe());
+            vo.setPriceLe(spuVo.getPriceLe());
+            voList.add(vo);
+        }
+        return ResponseDto.success(voList);
     }
 
     @Override
@@ -224,7 +243,7 @@ public class GoblinStorePurchasingServiceImpl implements IGoblinStorePurchasingS
         goblinRedisUtils.setGoodsInfoVo(spuVo);
         relationVo.setSkuList(skuList);
         goblinRedisUtils.addMarketRelation(GoblinStatusConst.MarketPreStatus.MARKET_PRE_PURCHASE.getValue(), params.getStoreMarketId(), relationVo);
-        goblinRedisUtils.addStoreMarketIsConfig(params.getStoreMarketId(), params.getStoreId(), params.getSpuId());
+        goblinRedisUtils.addStoreMarketIsConfig(params.getStoreMarketId(), params.getStoreId(), params.getSpuId(), marketSpuId);
         // 执行sql
         String sqlData = SqlMapping.gets(sqls, sqlsData);
         queueUtils.sendMsgByRedis(MQConst.GoblinQueue.GOBLIN_STORE_MARKET.getKey(),
@@ -289,7 +308,7 @@ public class GoblinStorePurchasingServiceImpl implements IGoblinStorePurchasingS
         //redis
         goblinRedisUtils.delGoodsInfoVo(marketSpuId);
         goblinRedisUtils.removeMarketRelation(GoblinStatusConst.MarketPreStatus.MARKET_PRE_PURCHASE.getValue(), marketId, spuId);
-        goblinRedisUtils.delStoreMarketIsConfig(marketId, storeId, spuId);
+        goblinRedisUtils.delStoreMarketIsConfig(marketId, storeId, spuId, marketSpuId);
         //mysql
         queueUtils.sendMsgByRedis(MQConst.GoblinQueue.GOBLIN_STORE_MARKET.getKey(),
                 SqlMapping.get("goblin.store.market.delSpuRelation", bean.getDelFlag(), bean.getUpdatedAt(), marketId, storeId, spuId));

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

@@ -112,28 +112,43 @@ public class GoblinRedisUtils {
         redisUtil.del(redisKey);
     }
 
-    public List<String> getStoreMarketIsConfig(String marketId,String storeId){
+
+    /**
+     * 获取 配置的商铺id
+     *
+     * @param marketId
+     * @param storeId
+     */
+    public List<GoblinStoreMarketIsConfigVo> getStoreMarketIsConfig(String marketId, String storeId) {
         String redisKey = GoblinRedisConst.REDIS_GOBLIN_STORE_MARKET_ISCONFIG.concat(marketId).concat(":store_id:" + storeId);
         Object obj = redisUtil.get(redisKey);
-        if(obj==null){
-            return CollectionUtil.arrayListString();
-        }else{
-            return (List<String>) obj;
+        if (obj == null) {
+            return new ArrayList();
+        } else {
+            return (List<GoblinStoreMarketIsConfigVo>) obj;
         }
     }
 
-    public void addStoreMarketIsConfig(String marketId,String storeId,String spuId){
+    public void addStoreMarketIsConfig(String marketId, String storeId, String spuId,String marketSpuId) {
         String redisKey = GoblinRedisConst.REDIS_GOBLIN_STORE_MARKET_ISCONFIG.concat(marketId).concat(":store_id:" + storeId);
-        List<String> voList = getStoreMarketIsConfig(marketId,storeId);
-        voList.add(spuId);
-        redisUtil.set(redisKey,voList);
+        List<GoblinStoreMarketIsConfigVo> voList = getStoreMarketIsConfig(marketId, storeId);
+        GoblinStoreMarketIsConfigVo vo = GoblinStoreMarketIsConfigVo.getNew();
+        vo.setMarketSpuId(marketSpuId);
+        vo.setSpuId(spuId);
+        voList.add(vo);
+        redisUtil.set(redisKey, voList);
     }
 
-    public void delStoreMarketIsConfig(String marketId,String storeId,String spuId){
+    public void delStoreMarketIsConfig(String marketId, String storeId, String spuId,String marketSpuId) {
         String redisKey = GoblinRedisConst.REDIS_GOBLIN_STORE_MARKET_ISCONFIG.concat(marketId).concat(":store_id:" + storeId);
-        List<String> voList = getStoreMarketIsConfig(marketId,storeId);
-        voList.remove(spuId);
-        redisUtil.set(redisKey,voList);
+        List<GoblinStoreMarketIsConfigVo> voList = getStoreMarketIsConfig(marketId, storeId);
+        for (int i =0 ;i<voList.size();i++){
+            String itemSpuId= voList.get(i).getSpuId();
+            if(spuId.equals(itemSpuId)){
+                voList.remove(i);
+            }
+        }
+        redisUtil.set(redisKey, voList);
     }
 
     /**

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

@@ -19,6 +19,7 @@ public class ObjectUtil {
     private static final ArrayList<GoblinSelfMarketingVo> goblinSelfMarketingVoArrayList = new ArrayList<>();
     private static final ArrayList<GoblinGoodsSkuInfoVo> goblinGoodsSkuInfoVoArrayList = new ArrayList<>();
     private static final ArrayList<GoblinGoodsSpecVo> goblinGoodsSpecVoArrayList = new ArrayList<>();
+    private static final ArrayList<GoblinMarketSpuListVo> goblinMarketSpuListVoArrayList = new ArrayList<>();
 
     private static final BasicDBObject basicDBObject = new BasicDBObject();
 
@@ -45,6 +46,10 @@ public class ObjectUtil {
         return (ArrayList<GoblinGoodsSpecVo>) goblinGoodsSpecVoArrayList.clone();
     }
 
+    public static ArrayList<GoblinMarketSpuListVo> getGoblinMarketSpuListVoArrayList() {
+        return (ArrayList<GoblinMarketSpuListVo>) goblinMarketSpuListVoArrayList.clone();
+    }
+
     public static BasicDBObject cloneBasicDBObject() {
         return (BasicDBObject) basicDBObject.clone();
     }