diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/TtGoodsController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/TtGoodsController.java new file mode 100644 index 000000000..e9a416988 --- /dev/null +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/TtGoodsController.java @@ -0,0 +1,100 @@ +package com.iformall.controller.callback; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +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.service.MailService; +import com.iformall.service.TtCouponGoodsService; +import com.iformall.service.WxAppinfoService; +import com.iformall.utils.DateUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.TimeUnit; + + +@RestController +@RequestMapping("/ttgoods/notify") +public class TtGoodsController extends BaseController { + + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired + private String fmExceptionEmails; + + @Autowired + private MailService mailService; + + @Autowired + private WxAppinfoService wxAppinfoService; + + @Autowired + private TtCouponGoodsService ttCouponGoodsService; + + @Autowired + @Qualifier("openRedisTemplate") + RedisTemplate openRedisTemplate; + + /** + * { + * "event": "verify_webhook", + * "client_key": "", + * "content": { + * "challenge": 12345 + * } + * } + */ + @PostMapping(value = "/notice") + @ResponseBody + public Map notice( @RequestBody Map parameterMap,HttpServletRequest request){ + logger.debug("[" + getIpAddr() + "] TtOrderCallbackController::notice"); + logger.info("抖音开放平台通知v2-----{}"+JSON.toJSONString(parameterMap)); + + String msgSignature = request.getHeader("Byte-Signature"); + String timestamp = request.getHeader("Byte-Timestamp"); + String nonce = request.getHeader("Byte-Nonce-Str"); + + String identifyName = request.getHeader("Byte-IdentifyName"); + String product_audit_notify = "/msg/common/goods/product_audit_notify"; + Map resultMap = new HashMap<>(); + if(!product_audit_notify.equals(identifyName)){ + resultMap.put("err_code",1000); + resultMap.put("err_tips","error"); + return resultMap; + } + try{ + Long product_id = (Long) parameterMap.get("product_id"); + 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); + } + return resultMap; + + }catch(Exception e){ + resultMap.put("err_code",1000); + resultMap.put("err_tips","error"); + 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 a77fa6cb2..b9443a52a 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/TtWebController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/TtWebController.java @@ -2,6 +2,7 @@ package com.iformall.controller.callback; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.TtCouponChannelPoi; import com.iformall.domain.po.WxAppinfo; @@ -129,11 +130,16 @@ public class TtWebController extends BaseController { // } // ttCouponGoodsService.handlerTtGoodsAudit(couponChannelPoi); - ttCouponGoodsService.productDraftGet(couponChannelPoi,couponChannelPoi.getId(),false); + ResultData resultData = ttCouponGoodsService.productDraftGet(couponChannelPoi, couponChannelPoi.getId(), false); - resultMap.put("err_code",0); - resultMap.put("err_tips","success"); - openRedisTemplate.opsForValue().set(key,"1",16*60, TimeUnit.SECONDS); + 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); + } return resultMap; }