Browse Source

Merge branch 'release_toaliyun_real_202211' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_202211

release_toaliyun_real
zhengfangyuan 3 years ago
parent
commit
16d9da9c95
2 changed files with 6 additions and 2 deletions
  1. +6
    -1
      mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java
  2. +0
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java

+ 6
- 1
mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java View File

@@ -385,7 +385,7 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService {
WxCouponChannel wxCouponChannelQuery = new WxCouponChannel();
wxCouponChannelQuery.updateTenantInfo(wxCoupon);
wxCouponChannelQuery.setCouponId(wxCoupon.getId());
// wxCouponChannelQuery.setTargetAd(EnumCouponChannelType.COUPON_CHANNEL_ID_DOUYIN_LIST.getCode());
wxCouponChannelQuery.setTargetAd(EnumCouponChannelType.COUPON_CHANNEL_ID_DOUYIN.getCode());
wxCouponChannelQuery.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode());
List<WxCouponChannel> wxCouponChannels = wxCouponChannelMapper.findList(wxCouponChannelQuery);
if(wxCouponChannels.size() > 0){
@@ -393,6 +393,11 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService {
}
}

if(op_type.equals(ttCouponChannelPoi.getLastStatus())){
logger.info("与线上状态一致, 无需同步{}"+wxCoupon.getId());
return new ResultData();
}

try {
TtWebService ttWebService = ttMerchantPoiService.getTtWebService(ttCouponChannelPoi);
boolean b = ttWebService.getGoodsService().productOperate(null,wxCoupon.getId().toString(),op_type);


+ 0
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java View File

@@ -660,7 +660,6 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService {

// 投放渠道
if(channelId.equals(EnumCouponChannelType.COUPON_CHANNEL_ID_LIST.getCode()) || // 列表

channelId.equals(EnumCouponChannelType.COUPON_CHANNEL_ID_CARD.getCode()) || // 卡频道
channelId.equals(EnumCouponChannelType.COUPON_CHANNEL_ID_PRESS.getCode()) || // 砍价
channelId.equals(EnumCouponChannelType.COUPON_CHANNEL_ID_ORDER_GROUP.getCode()) || // 拼团


Loading…
Cancel
Save