From 0fe94ada8ffb65e60372227d4c1c8f5bf98ddb8b Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期二, 20 四月 2021 14:45:26 +0800
Subject: [PATCH] add: 订单详细信息订单日志，商家后台登陆时返回关联店铺信息
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopApi.java | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 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 72867c2..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
@@ -8,7 +8,6 @@
import com.panzhihua.common.model.dtos.shop.PageComShopStoreDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.shop.AddShopGoodsVO;
-import com.panzhihua.service_community.model.dos.ComShopOrderDO;
import com.panzhihua.service_community.service.*;
import com.panzhihua.common.model.vos.shop.ShopOperLogVO;
import com.panzhihua.common.model.vos.shop.ShopStoreVO;
@@ -21,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;
@@ -158,6 +158,7 @@
*/
@PostMapping("/pageShopGoods")
public R pageShopGoods(@RequestBody ComShopGoodsDTO comShopGoodsDTO) {
+
return comShopGoodsService.pageShopGoods(comShopGoodsDTO);
}
@@ -376,13 +377,23 @@
}
/**
- * 删除商品
+ * 修改商品状态
* @param id
* @return
*/
@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);
}
/**
@@ -396,9 +407,9 @@
}
/**
- * 订单发货
+ * 订单配送
* @param deliverDTO 订单ID
- * @return 发货结果
+ * @return 配送结果
*/
@PostMapping("/deliverOrder")
R deliverOrder(@RequestBody ComShopOrderDeliverDTO deliverDTO){
@@ -406,9 +417,9 @@
return comShopOrderService.deliverOrder(orderId);
}
/**
- * 订单发货
+ * 订单配送
* @param deliverDTO 订单ID
- * @return 发货结果
+ * @return 配送完成
*/
@PostMapping("/finishDeliverOrder")
R finishDeliverOrder(@RequestBody ComShopOrderDeliverDTO deliverDTO){
--
Gitblit v1.7.1