From 3ffa739e77cdafdc4be1aa153acb3423071cd102 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期三, 21 四月 2021 11:26:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 51 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
index ec78284..4bbbd67 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -22,6 +22,7 @@
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
+import java.util.Date;
import java.util.List;
/**
@@ -422,6 +423,15 @@
*/
@PostMapping("pageotherbuild")
R pageOtherBuild(@RequestBody ComMngStructOtherBuildVO comMngStructOtherBuildVO);
+
+ /**
+ * 获取志愿者详情
+ *
+ * @param id 志愿者信息
+ * @return 增加结果
+ */
+ @GetMapping("getVolunteerById")
+ R getVolunteerById(@RequestParam("id")Long id);
/**
* 增加志愿者
@@ -1778,6 +1788,13 @@
/**
+ * 根据电话号获取店铺
+ * @param phone 电话号
+ */
+ @GetMapping("/shop/getStoreByPhone")
+ R getStoreByPhone(@RequestParam("phone") String phone);
+
+ /**
* 编辑店铺、启用、禁用
* @param storeVO 数据
* @param id 商铺id
@@ -1836,7 +1853,7 @@
* @param id
* @return
*/
- @PostMapping("/shop/changeShopGoodsStatus")
+ @GetMapping("/shop/changeShopGoodsStatus")
R changeStatus(@RequestParam("id") Long id,@RequestParam("status")Integer status);
/**
* 结果
@@ -1854,9 +1871,9 @@
R pageShopOperLog(@RequestBody PageDTO pageDTO);
/**
- * 分页查询 商家后台订单
+ * 订单分页查询
* @param pageComShopOrderSearchDTO 分页数据
- * @return 分页日志
+ * @return 订单分页查询
*/
@PostMapping("/shop/order/page")
R pageShopOrder(@RequestBody PageComShopOrderSearchDTO pageComShopOrderSearchDTO);
@@ -1899,6 +1916,14 @@
*/
@PostMapping("/shop/shopCartList")
R shopCartList(@RequestParam("userId") Long userId);
+
+ /**
+ * 查询用户购物车数量
+ * @param userId 用户id
+ * @return 用户购物车商品数量
+ */
+ @PostMapping("/shop/shopCartUserTotal")
+ R shopCartUserTotal(@RequestParam("userId") Long userId);
/**
* 购物车添加
@@ -2020,6 +2045,14 @@
@PostMapping("/shop/orderStatistics")
R orderStatistics(@RequestParam("userId") Long userId);
+ /**
+ * 商家资金的订单详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/shop/capitalDetailByStore")
+ R capitalDetailByStore(@RequestParam("id") Long id);
+
/**
* 订单发货
@@ -2083,4 +2116,19 @@
*/
@PostMapping("/shop/pageShopFunds")
R pageShopFunds(@RequestBody PageComShopFundsSearchDTO pageComShopFundsSearchDTO);
+
+ /**
+ * 微信支付订单回调
+ * @param wxPayNotifyOrderDTO 订单支付回调参数
+ */
+ @PostMapping("/shop/wxOrderPayNotify")
+ void wxOrderPayNotify(@RequestBody WxPayNotifyOrderDTO wxPayNotifyOrderDTO);
+
+ /**
+ * 点击去支付订单
+ * @param orderPayDTO 请求参数
+ * @return 支付对象
+ */
+ @PostMapping("/shop/wxPay")
+ R wxPay(@RequestBody OrderPayDTO orderPayDTO);
}
--
Gitblit v1.7.1