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 | 137 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 134 insertions(+), 3 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 d04f042..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
@@ -95,6 +105,28 @@
@GetMapping("/getStoreInfo")
public R getOneInfo(@RequestParam("id") Long id) {
return comShopStoreService.getOneInfo(id);
+ }
+
+
+ /**
+ * 获取用户商铺详细
+ *
+ * @param userId 用户ID
+ * @return
+ */
+ @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);
}
/**
@@ -146,6 +178,7 @@
*/
@PostMapping("/pageShopGoods")
public R pageShopGoods(@RequestBody ComShopGoodsDTO comShopGoodsDTO) {
+
return comShopGoodsService.pageShopGoods(comShopGoodsDTO);
}
@@ -167,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);
}
/**
@@ -286,7 +329,7 @@
*/
@PostMapping("orderCancel")
public R orderCancel(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO) {
- return comShopOrderService.orderCancel(comShopOrderQueryDTO.getOrderId(),comShopOrderQueryDTO.getPhone());
+ return comShopOrderService.orderCancel(comShopOrderQueryDTO);
}
/**
@@ -323,7 +366,7 @@
/**
- * 商品列表-分页查询-运营后台
+ * 商品列表-分页查询
* @param pageComShopGoodsDTO 查询参数
* @return PageShopStoreVO
*/
@@ -348,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);
@@ -362,7 +406,6 @@
public R deleteShopGoods(@RequestBody Long[] id) {
return comShopGoodsService.deleteShopGoods(id);
}
-
/**
* 修改商品状态
@@ -384,4 +427,92 @@
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){
+ return comShopOrderService.deliverOrder(deliverDTO);
+ }
+ /**
+ * 订单配送
+ * @param deliverDTO 订单ID
+ * @return 配送完成
+ */
+ @PostMapping("/finishDeliverOrder")
+ R finishDeliverOrder(@RequestBody ComShopOrderDeliverDTO deliverDTO){
+ return comShopOrderService.finishDeliverOrder(deliverDTO);
+ }
+
+ /**
+ * 订单导出信息
+ * @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);
+ }
+
+ /**
+ * 微信支付订单回调
+ * @param wxPayNotifyOrderDTO 订单支付回调参数
+ */
+ @PostMapping("/wxOrderPayNotify")
+ public void wxOrderPayNotify(@RequestBody WxPayNotifyOrderDTO wxPayNotifyOrderDTO){
+ comShopOrderService.wxOrderPayNotify(wxPayNotifyOrderDTO);
+ }
+
+ /**
+ * 点击去支付订单
+ * @param orderPayDTO 请求参数
+ * @return 支付对象
+ */
+ @PostMapping("/wxPay")
+ public R wxPay(@RequestBody OrderPayDTO orderPayDTO){
+ return comShopOrderService.wxPay(orderPayDTO);
+ }
}
--
Gitblit v1.7.1