From 34fcf32a24d06befd53c6e05ae9c41a4de24e71b Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期四, 15 七月 2021 10:00:00 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopOrderService.java | 34 +++++++++++++++++++++++++++-------
1 files changed, 27 insertions(+), 7 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..9aceeae 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;
@@ -49,11 +50,10 @@
/**
* 根据订单id取消订单
- * @param orderId 订单id
- * @param phone 操作用户手机号
+ * @param comShopOrderQueryDTO 订单信息
* @return 取消结果
*/
- R orderCancel(Long orderId,String phone);
+ R orderCancel(ComShopOrderQueryDTO comShopOrderQueryDTO);
/**
* 根据订单id删除订单
@@ -78,6 +78,13 @@
R orderStatistics(Long userId);
/**
+ * 商家资金的订单详情
+ * @param id 订单id
+ * @return
+ */
+ R capitalDetailByStore(Long id);
+
+ /**
* 订单发货
* @param orderShipDTO 订单发货信息
* @return 发货结果
@@ -86,17 +93,17 @@
/**
* 订单配送
- * @param orderId 订单id
+ * @param orderDeliverDTO 订单信息
* @return 配送结果
*/
- R deliverOrder(Long orderId);
+ R deliverOrder(ComShopOrderDeliverDTO orderDeliverDTO);
/**
* 订单完成配送
- * @param orderId 订单id
+ * @param orderDeliverDTO 订单信息
* @return 完成配送结果
*/
- R finishDeliverOrder(Long orderId);
+ R finishDeliverOrder(ComShopOrderDeliverDTO orderDeliverDTO);
/**
* 获取订单导出数据
@@ -125,4 +132,17 @@
* @return 资金订单数据
*/
R pageShopFunds(PageComShopFundsSearchDTO pageComShopFundsSearchDTO);
+
+ /**
+ * 微信支付订单回调
+ * @param wxPayNotifyOrderDTO 订单支付回调参数
+ */
+ void wxOrderPayNotify(WxPayNotifyOrderDTO wxPayNotifyOrderDTO);
+
+ /**
+ * 用户点击去支付
+ * @param orderPayDTO 请求参数
+ * @return 返回支付对象
+ */
+ R wxPay(OrderPayDTO orderPayDTO);
}
--
Gitblit v1.7.1