From 0bf174be571c53b8af796eca4b51fcd3edec1657 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期日, 25 四月 2021 21:55:43 +0800
Subject: [PATCH] no
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopApi.java | 39 ++++++++++++++++++++++++++++++++++-----
1 files changed, 34 insertions(+), 5 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 3a701af..8fe40d8 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
@@ -64,6 +64,16 @@
}
/**
+ * 新增店铺
+ * @param storeVO 店铺信息
+ * @return 新增结果
+ */
+ @PostMapping("/addStore")
+ public R addStore(@RequestBody ShopStoreVO storeVO) {
+ return comShopStoreService.addStore(storeVO);
+ }
+
+ /**
* 编辑店铺、启用、禁用
*
* @param storeVO
@@ -107,6 +117,16 @@
@GetMapping("/getUserStoreInfo")
public R getUserStoreInfo(@RequestParam("userId") Long userId) {
return comShopStoreService.getUserStoreInfo(userId);
+ }
+ /**
+ * 获取用户商铺详细
+ *
+ * @param account 用户账号
+ * @return
+ */
+ @GetMapping("/getUserStoreInfoByAccount")
+ public R<ShopStoreVO> getUserStoreInfoByAccount(@RequestParam("account") String account) {
+ return comShopStoreService.getUserStoreInfo(account);
}
/**
@@ -180,6 +200,16 @@
@PostMapping("shopCartList")
public R shopCartList(@RequestParam("userId") Long userId) {
return comShopCartService.shopCartList(userId);
+ }
+
+ /**
+ * 查询用户购物车数量
+ * @param userId 用户id
+ * @return 用户购物车商品数量
+ */
+ @PostMapping("shopCartUserTotal")
+ public R shopCartUserTotal(@RequestParam("userId") Long userId) {
+ return comShopCartService.shopCartUserTotal(userId);
}
/**
@@ -299,7 +329,7 @@
*/
@PostMapping("orderCancel")
public R orderCancel(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO) {
- return comShopOrderService.orderCancel(comShopOrderQueryDTO.getOrderId(),comShopOrderQueryDTO.getPhone());
+ return comShopOrderService.orderCancel(comShopOrderQueryDTO);
}
/**
@@ -361,6 +391,7 @@
* @param id 商铺Id
* @return
*/
+ @Transactional(rollbackFor = Exception.class)
@PostMapping("editShopGoods/{id}")
public R editShopGoods(@PathVariable("id") Long id,@RequestBody AddShopGoodsVO addShopGoodsVO) {
return comShopGoodsService.editShopGoods(id, addShopGoodsVO);
@@ -413,8 +444,7 @@
*/
@PostMapping("/deliverOrder")
R deliverOrder(@RequestBody ComShopOrderDeliverDTO deliverDTO){
- Long orderId = deliverDTO.getOrderId();
- return comShopOrderService.deliverOrder(orderId);
+ return comShopOrderService.deliverOrder(deliverDTO);
}
/**
* 订单配送
@@ -423,8 +453,7 @@
*/
@PostMapping("/finishDeliverOrder")
R finishDeliverOrder(@RequestBody ComShopOrderDeliverDTO deliverDTO){
- Long orderId = deliverDTO.getOrderId();
- return comShopOrderService.finishDeliverOrder(orderId);
+ return comShopOrderService.finishDeliverOrder(deliverDTO);
}
/**
--
Gitblit v1.7.1