From 3d93cf89ab294fcc17aaf519816db5ea63e875ea Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期一, 19 四月 2021 14:09:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopOrderService.java | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 50 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 a913f12..d484a53 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,8 @@
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;
@@ -83,4 +85,52 @@
*/
R capitalDetailByStore(Long id);
+ /**
+ * 订单发货
+ * @param orderShipDTO 订单发货信息
+ * @return 发货结果
+ */
+ R shipOrder(ComShopOrderShipDTO orderShipDTO);
+
+ /**
+ * 订单配送
+ * @param orderId 订单id
+ * @return 配送结果
+ */
+ R deliverOrder(Long orderId);
+
+ /**
+ * 订单完成配送
+ * @param orderId 订单id
+ * @return 完成配送结果
+ */
+ R finishDeliverOrder(Long orderId);
+
+ /**
+ * 获取订单导出数据
+ * @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);
}
--
Gitblit v1.7.1