From 77bd80eadf1d3b973f640b8e7d9b630d14afb2d8 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期二, 20 四月 2021 15:03:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopApi.java | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 106 insertions(+), 11 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopApi.java
index 374f67a..d93dacc 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopApi.java
@@ -20,6 +20,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.Date;
import java.util.List;
import javax.validation.constraints.NotNull;
@@ -37,8 +38,6 @@
@Resource
private ComShopOrderService comShopOrderService;
@Resource
- private ComShopGoodsService comShopGoodsService;
- @Resource
private ComShopCartService comShopCartService;
@Resource
private ComShopUserAddressService comShopUserAddressService;
@@ -46,7 +45,7 @@
/**
* 店铺列表-分页查询
* @param pageComShopStoreDTO 查询参数
- * @return ComShopStoreVO
+ * @return PageShopStoreVO
*/
@PostMapping("/pageShopStore")
public R pageShopStore(@RequestBody PageComShopStoreDTO pageComShopStoreDTO) {
@@ -98,6 +97,18 @@
return comShopStoreService.getOneInfo(id);
}
+
+ /**
+ * 获取用户商铺详细
+ *
+ * @param userId 用户ID
+ * @return
+ */
+ @GetMapping("/getUserStoreInfo")
+ public R getUserStoreInfo(@RequestParam("userId") Long userId) {
+ return comShopStoreService.getUserStoreInfo(userId);
+ }
+
/**
* 添加商城后台日志
*
@@ -145,8 +156,9 @@
* @param comShopGoodsDTO 请求参数
* @return 商品列表
*/
- @PostMapping("pageShopGoods")
+ @PostMapping("/pageShopGoods")
public R pageShopGoods(@RequestBody ComShopGoodsDTO comShopGoodsDTO) {
+
return comShopGoodsService.pageShopGoods(comShopGoodsDTO);
}
@@ -326,9 +338,9 @@
/**
* 商品列表-分页查询
* @param pageComShopGoodsDTO 查询参数
- * @return ComShopStoreVO
+ * @return PageShopStoreVO
*/
- @PostMapping("/pageShopGoods")
+ @PostMapping("pageGoods")
public R pageShopStore(@RequestBody PageComShopGoodsDTO pageComShopGoodsDTO) {
return comShopGoodsService.pageGoodsList(pageComShopGoodsDTO);
}
@@ -338,7 +350,7 @@
* @param addShopGoodsVO
* @return
*/
- @PostMapping("/saveShopGoods")
+ @PostMapping("saveShopGoods")
public R saveStore(@RequestBody AddShopGoodsVO addShopGoodsVO) {
return comShopGoodsService.saveShopGoods(addShopGoodsVO);
}
@@ -349,7 +361,7 @@
* @param id 商铺Id
* @return
*/
- @PostMapping("/editShopGoods/{id}")
+ @PostMapping("editShopGoods/{id}")
public R editShopGoods(@PathVariable("id") Long id,@RequestBody AddShopGoodsVO addShopGoodsVO) {
return comShopGoodsService.editShopGoods(id, addShopGoodsVO);
}
@@ -359,19 +371,102 @@
* @param id
* @return
*/
- @PostMapping("/deleteShopGoods")
+ @PostMapping("deleteShopGoods")
public R deleteShopGoods(@RequestBody Long[] id) {
return comShopGoodsService.deleteShopGoods(id);
}
/**
- * 删除商品
+ * 修改商品状态
* @param id
* @return
*/
- @GetMapping("/changeShopGoodsStatus")
+ @GetMapping("changeShopGoodsStatus")
public R changeStatus(@RequestParam("id") Long id,@RequestParam("status")Integer status) {
return comShopGoodsService.changeStatus(id,status);
}
+ /**
+ * 商家资金的订单详情
+ * @param id
+ * @return
+ */
+ @GetMapping("capitalDetailByStore")
+ public R capitalDetailByStore(@RequestParam("id") Long id) {
+ return comShopOrderService.capitalDetailByStore(id);
+ }
+
+ /**
+ * 订单发货
+ * @param orderShipDTO 发货信息
+ * @return 发货结果
+ */
+ @PostMapping("/shipOrder")
+ R shipOrder(@RequestBody ComShopOrderShipDTO orderShipDTO){
+ return comShopOrderService.shipOrder(orderShipDTO);
+ }
+
+ /**
+ * 订单配送
+ * @param deliverDTO 订单ID
+ * @return 配送结果
+ */
+ @PostMapping("/deliverOrder")
+ R deliverOrder(@RequestBody ComShopOrderDeliverDTO deliverDTO){
+ Long orderId = deliverDTO.getOrderId();
+ return comShopOrderService.deliverOrder(orderId);
+ }
+ /**
+ * 订单配送
+ * @param deliverDTO 订单ID
+ * @return 配送完成
+ */
+ @PostMapping("/finishDeliverOrder")
+ R finishDeliverOrder(@RequestBody ComShopOrderDeliverDTO deliverDTO){
+ Long orderId = deliverDTO.getOrderId();
+ return comShopOrderService.finishDeliverOrder(orderId);
+ }
+
+ /**
+ * 订单导出信息
+ * @param comShopOrderExportDTO 订单导出信息
+ * @return 订单导出信息
+ */
+ @PostMapping("/shopOrderExportData")
+ R shopOrderExportData(@RequestBody ComShopOrderExportDTO comShopOrderExportDTO){
+ return comShopOrderService.shopOrderExportData(comShopOrderExportDTO);
+ }
+
+ /**
+ * 资金管理导出信息
+ * @param comShopFundsExportDTO 资金管理导出信息
+ * @return 资金管理导出信息
+ */
+ @PostMapping("/shopOrderFundsExportData")
+ R shopOrderFundsExportData(@RequestBody ComShopFundsExportDTO comShopFundsExportDTO){
+ return comShopOrderService.shopOrderFundsExportData(comShopFundsExportDTO);
+ }
+
+
+ /**
+ * 用户资金统计信息
+ * @param userId 用户ID
+ * @return 统计信息
+ */
+ @GetMapping("/getFundsStat")
+ R getFundsStat(@RequestParam("userId") Long userId){
+ return comShopOrderService.getFundsStat(userId);
+ }
+
+ /**
+ * 店铺资金统计信息
+ * @param pageComShopFundsSearchDTO 店铺资金
+ * @return 店铺资金统计信息
+ */
+ @PostMapping("/pageShopFunds")
+ R pageShopFunds(@RequestBody PageComShopFundsSearchDTO pageComShopFundsSearchDTO){
+ return comShopOrderService.pageShopFunds(pageComShopFundsSearchDTO);
+ }
+
+
}
--
Gitblit v1.7.1