From 74fab5598d9b28dd12db3e2991d45e4081104753 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 02 八月 2023 13:37:25 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-api/src/main/java/com/java110/api/controller/app/payment/wechat/WechatNotifyPaymentController.java | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/controller/app/payment/wechat/WechatNotifyPaymentController.java b/service-api/src/main/java/com/java110/api/controller/app/payment/wechat/WechatNotifyPaymentController.java
index 1f8c4b2..ca6815cc 100644
--- a/service-api/src/main/java/com/java110/api/controller/app/payment/wechat/WechatNotifyPaymentController.java
+++ b/service-api/src/main/java/com/java110/api/controller/app/payment/wechat/WechatNotifyPaymentController.java
@@ -1,6 +1,7 @@
package com.java110.api.controller.app.payment.wechat;
import com.java110.core.log.LoggerFactory;
+import com.java110.dto.payment.NotifyPaymentOrderDto;
import com.java110.intf.acct.INotifyPaymentV1InnerServiceSMO;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -25,12 +26,27 @@
* @param request
* @throws Exception
*/
- @RequestMapping(path = "/wechat/{appId}", method = RequestMethod.POST)
- public ResponseEntity<String> notify(@RequestBody String postInfo, @PathVariable String appId, HttpServletRequest request) {
+ @RequestMapping(path = "/wechat/{appId}/{communityId}", method = RequestMethod.POST)
+ public ResponseEntity<String> notify(@RequestBody String postInfo, @PathVariable String appId,@PathVariable String communityId, HttpServletRequest request) {
logger.debug("寰俊鏀粯鍥炶皟鎶ユ枃" + postInfo);
- return notifyPaymentV1InnerServiceSMOImpl.notifyPayment(postInfo);
+ return notifyPaymentV1InnerServiceSMOImpl.notifyPayment(new NotifyPaymentOrderDto(appId,postInfo,communityId));
+
+ }
+
+ /**
+ * <p>鏀粯鍥炶皟Api</p>
+ *
+ * @param request
+ * @throws Exception
+ */
+ @RequestMapping(path = "/nativeWechat/{appId}/{communityId}", method = RequestMethod.POST)
+ public ResponseEntity<String> nativeNotify(@RequestBody String postInfo, @PathVariable String appId,@PathVariable String communityId, HttpServletRequest request) {
+
+ logger.debug("寰俊鏀粯鍥炶皟鎶ユ枃" + postInfo);
+
+ return notifyPaymentV1InnerServiceSMOImpl.nativeNotifyPayment(new NotifyPaymentOrderDto(appId,postInfo,communityId));
}
}
--
Gitblit v1.8.0