From 726f97c55b0937bf0d048313271bdd7a80cdd1f6 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期二, 20 四月 2021 12:38:30 +0800
Subject: [PATCH] add:添加订单相关联字段
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 68 +++++++++++++++++++++++++++++++++-
1 files changed, 66 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
index 4e16b31..b9bf7c6 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -1855,9 +1855,9 @@
R pageShopOperLog(@RequestBody PageDTO pageDTO);
/**
- * 分页查询 商家后台操作日志
+ * 订单分页查询
* @param pageComShopOrderSearchDTO 分页数据
- * @return 分页日志
+ * @return 订单分页查询
*/
@PostMapping("/shop/order/page")
R pageShopOrder(@RequestBody PageComShopOrderSearchDTO pageComShopOrderSearchDTO);
@@ -2028,4 +2028,68 @@
*/
@GetMapping("/shop/capitalDetailByStore")
R capitalDetailByStore(@RequestParam("id") Long id);
+
+
+ /**
+ * 订单发货
+ * @param orderShipDTO 商城订单发货信息
+ * @return 发货结果
+ */
+ @PostMapping("/shop/shipOrder")
+ R shipOrder(@RequestBody ComShopOrderShipDTO orderShipDTO);
+
+ /**
+ * 订单配送
+ * @param deliverDTO 订单信息
+ * @return 配送结果
+ */
+ @PostMapping("/shop/deliverOrder")
+ R deliverOrder(@RequestBody ComShopOrderDeliverDTO deliverDTO);
+
+ /**
+ * 订单完成配送
+ * @param deliverDTO 订单信息
+ * @return 配送完成结果
+ */
+ @PostMapping("/shop/finishDeliverOrder")
+ R finishDeliverOrder(@RequestBody ComShopOrderDeliverDTO deliverDTO);
+
+ /**
+ * 获取用户商户详情
+ * @param userId 用户ID
+ */
+ @GetMapping("/shop/getUserStoreInfo")
+ R getUserStoreInfo(@RequestParam("userId") Long userId);
+
+ /**
+ * 订单导出信息
+ * @param comShopOrderExportDTO 订单导出信息
+ * @return 订单导出信息
+ */
+ @PostMapping("/shop/shopOrderExportData")
+ R shopOrderExportData(@RequestBody ComShopOrderExportDTO comShopOrderExportDTO);
+
+ /**
+ * 资金管理导出信息
+ * @param comShopFundsExportDTO 资金管理导出信息
+ * @return 资金管理导出信息
+ */
+ @PostMapping("/shop/shopOrderFundsExportData")
+ R shopOrderFundsExportData(@RequestBody ComShopFundsExportDTO comShopFundsExportDTO );
+
+ /**
+ * 店铺资金统计信息
+ * @param userId 用户ID
+ * @return 店铺资金统计信息
+ */
+ @GetMapping("/shop/getFundsStat")
+ R getFundsStat(@RequestParam("userId") Long userId);
+
+ /**
+ * 店铺资金统计信息
+ * @param pageComShopFundsSearchDTO 店铺资金
+ * @return 店铺资金统计信息
+ */
+ @PostMapping("/shop/pageShopFunds")
+ R pageShopFunds(@RequestBody PageComShopFundsSearchDTO pageComShopFundsSearchDTO);
}
--
Gitblit v1.7.1