From be2d7ec232fbd22b5e46ec133485ea751520636d Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期四, 22 四月 2021 09:47:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopApi.java |   71 ++++++++++++++++++++++++++++++++---
 1 files changed, 65 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..f18bf7e 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;
 
@@ -61,6 +61,16 @@
     @PostMapping("/saveStore")
     public R saveStore(@RequestBody ShopStoreVO storeVO) {
         return comShopStoreService.saveStore(storeVO);
+    }
+
+    /**
+     * 新增店铺
+     * @param storeVO   店铺信息
+     * @return  新增结果
+     */
+    @PostMapping("/addStore")
+    public R addStore(@RequestBody ShopStoreVO storeVO) {
+        return comShopStoreService.addStore(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);
     }
 
     /**
@@ -158,6 +178,7 @@
      */
     @PostMapping("/pageShopGoods")
     public R pageShopGoods(@RequestBody ComShopGoodsDTO comShopGoodsDTO) {
+
         return comShopGoodsService.pageShopGoods(comShopGoodsDTO);
     }
 
@@ -179,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);
     }
 
     /**
@@ -360,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);
@@ -376,13 +408,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 +438,9 @@
     }
 
     /**
-     * 订单发货
+     * 订单配送
      * @param deliverDTO 订单ID
-     * @return 发货结果
+     * @return 配送结果
      */
     @PostMapping("/deliverOrder")
     R deliverOrder(@RequestBody  ComShopOrderDeliverDTO deliverDTO){
@@ -406,9 +448,9 @@
         return comShopOrderService.deliverOrder(orderId);
     }
     /**
-     * 订单发货
+     * 订单配送
      * @param deliverDTO 订单ID
-     * @return 发货结果
+     * @return 配送完成
      */
     @PostMapping("/finishDeliverOrder")
     R finishDeliverOrder(@RequestBody ComShopOrderDeliverDTO deliverDTO){
@@ -457,5 +499,22 @@
         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