From 4c80d2017a3b88b9ad55f28c3b87fd96eb67bcb2 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 29 九月 2022 09:40:51 +0800
Subject: [PATCH] Merge branch 'sanshuohuitang_dev' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComBatteryCommodityOrderController.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComBatteryCommodityOrderController.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComBatteryCommodityOrderController.java
index b2ac7d1..3a37d00 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComBatteryCommodityOrderController.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComBatteryCommodityOrderController.java
@@ -158,7 +158,7 @@
* 定时关闭5分钟未支付订单
* @return 操作结果
*/
- @PostMapping("/sync/close/order")
+ @GetMapping("/sync/close/order")
public R syncCloseOrder(){
return this.comBatteryCommodityOrderService.syncCloseOrder();
}
@@ -173,5 +173,15 @@
return this.comBatteryCommodityOrderService.orderDeliver(deliverAdminDto);
}
+ /**
+ * 电动车商城购买活动商品支付回调
+ * @param notifyOrderDTO 请求参数
+ * @return 购买商品支付回调
+ */
+ @PostMapping("/batteryActivityPayNotify")
+ public R batteryActivityPayNotify(@RequestBody WxPayNotifyOrderDTO notifyOrderDTO){
+ return this.comBatteryCommodityOrderService.batteryActivityPayNotify(notifyOrderDTO);
+ }
+
}
--
Gitblit v1.7.1