From fd2e943ba5cbb2310b341d21f43e7c69eabbae2a Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 3 Aug 2023 00:35:07 +0800 Subject: [PATCH] //..coupon_bug --- .../callback/TtGoodsController.java | 32 +++++++++++++------ .../controller/callback/TtWebController.java | 27 ++++++++++------ .../mapper/TtCouponChannelPoiMapper.java | 2 +- .../impl/TtCouponGoodsServiceImpl.java | 2 +- .../mapper/TtCouponChannelPoiMapper.xml | 3 +- 5 files changed, 44 insertions(+), 22 deletions(-) diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/TtGoodsController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/TtGoodsController.java index e9a416988..6b5c56bc6 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/TtGoodsController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/TtGoodsController.java @@ -6,9 +6,12 @@ import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.TtCouponChannelPoi; import com.iformall.domain.po.WxAppinfo; +import com.iformall.domain.po.WxCoupon; +import com.iformall.enums.EnumCouponVersion; import com.iformall.service.MailService; import com.iformall.service.TtCouponGoodsService; import com.iformall.service.WxAppinfoService; +import com.iformall.service.WxCouponService; import com.iformall.utils.DateUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -42,6 +45,9 @@ public class TtGoodsController extends BaseController { @Autowired private TtCouponGoodsService ttCouponGoodsService; + @Autowired + private WxCouponService wxCouponService; + @Autowired @Qualifier("openRedisTemplate") RedisTemplate openRedisTemplate; @@ -70,7 +76,7 @@ public class TtGoodsController extends BaseController { Map resultMap = new HashMap<>(); if(!product_audit_notify.equals(identifyName)){ resultMap.put("err_code",1000); - resultMap.put("err_tips","error"); + resultMap.put("err_tips","error1"); return resultMap; } try{ @@ -78,20 +84,26 @@ public class TtGoodsController extends BaseController { String status = (String) parameterMap.get("status"); TtCouponChannelPoi couponChannelPoi = ttCouponGoodsService.getCouponChannelBySpuId(product_id.toString()); - ResultData resultData = ttCouponGoodsService.productDraftGet(couponChannelPoi, couponChannelPoi.getId(), false); - - if(resultData.code == 200){ - resultMap.put("err_code",0); - resultMap.put("err_tips","success"); - }else{ - resultMap.put("err_code",resultData.code); - resultMap.put("err_tips",resultData.message); + if(couponChannelPoi != null){ + WxCoupon coupon = wxCouponService.getById(couponChannelPoi.getId(), couponChannelPoi.getTenantId()); + ResultData resultData = ttCouponGoodsService.productDraftGet(coupon, coupon.getCouponId(), true); + if(resultData.code == 200){ + resultMap.put("err_code",0); + resultMap.put("err_tips","success"); + }else{ + resultMap.put("err_code",resultData.code); + resultMap.put("err_tips",resultData.message); + } + return resultMap; } + + resultMap.put("err_code",1000); + resultMap.put("err_tips","error2"); return resultMap; }catch(Exception e){ resultMap.put("err_code",1000); - resultMap.put("err_tips","error"); + resultMap.put("err_tips","error3"); return resultMap; } diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/TtWebController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/TtWebController.java index b9443a52a..05d6cbcec 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/TtWebController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/TtWebController.java @@ -6,6 +6,7 @@ import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.TtCouponChannelPoi; import com.iformall.domain.po.WxAppinfo; +import com.iformall.domain.po.WxCoupon; import com.iformall.enums.EnumSpuSyncStatus; import com.iformall.service.*; import com.iformall.utils.DateUtils; @@ -47,6 +48,9 @@ public class TtWebController extends BaseController { @Qualifier("openRedisTemplate") RedisTemplate openRedisTemplate; + @Autowired + private WxCouponService wxCouponService; + /** * { * "event": "verify_webhook", @@ -130,16 +134,21 @@ public class TtWebController extends BaseController { // } // ttCouponGoodsService.handlerTtGoodsAudit(couponChannelPoi); - ResultData resultData = ttCouponGoodsService.productDraftGet(couponChannelPoi, couponChannelPoi.getId(), false); - - if(resultData.code == 200){ - resultMap.put("err_code",0); - resultMap.put("err_tips","success"); - openRedisTemplate.opsForValue().set(key,"1",16*60, TimeUnit.SECONDS); - }else{ - resultMap.put("err_code",resultData.code); - resultMap.put("err_tips",resultData.message); + if(couponChannelPoi != null){ + WxCoupon coupon = wxCouponService.getById(couponChannelPoi.getId(), couponChannelPoi.getTenantId()); + ResultData resultData = ttCouponGoodsService.productDraftGet(coupon, coupon.getCouponId(), false); + if(resultData.code == 200){ + resultMap.put("err_code",0); + resultMap.put("err_tips","success"); + }else{ + resultMap.put("err_code",resultData.code); + resultMap.put("err_tips",resultData.message); + } + return resultMap; } + + resultMap.put("err_code",1000); + resultMap.put("err_tips","error2"); return resultMap; } diff --git a/mallinkService/src/main/java/com/iformall/mapper/TtCouponChannelPoiMapper.java b/mallinkService/src/main/java/com/iformall/mapper/TtCouponChannelPoiMapper.java index 1d803d12e..34f1efb87 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/TtCouponChannelPoiMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/TtCouponChannelPoiMapper.java @@ -18,6 +18,6 @@ public interface TtCouponChannelPoiMapper extends CommonMapper - select from tt_coupon_channel_poi where `spu_id` = #{spuId} + and `status` = 0