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

//tt status

release_toaliyun_real
xhxu 3 лет назад
Родитель
Сommit
3e62d4836d
3 измененных файлов: 46 добавлений и 18 удалений
  1. +4
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java
  2. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java
  3. +39
    -18
      mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java

+ 4
- 0
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java Просмотреть файл

@@ -198,6 +198,10 @@ public class WxCouponController extends BaseController {
if (CollectionUtils.isNotEmpty(wxCouponChannelMapper.findList(query))) { if (CollectionUtils.isNotEmpty(wxCouponChannelMapper.findList(query))) {
return new ResultData(ResultData.ERROR, "有活动正在上架,请先下架。"); return new ResultData(ResultData.ERROR, "有活动正在上架,请先下架。");
} }
query.setStatus(EnumCouponChannelStatus.STATUS_BEFORE.getCode());
if (CollectionUtils.isNotEmpty(wxCouponChannelMapper.findList(query))) {
return new ResultData(ResultData.ERROR, "有活动正在预审核.");
}
} }
WxCoupon coupon = wxCouponService.getById(wxCoupon.getId(),wxCoupon.getTenantId()); WxCoupon coupon = wxCouponService.getById(wxCoupon.getId(),wxCoupon.getTenantId());


+ 3
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java Просмотреть файл

@@ -45,6 +45,9 @@ public class WxCoupon extends TenantEntity {
@TableField(exist = false) @TableField(exist = false)
protected String channels; protected String channels;


@TableField(exist = false)
protected String planChannels;

@TableField(exist = false) @TableField(exist = false)
@SortColumn(column = "sale_price") @SortColumn(column = "sale_price")
private String salePriceStr; private String salePriceStr;


+ 39
- 18
mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java Просмотреть файл

@@ -69,31 +69,52 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService {
WxCouponChannel wxCouponChannel = new WxCouponChannel(); WxCouponChannel wxCouponChannel = new WxCouponChannel();
wxCouponChannel.updateTenantInfo(ttCouponVo); wxCouponChannel.updateTenantInfo(ttCouponVo);
wxCouponChannel.setCouponIds(ids); wxCouponChannel.setCouponIds(ids);
wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode());
//上架状态 //上架状态
List<WxCouponChannel> list = wxCouponChannelMapper.findList(wxCouponChannel);
if (!list.isEmpty()) {
Map<Long, List<WxCouponChannel>> groupBy = list.stream().collect(Collectors.groupingBy(WxCouponChannel::getCouponId));
for (TtCouponVo temp : couponList) {
if (groupBy.get(temp.getId()) != null) {
List<Integer> channels = new ArrayList<>();
for (WxCouponChannel tempchannel : groupBy.get(temp.getId())) {
if (!channels.contains(tempchannel.getTargetAd())) {
channels.add(tempchannel.getTargetAd());
}
wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode());
List<WxCouponChannel> channellist = wxCouponChannelMapper.findList(wxCouponChannel);
Map<Long, List<WxCouponChannel>> channelGroupCoupon = new HashMap<>();
if(!channellist.isEmpty()){
channelGroupCoupon = channellist.stream().collect(Collectors.groupingBy(WxCouponChannel::getCouponId));
}
//预审状态
wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_BEFORE.getCode());
List<WxCouponChannel> planchannellist = wxCouponChannelMapper.findList(wxCouponChannel);
Map<Long, List<WxCouponChannel>> planChannelGroupCoupon = new HashMap<>();
if(!planchannellist.isEmpty()){
planChannelGroupCoupon = planchannellist.stream().collect(Collectors.groupingBy(WxCouponChannel::getCouponId));
}

for (TtCouponVo temp : couponList) {
List<Integer> channels = new ArrayList<>();
List<WxCouponChannel> couponChannels = channelGroupCoupon.get(temp.getId());
if(couponChannels != null && !couponChannels.isEmpty()){
for (WxCouponChannel tempchannel : couponChannels) {
if (!channels.contains(tempchannel.getTargetAd())) {
channels.add(tempchannel.getTargetAd());
} }
String sss = JSON.toJSONString(channels);
temp.setChannels(sss);
} else {
temp.setChannels("");
} }

} }
} else {
for (TtCouponVo temp : couponList) {
if(!channels.isEmpty()){
temp.setChannels(JSON.toJSONString(channels));
}else{
temp.setChannels(""); temp.setChannels("");
} }


List<Integer> planChannels = new ArrayList<>();
List<WxCouponChannel> planCouponChannels = planChannelGroupCoupon.get(temp.getId());
if(planCouponChannels != null && !planCouponChannels.isEmpty()){
for (WxCouponChannel tempchannel : planCouponChannels) {
if (!planChannels.contains(tempchannel.getTargetAd())) {
planChannels.add(tempchannel.getTargetAd());
}
}
}
if(!planChannels.isEmpty()){
temp.setPlanChannels(JSON.toJSONString(planChannels));
}else{
temp.setPlanChannels("");
}
} }
} }
return new ResultData(pageInfo); return new ResultData(pageInfo);


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