提交部分代码

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

@@ -2,21 +2,31 @@ package com.liquidnet.service.goblin.dto.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 @ApiModel
-public class GoblinZhengzaiVo {
+@Data
+public class GoblinZhengzaiVo implements Cloneable{
     @ApiModelProperty(value = "活动id")
     String marketId;
+    @ApiModelProperty(value = "活动名称")
+    String name;
     @ApiModelProperty(value = "活动状态[-1-全部|0-等待开始|1-活动中|2-活动结束|7-停用]")
     Integer status;
     @ApiModelProperty(value = "开始时间")
     String startTime;
     @ApiModelProperty(value = "结束时间")
     String endTime;
-    @ApiModelProperty(value = "是否预热")
-    Integer isPre;
-    @ApiModelProperty(value = "预热时间")
-    String preTime;
     @ApiModelProperty(value = "创建时间")
     String createdAt;
+
+    private static final GoblinZhengzaiVo obj = new GoblinZhengzaiVo();
+
+    public static GoblinZhengzaiVo getNew() {
+        try {
+            return (GoblinZhengzaiVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new GoblinZhengzaiVo();
+        }
+    }
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/goblin/GoblinStorePurchasingController.java

@@ -6,6 +6,7 @@ import com.liquidnet.client.admin.zhengzai.goblin.service.IGoblinZhengzaiMarketS
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.goblin.dto.manage.GoblinStoreZhengzaiParam;
 import com.liquidnet.service.goblin.dto.vo.GoblinZhengzaiVo;
+import com.liquidnet.service.goblin.entity.GoblinSelfMarketing;
 import io.swagger.annotations.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,7 +45,7 @@ public class GoblinStorePurchasingController extends BaseController {
                                         @RequestParam(value = "endTime", required = false) String et,
                                         @RequestParam(value = "createdAt", required = false) String ct) {
         startPage();
-        List<GoblinZhengzaiVo> list = goblinZhengzaiMarketService.zhengzaiList(page, purchaseName, status, st, et, ct).getData();
+        List<GoblinSelfMarketing> list = goblinZhengzaiMarketService.zhengzaiList(page, purchaseName, status, st, et, ct).getData();
         return getDataTable(list);
     }
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/goblin/service/IGoblinZhengzaiMarketService.java

@@ -4,6 +4,7 @@ import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.goblin.dto.manage.GoblinStorePurchaseItemParam;
 import com.liquidnet.service.goblin.dto.vo.GoblinZhengzaiStoreListVo;
 import com.liquidnet.service.goblin.dto.vo.GoblinZhengzaiVo;
+import com.liquidnet.service.goblin.entity.GoblinSelfMarketing;
 
 import java.util.List;
 
@@ -23,7 +24,7 @@ public interface IGoblinZhengzaiMarketService {
      * @param ct           创建时间
      * @return
      */
-    ResponseDto<List<GoblinZhengzaiVo>> zhengzaiList(int page, String purchaseName, int status, String st, String et, String ct);
+    ResponseDto<List<GoblinSelfMarketing>> zhengzaiList(int page, String purchaseName, int status, String st, String et, String ct);
 
     /**
      * 正在状态操作

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/goblin/service/imp/GoblinZhengzaiMarketServiceImpl.java

 package com.liquidnet.client.admin.zhengzai.goblin.service.imp;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.liquidnet.client.admin.zhengzai.goblin.service.IGoblinZhengzaiMarketService;
 import com.liquidnet.client.admin.zhengzai.goblin.utils.GoblinMongoUtils;
 import com.liquidnet.client.admin.zhengzai.goblin.utils.GoblinRedisUtils;
+import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.goblin.constant.GoblinStatusConst;
@@ -12,6 +15,7 @@ import com.liquidnet.service.goblin.dto.vo.GoblinZhengzaiVo;
 import com.liquidnet.service.goblin.entity.GoblinSelfMarketing;
 import com.liquidnet.service.goblin.mapper.GoblinSelfMarketingMapper;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.mongodb.core.convert.QueryMapper;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
@@ -33,13 +37,44 @@ public class GoblinZhengzaiMarketServiceImpl implements IGoblinZhengzaiMarketSer
     GoblinSelfMarketingMapper goblinSelfMarketingMapper;
 
     @Override
-    public ResponseDto<List<GoblinZhengzaiVo>> zhengzaiList(int page, String purchaseName, int status, String st, String et, String ct) {
-        return null;
+    public ResponseDto<List<GoblinSelfMarketing>> zhengzaiList(int page, String purchaseName, int status, String st, String et, String ct) {
+        LambdaUpdateWrapper<GoblinSelfMarketing> queryMapper = Wrappers.lambdaUpdate(GoblinSelfMarketing.getNew());
+        switch (status) {
+            case 0://未开始
+                queryMapper.lt(GoblinSelfMarketing::getStartTime, DateUtil.getNowTime());
+                break;
+            case 1://进行中
+                queryMapper.ge(GoblinSelfMarketing::getStartTime, DateUtil.getNowTime()).le(GoblinSelfMarketing::getEndTime, DateUtil.getNowTime());
+                break;
+            case 2://已结束
+                queryMapper.gt(GoblinSelfMarketing::getEndTime, DateUtil.getNowTime());
+                break;
+            case 7://停用
+                queryMapper.gt(GoblinSelfMarketing::getStatus, GoblinStatusConst.MarketingStatus.STORE_PURCHASE_STATUS_STOP);
+                break;
+        }
+
+        if (st != null && et != null) {
+            queryMapper.ge(GoblinSelfMarketing::getStartTime, st).le(GoblinSelfMarketing::getEndTime, et);
+        }
+        if (ct != null) {
+            queryMapper.eq(GoblinSelfMarketing::getCreatedAt, ct);
+        }
+        return ResponseDto.success(goblinSelfMarketingMapper.selectList(queryMapper));
     }
 
     @Override
     public ResponseDto<Boolean> zhengzaiStatus(String marketId, int status) {
-        return null;
+        GoblinSelfMarketing selfMarketing = GoblinSelfMarketing.getNew();
+        selfMarketing.setStatus(status);
+        selfMarketing.setUpdatedAt(LocalDateTime.now());
+        //mysql
+        goblinSelfMarketingMapper.update(selfMarketing, Wrappers.lambdaUpdate(GoblinSelfMarketing.getNew()).eq(GoblinSelfMarketing::getSelfMarketId, marketId));
+        //mongo
+        goblinMongoUtils.updateSelfMarket(marketId, selfMarketing);
+        //redis
+        goblinRedisUtils.setSelfMarket(marketId, selfMarketing);
+        return ResponseDto.success();
     }
 
     @Override
@@ -67,6 +102,7 @@ public class GoblinZhengzaiMarketServiceImpl implements IGoblinZhengzaiMarketSer
         selfMarketing.setType(GoblinStatusConst.MarketingStatus.SELF_TYPE_ZHENGZAI.getValue());
         selfMarketing.setStartTime(LocalDateTime.parse(st, DTF_YMD_HMS));
         selfMarketing.setEndTime(LocalDateTime.parse(et, DTF_YMD_HMS));
+        selfMarketing.setUpdatedAt(LocalDateTime.now());
         //mysql
         goblinSelfMarketingMapper.update(selfMarketing, Wrappers.lambdaUpdate(GoblinSelfMarketing.getNew()).eq(GoblinSelfMarketing::getSelfMarketId, marketId));
         //mongo
@@ -78,6 +114,14 @@ public class GoblinZhengzaiMarketServiceImpl implements IGoblinZhengzaiMarketSer
 
     @Override
     public ResponseDto<GoblinZhengzaiVo> zhengzaiDetails(String marketId) {
+        GoblinSelfMarketing data = goblinSelfMarketingMapper.selectOne(Wrappers.lambdaQuery(GoblinSelfMarketing.getNew()).eq(GoblinSelfMarketing::getSelfMarketId,marketId));
+        GoblinZhengzaiVo vo = GoblinZhengzaiVo.getNew();
+        vo.setMarketId(data.getSelfMarketId());
+        vo.setName(data.getName());
+        vo.setStartTime(DateUtil.Formatter.yyyyMMddHHmmss.format(data.getStartTime()));
+        vo.setEndTime(DateUtil.Formatter.yyyyMMddHHmmss.format(data.getEndTime()));
+        vo.setStatus(data.getStatus());
+        vo.setCreatedAt(DateUtil.Formatter.yyyyMMddHHmmss.format(data.getCreatedAt()));
         return null;
     }
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/goblin/utils/GoblinMongoUtils.java

@@ -8,7 +8,9 @@ import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.stereotype.Component;
 
+@Component
 public class GoblinMongoUtils {
 
     @Autowired

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/goblin/utils/GoblinRedisUtils.java

@@ -4,7 +4,9 @@ import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
 import com.liquidnet.service.goblin.constant.GoblinRedisConst;
 import com.liquidnet.service.goblin.entity.GoblinSelfMarketing;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 
+@Component
 public class GoblinRedisUtils {
 
     @Autowired