From 30db4510c06202b3ad0ad4920e561f5f5541d69f Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 20 四月 2021 19:56:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopOrderService.java | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopOrderService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopOrderService.java
index 97a9347..ca2e9de 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopOrderService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopOrderService.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.shop.*;
+import com.panzhihua.common.model.dtos.shop.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.model.dos.ComShopOrderDO;
@@ -78,6 +79,13 @@
R orderStatistics(Long userId);
/**
+ * 商家资金的订单详情
+ * @param id 订单id
+ * @return
+ */
+ R capitalDetailByStore(Long id);
+
+ /**
* 订单发货
* @param orderShipDTO 订单发货信息
* @return 发货结果
@@ -125,4 +133,17 @@
* @return 资金订单数据
*/
R pageShopFunds(PageComShopFundsSearchDTO pageComShopFundsSearchDTO);
+
+ /**
+ * 微信支付订单回调
+ * @param wxPayNotifyOrderDTO 订单支付回调参数
+ */
+ void wxOrderPayNotify(WxPayNotifyOrderDTO wxPayNotifyOrderDTO);
+
+ /**
+ * 用户点击去支付
+ * @param orderPayDTO 请求参数
+ * @return 返回支付对象
+ */
+ R wxPay(OrderPayDTO orderPayDTO);
}
--
Gitblit v1.7.1