From 29952e1e673e87d4ac1fc8f7c2d6088c975fa99f Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期一, 28 十一月 2022 11:00:39 +0800
Subject: [PATCH] Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComBatteryCommodityOrderFeign.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComBatteryCommodityOrderFeign.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComBatteryCommodityOrderFeign.java
index 1460a43..206bbef 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComBatteryCommodityOrderFeign.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComBatteryCommodityOrderFeign.java
@@ -122,7 +122,7 @@
* 定时关闭5分钟未支付订单
* @return 操作结果
*/
- @PostMapping("/sync/close/order")
+ @GetMapping("/sync/close/order")
R syncCloseOrder();
/**
@@ -141,4 +141,12 @@
*/
@PostMapping("/deliver")
R orderDeliver(@RequestBody OrderDeliverAdminDto deliverAdminDto);
+
+ /**
+ * 电动车商城购买活动商品支付回调
+ * @param notifyOrderDTO 请求参数
+ * @return 购买商品支付回调
+ */
+ @PostMapping("/batteryActivityPayNotify")
+ R batteryActivityPayNotify(@RequestBody WxPayNotifyOrderDTO notifyOrderDTO);
}
--
Gitblit v1.7.1