Преглед изворни кода

[A端][修改]:banner图位置选券逻辑修复

release_toaliyun_real
hupeng пре 7 година
родитељ
комит
a45c7d6622
2 измењених фајлова са 30 додато и 24 уклоњено
  1. +5
    -0
      mallinkAdmin/src/main/java/com/simple/controller/WxCampaignController.java
  2. +25
    -24
      mallinkService/src/main/java/com/simple/service/impl/WxCampaignServiceImpl.java

+ 5
- 0
mallinkAdmin/src/main/java/com/simple/controller/WxCampaignController.java Прегледај датотеку

@@ -1,6 +1,7 @@
package com.simple.controller; package com.simple.controller;


import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.simple.common.Result; import com.simple.common.Result;
import com.simple.common.ResultData; import com.simple.common.ResultData;
@@ -68,6 +69,8 @@ public class WxCampaignController extends BaseController
if(StringUtils.isNotBlank(wxCampaign.getCouponIds())) { if(StringUtils.isNotBlank(wxCampaign.getCouponIds())) {
String[] arys = wxCampaign.getCouponIds().split(","); String[] arys = wxCampaign.getCouponIds().split(",");
wxCampaign.setCouponIds(JSON.toJSONString(arys)); wxCampaign.setCouponIds(JSON.toJSONString(arys));
}else {
wxCampaign.setCouponIds(JSONArray.toJSONString(new String[0]));
} }
wxCampaign.setStatus(0); wxCampaign.setStatus(0);
wxCampaign.setTenantId(getTenantId()); wxCampaign.setTenantId(getTenantId());
@@ -82,6 +85,8 @@ public class WxCampaignController extends BaseController
if(StringUtils.isNotBlank(wxCampaign.getCouponIds())) { if(StringUtils.isNotBlank(wxCampaign.getCouponIds())) {
String[] arys = wxCampaign.getCouponIds().split(","); String[] arys = wxCampaign.getCouponIds().split(",");
wxCampaign.setCouponIds(JSON.toJSONString(arys)); wxCampaign.setCouponIds(JSON.toJSONString(arys));
}else {
wxCampaign.setCouponIds(JSONArray.toJSONString(new String[0]));
} }
wxCampaignService.saveOrUpdate(wxCampaign); wxCampaignService.saveOrUpdate(wxCampaign);
return new ResultData(); return new ResultData();


+ 25
- 24
mallinkService/src/main/java/com/simple/service/impl/WxCampaignServiceImpl.java Прегледај датотеку

@@ -120,32 +120,33 @@ public class WxCampaignServiceImpl implements WxCampaignService {


if(wxCouponChannels.size()>0) { if(wxCouponChannels.size()>0) {
for (int i = 0; i < wxCouponChannels.size(); i++) { for (int i = 0; i < wxCouponChannels.size(); i++) {

wxCouponChannels.get(i).setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode());
wxCouponChannels.get(i).setBeginTime(record.getValidStartDate());
wxCouponChannels.get(i).setEndTime(record.getValidEndDate());
wxCouponChannelMapper.updateByPrimaryKeySelective(wxCouponChannels.get(i));
wxCouponChannels.remove(i);
if (wxCouponChannels.get(i).getId() == couponId) {
wxCouponChannels.get(i).setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode());
wxCouponChannels.get(i).setBeginTime(record.getValidStartDate());
wxCouponChannels.get(i).setEndTime(record.getValidEndDate());
wxCouponChannelMapper.updateByPrimaryKeySelective(wxCouponChannels.get(i));
wxCouponChannels.remove(i);
return;
}
} }
} }
else {

WxCouponChannel wxCouponChannel = new WxCouponChannel();
wxCouponChannel.setBeginTime(record.getValidStartDate());
wxCouponChannel.setEndTime(record.getValidEndDate());
wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode());
wxCouponChannel.setCouponId(couponId);
wxCouponChannel.setMerchantId(wxCoupon.getMerchantId());
wxCouponChannel.setType(wxCoupon.getType());
wxCouponChannel.setTargetAd(EnumCouponChannelType.COUPON_CHANNEL_ID_CAMPAIN.getCode());
wxCouponChannel.setTenantId(wxCoupon.getTenantId());
wxCouponChannel.setBusiness(wxCoupon.getBusiness());
wxCouponChannel.setTitle(wxCoupon.getTitle());
wxCouponChannel.setSubTargetId(record.getId());
final IdWorker idWorker = IdWorker.get();
wxCouponChannel.setId(idWorker.nextId());
wxCouponChannelMapper.insertSelective(wxCouponChannel);
}

WxCouponChannel wxCouponChannel = new WxCouponChannel();
wxCouponChannel.setBeginTime(record.getValidStartDate());
wxCouponChannel.setEndTime(record.getValidEndDate());
wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode());
wxCouponChannel.setCouponId(couponId);
wxCouponChannel.setMerchantId(wxCoupon.getMerchantId());
wxCouponChannel.setType(wxCoupon.getType());
wxCouponChannel.setTargetAd(EnumCouponChannelType.COUPON_CHANNEL_ID_CAMPAIN.getCode());
wxCouponChannel.setTenantId(wxCoupon.getTenantId());
wxCouponChannel.setBusiness(wxCoupon.getBusiness());
wxCouponChannel.setTitle(wxCoupon.getTitle());
wxCouponChannel.setSubTargetId(record.getId());
final IdWorker idWorker = IdWorker.get();
wxCouponChannel.setId(idWorker.nextId());
wxCouponChannelMapper.insertSelective(wxCouponChannel);

} }


@Override @Override


Loading…
Откажи
Сачувај