wangming 3 주 전
부모
커밋
34dc24cd80

+ 2 - 2
yami-shop-api/src/main/java/com/yami/shop/api/controller/PayNoticeController.java

@@ -85,8 +85,8 @@ public class PayNoticeController {
     @RequestMapping("/order/refundNotify")
     public ResponseEntity<String> refundNotify(HttpServletRequest request, HttpServletResponse response) {
         System.out.println("进入退款回调...");
-        PayInfoBo payInfoBo = wxProviderService.notifyParse(request,response);
-        return ResponseEntity.ok(payInfoBo.getSuccessString());
+         wxProviderService.refundNotifyParse(request,response);
+        return ResponseEntity.ok().build();
     }
 
 

+ 2 - 5
yami-shop-wx/src/main/java/com/yami/shop/wx/service/impl/WxProviderServiceImpl.java

@@ -11,11 +11,11 @@ import com.wechat.pay.contrib.apache.httpclient.auth.WechatPay2Validator;
 import com.wechat.pay.contrib.apache.httpclient.cert.CertificatesManager;
 import com.wechat.pay.contrib.apache.httpclient.util.PemUtil;
 import com.yami.shop.bean.bo.PayInfoBo;
-import com.yami.shop.common.exception.GlobalException;
 import com.yami.shop.wx.config.CombinePayUrlEnum;
 import com.yami.shop.wx.config.WechatPayServiceConfig;
 import com.yami.shop.wx.po.JsapiPayInfoPo;
 import com.yami.shop.wx.service.WxProviderService;
+import com.yami.shop.wx.utils.CullenUtils;
 import com.yami.shop.wx.utils.OrderUtils;
 import com.yami.shop.wx.utils.WechatPayValidator;
 import lombok.SneakyThrows;
@@ -416,10 +416,7 @@ public class WxProviderServiceImpl implements WxProviderService {
         log.info("微信回调参数:{}", body);
         JSONObject jsonObject = JSONObject.parseObject(body);
         WechatPayValidator wechatPayValidator = new WechatPayValidator(getVerifier(), jsonObject.getString("id"), body);
-        if (!wechatPayValidator.validate(request)) {
-            log.error("通知验签失败");
-            throw new GlobalException("回调通知验签失败...");
-        }
+        CullenUtils.validateDataThrowException(!wechatPayValidator.validate(request),"回调通知验签失败...");
         log.info("通知验签成功");
         return jsonObject;
     }