From 2e64c232ab6b51b2cecf1ee96e1e9b709234f326 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期六, 21 八月 2021 16:35:14 +0800
Subject: [PATCH] 随手拍改版接口开发
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopOrderService.java | 79 ++++++++++++++++++++++++++++++++++++---
1 files changed, 72 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 3bb04c6..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
@@ -1,11 +1,9 @@
package com.panzhihua.service_community.service;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.panzhihua.common.model.dtos.shop.PageComShopOrderSearchDTO;
+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.dtos.shop.ComShopOrderCreateDTO;
-import com.panzhihua.common.model.dtos.shop.ComShopOrderPreviewDTO;
-import com.panzhihua.common.model.dtos.shop.PageComOrderListDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.model.dos.ComShopOrderDO;
@@ -52,11 +50,10 @@
/**
* 根据订单id取消订单
- * @param orderId 订单id
- * @param phone 操作用户手机号
+ * @param comShopOrderQueryDTO 订单信息
* @return 取消结果
*/
- R orderCancel(Long orderId,String phone);
+ R orderCancel(ComShopOrderQueryDTO comShopOrderQueryDTO);
/**
* 根据订单id删除订单
@@ -80,4 +77,72 @@
*/
R orderStatistics(Long userId);
+ /**
+ * 商家资金的订单详情
+ * @param id 订单id
+ * @return
+ */
+ R capitalDetailByStore(Long id);
+
+ /**
+ * 订单发货
+ * @param orderShipDTO 订单发货信息
+ * @return 发货结果
+ */
+ R shipOrder(ComShopOrderShipDTO orderShipDTO);
+
+ /**
+ * 订单配送
+ * @param orderDeliverDTO 订单信息
+ * @return 配送结果
+ */
+ R deliverOrder(ComShopOrderDeliverDTO orderDeliverDTO);
+
+ /**
+ * 订单完成配送
+ * @param orderDeliverDTO 订单信息
+ * @return 完成配送结果
+ */
+ R finishDeliverOrder(ComShopOrderDeliverDTO orderDeliverDTO);
+
+ /**
+ * 获取订单导出数据
+ * @param comShopOrderExportDTO 订单导出参数
+ * @return 订单数据
+ */
+ R shopOrderExportData(ComShopOrderExportDTO comShopOrderExportDTO);
+
+ /**
+ * 获取资金导出数据
+ * @param comShopFundsExportDTO 资金导出参数
+ * @return 资金数据
+ */
+ R shopOrderFundsExportData(ComShopFundsExportDTO comShopFundsExportDTO);
+
+ /**
+ * 获取用户资金信息
+ * @param userId 用户ID
+ * @return 统计结果
+ */
+ R getFundsStat(Long userId);
+
+ /**
+ * 获取分页 资金订单数据
+ * @param pageComShopFundsSearchDTO 资金导出参数
+ * @return 资金订单数据
+ */
+ R pageShopFunds(PageComShopFundsSearchDTO pageComShopFundsSearchDTO);
+
+ /**
+ * 微信支付订单回调
+ * @param wxPayNotifyOrderDTO 订单支付回调参数
+ */
+ void wxOrderPayNotify(WxPayNotifyOrderDTO wxPayNotifyOrderDTO);
+
+ /**
+ * 用户点击去支付
+ * @param orderPayDTO 请求参数
+ * @return 返回支付对象
+ */
+ R wxPay(OrderPayDTO orderPayDTO);
}
--
Gitblit v1.7.1