优化

src/main/java/com/miya/draw/config/business/BusinessConfig.java

@@ -56,5 +56,11 @@ public interface BusinessConfig {
      */
     Long getDrawMaxMoney();
 
+    /**
+     * 抽奖有效时间
+     * @return
+     */
+    int getValidTime();
+
 
 }

src/main/java/com/miya/draw/config/business/BusinessConfigImpl.java

@@ -37,5 +37,8 @@ public class BusinessConfigImpl implements BusinessConfig {
     @Value("${draw.maxmoney}")
     public Long drawMaxMoney;
 
+    @Value("${draw.validTime}")
+    private int validTime;
+
 
 }

src/main/java/com/miya/draw/entity/ActivityConfig.java

+package com.miya.draw.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.beans.factory.annotation.Value;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * @author ：djf
+ * @date ：2022-10-24
+ * @description：活动业务参数配置
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="activity_config对象", description="")
+@TableName("activity_config")
+public class ActivityConfig implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty(value = "活动Id")
+    private Long activityId;
+
+    @ApiModelProperty(value = "抽奖方式  1满额抽奖   2足量抽奖")
+    private Integer raffle;
+
+    @ApiModelProperty(value = "抽奖最大次数")
+    private Integer drawMaxCount;
+
+    @ApiModelProperty(value = "足量抽奖时每多少件加1次次数")
+    private Integer amountUnit;
+
+    @ApiModelProperty(value = "足量抽奖时理论上最多买多少件")
+    private Integer maxAmount;
+
+    @ApiModelProperty(value = "满额抽奖时每多少元加1次次数")
+    public String countUnit;
+
+    @ApiModelProperty(value = "满额抽奖时理论上最多花费金额 元")
+    public Long maxMoney;
+
+    @ApiModelProperty(value = "抽奖次数有效时间  1：当天有效  2：两天内有效以此类推")
+    private int validTime;
+
+    @ApiModelProperty(value = "活动是否有效 0无效 1有效")
+    private Integer validStatus;
+
+    @ApiModelProperty(value = "创建时间")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty(value = "更新时间")
+    private LocalDateTime updateTime;
+
+}

src/main/java/com/miya/draw/mapper/ActivityConfigMapper.java

+package com.miya.draw.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.miya.draw.entity.Account;
+import com.miya.draw.entity.ActivityConfig;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author ：djf
+ * @date ：2022-10-25
+ * @description：活动配置
+ */
+@Mapper
+public interface ActivityConfigMapper extends BaseMapper<ActivityConfig> {
+
+}
+

src/main/java/com/miya/draw/service/IActivityConfigService.java

+package com.miya.draw.service;
+
+import com.miya.draw.entity.ActivityConfig;
+
+/**
+ * @author ：djf
+ * @date ：2022-10-25
+ * @description：活动配置
+ */
+public interface IActivityConfigService {
+
+    ActivityConfig getConfig();
+}

src/main/java/com/miya/draw/service/IActivityGoodsService.java

@@ -20,5 +20,5 @@ public interface IActivityGoodsService extends IService<ActivityGoods> {
      *
      * @return
      */
-    List<String> listAllActivityGoods();
+    List<String> listAllActivityGoods(Long activityId);
 }

src/main/java/com/miya/draw/service/impl/ActivityConfigServiceImpl.java

+package com.miya.draw.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.miya.draw.entity.ActivityConfig;
+import com.miya.draw.mapper.ActivityConfigMapper;
+import com.miya.draw.service.IActivityConfigService;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author ：djf
+ * @date ：2022-10-25
+ * @description：
+ */
+@Service
+public class ActivityConfigServiceImpl extends ServiceImpl<ActivityConfigMapper, ActivityConfig> implements IActivityConfigService {
+
+    @Override
+    public ActivityConfig getConfig() {
+        LambdaQueryWrapper<ActivityConfig> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(ActivityConfig::getValidStatus,1);
+        wrapper.last("order by create_time desc ");
+        List<ActivityConfig> list = baseMapper.selectList(wrapper);
+        if(!CollectionUtils.isEmpty(list)){
+            return list.get(0);
+        }
+        return null;
+    }
+
+
+}

src/main/java/com/miya/draw/service/impl/ActivityGoodsServiceImpl.java

@@ -2,7 +2,6 @@ package com.miya.draw.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.miya.draw.config.business.BusinessConfigImpl;
 import com.miya.draw.config.constant.ConStants;
 import com.miya.draw.entity.ActivityGoods;
 import com.miya.draw.enums.YesOrNoEnum;
@@ -39,11 +38,11 @@ public class ActivityGoodsServiceImpl extends ServiceImpl<ActivityGoodsMapper, A
     @Autowired
     private RedisTemplate<String, Object> redisTemplate;
 
-    @Resource
-    private BusinessConfigImpl businessConfigImpl;
+
+
 
     @Override
-    public List<String> listAllActivityGoods() {
+    public List<String> listAllActivityGoods(Long activityId) {
         List<String> goodList = new ArrayList<>();
         try {
             Object object = redisTemplate.opsForValue().get(buildKey());
@@ -55,7 +54,7 @@ public class ActivityGoodsServiceImpl extends ServiceImpl<ActivityGoodsMapper, A
         }
         LambdaQueryWrapper<ActivityGoods> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(ActivityGoods::getValidState, YesOrNoEnum.YES.getCode());
-        wrapper.eq(ActivityGoods::getActivityId, businessConfigImpl.getActivityId());
+        wrapper.eq(ActivityGoods::getActivityId, activityId);
         List<ActivityGoods> activityGoodsList = activityGoodsMapper.selectList(wrapper);
         if (CollectionUtils.isNotEmpty(activityGoodsList)) {
             goodList = activityGoodsList.stream().map(ActivityGoods::getCode).collect(Collectors.toList());

src/main/resources/bussiness-config.yml

@@ -7,3 +7,4 @@ draw:
   amountunit: 0 #满量抽奖时每多少件加1次次数
   maxmoney: 200 #满额抽奖时理论上最多花费金额 元
   maxamount: 0 #满量抽奖时理论上最多买多少件
+  validTime: 1 #抽奖次数有效时间  1：当天有效  2：两天内有效以此类推