Commit dabe3aab authored by 邓吉芬's avatar 邓吉芬

1. 修改活动门店可配置化

2. 单个用户限中奖品
parent c56596c7
...@@ -3,6 +3,7 @@ package com.miya.draw.manager; ...@@ -3,6 +3,7 @@ package com.miya.draw.manager;
import cn.hutool.core.bean.copier.BeanCopier; import cn.hutool.core.bean.copier.BeanCopier;
import cn.hutool.core.bean.copier.CopyOptions; import cn.hutool.core.bean.copier.CopyOptions;
import cn.hutool.core.date.LocalDateTimeUtil; import cn.hutool.core.date.LocalDateTimeUtil;
import com.google.common.collect.Lists;
import com.miya.draw.config.constant.ConStants; import com.miya.draw.config.constant.ConStants;
import com.miya.draw.config.exception.BusinessException; import com.miya.draw.config.exception.BusinessException;
import com.miya.draw.entity.*; import com.miya.draw.entity.*;
...@@ -191,9 +192,14 @@ public class DrawManagerImpl implements IDrawManager { ...@@ -191,9 +192,14 @@ public class DrawManagerImpl implements IDrawManager {
List<SyncTrade> buyGoodList; List<SyncTrade> buyGoodList;
if(activityConfig.getActivityStoreStatus() == ActivityStoreStatusEnum.NO_CONFINE.getCode() ){ if(activityConfig.getActivityStoreStatus() == ActivityStoreStatusEnum.NO_CONFINE.getCode() ){
buyGoodList = syncTradeService.listCanDrawGoods(phone, start, end, null, activityGoodsService.listAllActivityGoods(activityConfig.getActivityId())); buyGoodList = syncTradeService.listCanDrawGoods(phone, start, end, null, activityGoodsService.listAllActivityGoods(activityConfig.getActivityId()));
}else{ }else{
buyGoodList = syncTradeService.listCanDrawGoods(phone, start, end, activityStoreService.listAllActivityStoreId(activityConfig.getActivityId()), activityGoodsService.listAllActivityGoods(activityConfig.getActivityId())); //限制门店的情况
List<String> storeCodeList =activityStoreService.listAllActivityStoreId(activityConfig.getActivityId());
if (CollectionUtils.isEmpty(storeCodeList)) {
buyGoodList = Lists.newArrayList();
}else{
buyGoodList = syncTradeService.listCanDrawGoods(phone, start, end, storeCodeList, activityGoodsService.listAllActivityGoods(activityConfig.getActivityId()));
}
} }
int drawCountTotal =0; int drawCountTotal =0;
//判断抽奖方式 //判断抽奖方式
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment