Просмотр исходного кода

[卡券][修改]:bug修复,新增显示channels

release_toaliyun_real
masterspirit 7 лет назад
Родитель
Сommit
6d568ce5b6
2 измененных файлов: 21 добавлений и 4 удалений
  1. +9
    -2
      mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java
  2. +12
    -2
      mallinkService/src/main/java/com/simple/service/impl/WxCouponChannelServiceImpl.java

+ 9
- 2
mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java Просмотреть файл

@@ -63,6 +63,11 @@ public class WxCouponController extends BaseController
page = wxCouponService.listAsPage(wxCoupon, pageNum, pageSize); page = wxCouponService.listAsPage(wxCoupon, pageNum, pageSize);
} }
List<WxCoupon> wxCouponList = page.getList(); List<WxCoupon> wxCouponList = page.getList();

if(wxCouponList.isEmpty()){
return new ResultData(page);
}

List<Long> ids = wxCouponList.stream().map(p->p.getId()).collect(Collectors.toList()); List<Long> ids = wxCouponList.stream().map(p->p.getId()).collect(Collectors.toList());
WxCouponChannel wxCouponChannel = new WxCouponChannel(); WxCouponChannel wxCouponChannel = new WxCouponChannel();
wxCouponChannel.setTenantId(getTenantId()); wxCouponChannel.setTenantId(getTenantId());
@@ -77,7 +82,9 @@ public class WxCouponController extends BaseController
if(groupBy.get(temp.getId())!=null){ if(groupBy.get(temp.getId())!=null){
List<Integer> channels=new ArrayList<>(); List<Integer> channels=new ArrayList<>();
for (WxCouponChannel tempchannel:groupBy.get(temp.getId())) { for (WxCouponChannel tempchannel:groupBy.get(temp.getId())) {
channels.add(tempchannel.getTargetAd());
if(!channels.contains(tempchannel.getTargetAd())) {
channels.add(tempchannel.getTargetAd());
}
} }
String sss = JSON.toJSONString(channels); String sss = JSON.toJSONString(channels);
temp.setChannels(sss); temp.setChannels(sss);
@@ -171,7 +178,7 @@ public class WxCouponController extends BaseController
public ResultData sendList(@ModelAttribute WxCoupon wxCoupon,Integer pageNum, Integer pageSize) { public ResultData sendList(@ModelAttribute WxCoupon wxCoupon,Integer pageNum, Integer pageSize) {
if (null == wxCoupon) wxCoupon = new WxCoupon(); if (null == wxCoupon) wxCoupon = new WxCoupon();
wxCoupon.setTenantId(getTenantId()); wxCoupon.setTenantId(getTenantId());
wxCoupon.setStatus(1);
wxCoupon.setStatus(0);
PageInfo<WxCoupon> page = null; PageInfo<WxCoupon> page = null;
page = wxCouponService.findCanSendList(wxCoupon, pageNum, pageSize); page = wxCouponService.findCanSendList(wxCoupon, pageNum, pageSize);




+ 12
- 2
mallinkService/src/main/java/com/simple/service/impl/WxCouponChannelServiceImpl.java Просмотреть файл

@@ -62,9 +62,7 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService {
} }


@Override @Override
@Transactional
public void addBatch(String[] ids,String[] channelId,String tanantId,Date beginTime,Date endTime) { public void addBatch(String[] ids,String[] channelId,String tanantId,Date beginTime,Date endTime) {

for (String targetIdstr:channelId) { for (String targetIdstr:channelId) {
Integer targetId = Integer.parseInt(targetIdstr); Integer targetId = Integer.parseInt(targetIdstr);
for (String couponidstr:ids) { for (String couponidstr:ids) {
@@ -78,6 +76,18 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService {


@Transactional @Transactional
public void addCuponChannel(Long couponid,Integer channelId,String tanantId,Date beginTime,Date endTime){ public void addCuponChannel(Long couponid,Integer channelId,String tanantId,Date beginTime,Date endTime){

WxCouponChannel wxCouponChannelQuery = new WxCouponChannel();
wxCouponChannelQuery.setTenantId(tanantId);
wxCouponChannelQuery.setCouponId(couponid);
wxCouponChannelQuery.setTargetAd(channelId);
wxCouponChannelQuery.setStatus(0);
List<WxCouponChannel> wxCouponChannels = wxCouponChannelMapper.findList(wxCouponChannelQuery);
if(wxCouponChannels.size()>0){
logger.debug(couponid+"已经投放过了");
return;
}

WxCoupon wxCoupon = wxCouponService.getById(couponid); WxCoupon wxCoupon = wxCouponService.getById(couponid);
if(wxCoupon.getStatus()!=0) { if(wxCoupon.getStatus()!=0) {
logger.debug(wxCoupon.getId()+"状态不对"); logger.debug(wxCoupon.getId()+"状态不对");


Загрузка…
Отмена
Сохранить