diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java index f9d3010b5..19707d183 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java @@ -96,6 +96,8 @@ public class WxCouponChannelController extends BaseController { //生成二维码 if(couponChannel!=null){ wxCouponChannelService.updateQrCode(couponChannel,couponChannel.getId(),couponChannel.getType()); + + wxCouponChannelService.spuStatusSyncByCoupon(couponChannel,couponChannel.getCouponId()); } CouponCacheUtils.removeCouponChannelCache(redisTemplate, wxCouponChannel.getId()); CouponCacheUtils.removeDouyinLivePageCache(redisTemplate, wxCouponChannel.getTenantId(), null, null); diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponChannelController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponChannelController.java index 023e2caa4..33c021485 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponChannelController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponChannelController.java @@ -83,6 +83,8 @@ public class WxCouponChannelController extends BaseController { //生成二维码 if(couponChannel!=null){ wxCouponChannelService.updateQrCode(couponChannel,couponChannel.getId(),couponChannel.getType()); + + wxCouponChannelService.spuStatusSyncByCoupon(couponChannel,couponChannel.getCouponId()); } CouponCacheUtils.removeCouponChannelCache(redisTemplate, wxCouponChannel.getId()); return resultData; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java index a019ee4ee..fe4fd630f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java @@ -228,7 +228,10 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { updCC.setUpdateDate(new Date()); wxCouponChannelMapper.updateStatusByTargetAd(updCC); - spuStatusSyncByCoupon(wxCoupon,wxCoupon.getId()); + /** + * 事务原因可能导致状态不一致, 放到事务完成之后 + */ +// spuStatusSyncByCoupon(wxCoupon,wxCoupon.getId()); } /** @@ -255,7 +258,11 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { updCC.setUpdateDate(new Date()); wxCouponChannelMapper.updateStatusByTargetAd(updCC); - spuStatusSyncByCoupon(wxCoupon,wxCoupon.getId()); + /** + * + * 事务原因可能导致状态不一致, 放到事务完成之后 + */ +// spuStatusSyncByCoupon(wxCoupon,wxCoupon.getId()); } } @@ -709,12 +716,15 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { wxCouponChannel.setChannelStock(channelStock); ResultData resultData = saveOrUpdate(wxCouponChannel); WxCouponChannel channel = (WxCouponChannel)resultData.data; - vo.setId(channel.getId()); - vo.setType(channel.getType()); - vo.setSuc(true); + if(channel != null){ + vo.setId(channel.getId()); + vo.setType(channel.getType()); + vo.setSuc(true); - this.updateQrCode(channel,channel.getId(),channel.getType()); + this.updateQrCode(channel,channel.getId(),channel.getType()); + this.spuStatusSyncByCoupon(channel,channel.getCouponId()); + } return vo; }