Ver código fonte

fix bug

release_toaliyun_real
zhengfangyuan 3 anos atrás
pai
commit
6a54306f0d
6 arquivos alterados com 8 adições e 6 exclusões
  1. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java
  2. +2
    -1
      mallinkBApi/src/main/java/com/iformall/controller/WxCouponChannelController.java
  3. +1
    -0
      mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java
  4. +1
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java
  5. +2
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxScreenAdServiceImpl.java
  6. +0
    -3
      mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml

+ 2
- 1
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java Ver arquivo

@@ -11,6 +11,7 @@ import com.iformall.controller.base.BaseController;
import com.iformall.domain.dto.WxCouponChannelDto;
import com.iformall.domain.po.*;
import com.iformall.domain.vo.WxCouponChannelVo;
import com.iformall.enums.EnumCouponChannelStatus;
import com.iformall.enums.EnumCouponSourceType;
import com.iformall.domain.po.base.BaseEntity;
import com.iformall.enums.EnumCouponStatus;
@@ -161,7 +162,7 @@ public class WxCouponChannelController extends BaseController {
List<Integer> channellist = new ArrayList<>();
WxCouponChannel wxCouponChannel = new WxCouponChannel();
wxCouponChannel.updateTenantInfo(getTenantInfo());
wxCouponChannel.setStatus(0);
wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode());
wxCouponChannel.setCouponId(id);
List<WxCouponChannel> list = wxCouponChannelService.listAsPage(wxCouponChannel, 1, 5).getList();
if (list.isEmpty()) {


+ 2
- 1
mallinkBApi/src/main/java/com/iformall/controller/WxCouponChannelController.java Ver arquivo

@@ -10,6 +10,7 @@ import com.iformall.domain.po.WxCoupon;
import com.iformall.domain.po.WxCouponChannel;
import com.iformall.domain.po.base.BaseEntity;
import com.iformall.domain.vo.WxCouponChannelVo;
import com.iformall.enums.EnumCouponChannelStatus;
import com.iformall.enums.EnumCouponStatus;
import com.iformall.service.WxCouponChannelService;
import com.iformall.service.WxCouponService;
@@ -122,7 +123,7 @@ public class WxCouponChannelController extends BaseController {
List<Integer> channellist = new ArrayList<>();
WxCouponChannel wxCouponChannel = new WxCouponChannel();
wxCouponChannel.updateTenantInfo(getTenantInfo());
wxCouponChannel.setStatus(0);
wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode());
wxCouponChannel.setCouponId(id);
List<WxCouponChannel> list = wxCouponChannelService.listAsPage(wxCouponChannel, 1, 5).getList();
if (list.isEmpty()) {


+ 1
- 0
mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java Ver arquivo

@@ -282,6 +282,7 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService {
wxCouponChannelQuery.updateTenantInfo(coupon);
wxCouponChannelQuery.setCouponId(coupon.getId());
wxCouponChannelQuery.setTargetAd(EnumCouponChannelType.COUPON_CHANNEL_ID_DOUYIN.getCode());
wxCouponChannelQuery.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode());
List<WxCouponChannel> wxCouponChannels = wxCouponChannelMapper.findList(wxCouponChannelQuery);
WxCouponChannel wxCouponChannel = null;
Date now = new Date();


+ 1
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java Ver arquivo

@@ -2486,6 +2486,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
Long couponId = cardCVo.getCouponId();
WxCouponChannel wxCouponChannel = new WxCouponChannel();
wxCouponChannel.setCouponId(couponId);
wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode());
List<WxCouponChannel> list = wxCouponChannelMapper.findList(wxCouponChannel);
if (!list.isEmpty()) {
cardCVo.setCouponChannelId(list.get(0).getId());


+ 2
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxScreenAdServiceImpl.java Ver arquivo

@@ -11,6 +11,7 @@ import com.iformall.common.ResultData;
import com.iformall.domain.po.*;
import com.iformall.domain.po.base.TenantEntity;
import com.iformall.domain.vo.WxCouponCVo;
import com.iformall.enums.EnumCouponChannelStatus;
import com.iformall.enums.EnumCouponChannelType;
import com.iformall.enums.EnumScreenAdType;
import com.iformall.mapper.WxCampaignMapper;
@@ -144,7 +145,7 @@ public class WxScreenAdServiceImpl implements WxScreenAdService {
WxCouponChannel wxCouponChannel = new WxCouponChannel();
wxCouponChannel.updateTenantInfo(tenantEntity);
wxCouponChannel.setCouponId(couponId);
wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode());
List<WxCouponChannel> list = wxCouponChannelService.findList(wxCouponChannel);

list.stream().forEach(cc->{


+ 0
- 3
mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml Ver arquivo

@@ -39,9 +39,6 @@
<if test="null != status ">
and cc.status = #{status}
</if>
<if test="null == status ">
and cc.status = 0
</if>

<if test=" null != id ">
and cc.`id` = #{id}


Carregando…
Cancelar
Salvar