From d8edac44839b23de08ad758ab2d67341c3da3ab6 Mon Sep 17 00:00:00 2001 From: kino <378907426@qq.com> Date: Tue, 19 Jan 2021 13:52:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../winery/controller/AppOrderController.java | 10 +++++++ .../src/main/resources/application.yml | 2 +- ruoyi-ui/src/views/winery/merchant/index.vue | 30 +++++++++---------- 3 files changed, 26 insertions(+), 16 deletions(-) diff --git a/hope-winery/src/main/java/com/ruoyi/winery/controller/AppOrderController.java b/hope-winery/src/main/java/com/ruoyi/winery/controller/AppOrderController.java index 91182775b..4f75dd5c4 100644 --- a/hope-winery/src/main/java/com/ruoyi/winery/controller/AppOrderController.java +++ b/hope-winery/src/main/java/com/ruoyi/winery/controller/AppOrderController.java @@ -4,6 +4,8 @@ import cn.hutool.core.util.RandomUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.github.binarywang.wxpay.bean.notify.WxPayNotifyResponse; +import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult; import com.github.binarywang.wxpay.bean.order.WxPayMpOrderResult; import com.github.binarywang.wxpay.bean.request.WxPayRefundRequest; import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest; @@ -218,4 +220,12 @@ public class AppOrderController extends BaseController { public AjaxResult remove(@PathVariable String[] ids) { return toAjax(iAppOrderService.removeByIds(Arrays.asList(ids)) ? 1 : 0); } + + @Log(title = "回调", businessType = BusinessType.OTHER) + @PostMapping("/payNotify") + String payNotify(@RequestBody String xmlData) throws WxPayException { + WxPayOrderNotifyResult notifyResult = wxPayService.parseOrderNotifyResult(xmlData); + // TODO 根据自己业务场景需要构造返回对象 + return WxPayNotifyResponse.success("成功"); + } } diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index da92c851e..570a58ff1 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -197,7 +197,7 @@ wxmini: appId: wx76ec015fc31a1946 #微信公众号或者小程序等的appid 必填 mchId: 1486984962 mchKey: 82aZ9Tb6eu5W2HdXKQWZU2SztU8w8nJ8 - notifyUrl: http://41.mxl530.top:8087/zhongyihis/wxnotify + notifyUrl: http://41.liyiren.me:8696/winery/order/payNotify subAppId: #服务商模式下的子商户公众账号ID subMchId: #服务商模式下的子商户号 tradeType: JSAPI #交易类型 diff --git a/ruoyi-ui/src/views/winery/merchant/index.vue b/ruoyi-ui/src/views/winery/merchant/index.vue index add20c1fa..74e8979a7 100644 --- a/ruoyi-ui/src/views/winery/merchant/index.vue +++ b/ruoyi-ui/src/views/winery/merchant/index.vue @@ -1,9 +1,9 @@