From de91c84954157bb9f8b6d938cbe0b1b51fb6e65d Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期五, 07 五月 2021 15:23:57 +0800
Subject: [PATCH] bugfixed：新增便民服务商家 报错
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopApi.java | 18 +++++++++++++-----
1 files changed, 13 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 fa1c2c7..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
@@ -118,6 +118,16 @@
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);
+ }
/**
* 添加商城后台日志
@@ -319,7 +329,7 @@
*/
@PostMapping("orderCancel")
public R orderCancel(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO) {
- return comShopOrderService.orderCancel(comShopOrderQueryDTO.getOrderId(),comShopOrderQueryDTO.getPhone());
+ return comShopOrderService.orderCancel(comShopOrderQueryDTO);
}
/**
@@ -434,8 +444,7 @@
*/
@PostMapping("/deliverOrder")
R deliverOrder(@RequestBody ComShopOrderDeliverDTO deliverDTO){
- Long orderId = deliverDTO.getOrderId();
- return comShopOrderService.deliverOrder(orderId);
+ return comShopOrderService.deliverOrder(deliverDTO);
}
/**
* 订单配送
@@ -444,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