+JOB:商城:商铺活动开启关闭;

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

@@ -79,7 +79,7 @@ public class GoblinStoreMgtCouponAddParam implements Serializable {
     @NotNull(message = "限领数量不能为空")
     @Min(value = 1, message = "限领数量不能小于1")
     private Integer receiveLimit;
-    @ApiModelProperty(position = 19, required = true, value = "领取约束[0-不开放|1-开放]", allowableValues = "0,1")
+    @ApiModelProperty(position = 19, required = true, value = "领取约束[0-不开放|1-开放]", allowableValues = "0,1", example = "1")
     @NotNull(message = "领取约束不能为空")
     @Pattern(regexp = "\\b(0|1)\\b", message = "领取约束参数无效")
     private String receiveCurb;//

liquidnet-bus-feign/liquidnet-api-feign-platform/src/main/java/com/liquidnet/service/feign/platform/task/FeignPlatformGoblinTaskClient.java

@@ -18,4 +18,7 @@ public interface FeignPlatformGoblinTaskClient {
 
     @PutMapping("ggoods/task/onshelves")
     ResponseDto<String> goodsOnShelvesHandler();
+
+    @PutMapping("gstore/task/market/activity")
+    ResponseDto<String> storeMarketActivityHandler();
 }

liquidnet-bus-service/liquidnet-service-executor-all/liquidnet-service-executor-main/src/main/java/com/liquidnet/service/executor/main/handler/PlatformGoblinTaskHandler.java

@@ -36,4 +36,22 @@ public class PlatformGoblinTaskHandler {
             return fail;
         }
     }
+
+    // 商城:商铺活动开启关闭
+    @XxlJob(value = "sev-platform:goblinStoreMarketActivityHandler")
+    public ReturnT<String> goblinStoreMarketActivityHandler() {
+        try {
+            ResponseDto<String> dto = feignPlatformGoblinTaskClient.storeMarketActivityHandler();
+            String dtoStr = JsonUtils.toJson(dto);
+            log.info("result of handler:{}", dtoStr);
+            ReturnT<String> success = ReturnT.SUCCESS;
+            success.setMsg(dtoStr);
+            return success;
+        } catch (Exception e) {
+            log.error("exception of handler:{}", e.getMessage(), e);
+            ReturnT<String> fail = ReturnT.FAIL;
+            fail.setMsg(e.getLocalizedMessage());
+            return fail;
+        }
+    }
 }

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

@@ -986,7 +986,7 @@ public class GoblinRedisUtils {
         List<GoblinStoreMarketDto> dtos;
         if (StringUtils.isEmpty(valStr)) {
             // TODO: 2022/2/17 zhanggb mongodb 查取该商品所有参与的活动并整理集合
-            dtos = ObjectUtil.getGoblinGoodsMarketDtoArrayList();
+            dtos = ObjectUtil.getGoblinStoreMarketDtoArrayList();
         } else {
             dtos = JsonUtils.fromJson(valStr, new TypeReference<List<GoblinStoreMarketDto>>() {
             });

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

@@ -258,7 +258,7 @@ public class ObjectUtil {
         return (ArrayList<GoblinStoreMgtCouponSpuListVo>) goblinStoreMgtCouponSpuListVoArrayList.clone();
     }
 
-    public static ArrayList<GoblinStoreMarketDto> getGoblinGoodsMarketDtoArrayList() {
+    public static ArrayList<GoblinStoreMarketDto> getGoblinStoreMarketDtoArrayList() {
         return (ArrayList<GoblinStoreMarketDto>) goblinStoreMarketDtoArrayList.clone();
     }
 

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/goblin/task/PlatformGoblinStoreTaskController.java

@@ -36,8 +36,8 @@ public class PlatformGoblinStoreTaskController {
     @Autowired
     private PlatformGoblinStoreCouponService platformGoblinStoreCouponService;
 
-    @PutMapping("market")
-    public ResponseDto<String> marketActivityProcessing() {
+    @PutMapping("market/activity")
+    public ResponseDto<String> storeMarketActivityHandler() {
         int startNum = 0, stopNum = 0;
 
         LocalDateTime now = LocalDateTime.now();

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

@@ -78,7 +78,7 @@ public class PlatformGoblinStoreCouponService extends ServiceImpl<GoblinStoreCou
                         return storeCouponList.size();
                     }
                 } catch (Exception e) {
-                    log.error("###商铺活动:优惠券处理异常[now={},storeCouponList={}]", now, JsonUtils.toJson(storeCouponIdList));
+                    log.error("###商铺活动:优惠券处理异常[now={},storeCouponList={}]", now, JsonUtils.toJson(storeCouponIdList), e);
                 }
             }
         }

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/utils/GoblinRedisUtils.java

@@ -129,7 +129,7 @@ public class GoblinRedisUtils {
         List<GoblinStoreMarketDto> dtos = null;
         if (StringUtils.isEmpty(valStr)) {
             // TODO: 2022/2/17 zhanggb mongodb 查取该商品所有参与的活动并整理集合
-//            dtos = ObjectUtil.getGoblinGoodsMarketDtoArrayList();
+            dtos = ObjectUtil.getGoblinStoreMarketDtoArrayList();
         } else {
             dtos = JsonUtils.fromJson(valStr, new TypeReference<List<GoblinStoreMarketDto>>() {
             });

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/utils/ObjectUtil.java

@@ -5,15 +5,13 @@ import com.liquidnet.service.base.PagedResult;
 import com.liquidnet.service.candy.entity.CandyCommonCoupon;
 import com.liquidnet.service.candy.entity.CandyCouponCode;
 import com.liquidnet.service.candy.entity.CandyUserCoupon;
-import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderListVo;
+import com.liquidnet.service.goblin.dto.GoblinStoreMarketDto;
 import com.liquidnet.service.kylin.entity.KylinOrderCoupons;
 import com.mongodb.BasicDBObject;
 import org.springframework.stereotype.Component;
-import org.springframework.util.LinkedMultiValueMap;
 
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.LinkedList;
 
 /**
  * @author AnJiabin <anjiabin@zhengzai.tv>
@@ -61,6 +59,8 @@ public class ObjectUtil {
     private static final PagedResult<AdamDisposedUserVo> adamDisposedUserVoPagedResult = new PagedResult<>();
     private static final ArrayList<KylinOrderCoupons> kylinOrderCouponsArrayList = new ArrayList<>();
 
+    private static final ArrayList<GoblinStoreMarketDto> goblinStoreMarketDtoArrayList = new ArrayList<>();
+
     public static ArrayList<AdamTagParentVo> getAdamTagParentVoArrayList() {
         return (ArrayList<AdamTagParentVo>) adamTagParentVoArrayList.clone();
     }
@@ -124,4 +124,8 @@ public class ObjectUtil {
     public static ArrayList<KylinOrderCoupons> getKylinOrderCouponsArrayList() {
         return (ArrayList<KylinOrderCoupons>) kylinOrderCouponsArrayList.clone();
     }
+
+    public static ArrayList<GoblinStoreMarketDto> getGoblinStoreMarketDtoArrayList() {
+        return (ArrayList<GoblinStoreMarketDto>) goblinStoreMarketDtoArrayList.clone();
+    }
 }