From 23f9cfc15ba6cc20b4aa6dcbff6c097e2b6ec6fc Mon Sep 17 00:00:00 2001 From: CeDo <cedoo@qq.com> Date: 星期三, 21 四月 2021 20:06:30 +0800 Subject: [PATCH] bugfixed:配送状态修复 --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 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 b9bf7c6..8e7accc 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 @@ -425,6 +425,15 @@ R pageOtherBuild(@RequestBody ComMngStructOtherBuildVO comMngStructOtherBuildVO); /** + * 获取志愿者详情 + * + * @param id 志愿者信息 + * @return 增加结果 + */ + @GetMapping("getVolunteerById") + R getVolunteerById(@RequestParam("id")Long id); + + /** * 增加志愿者 * * @param comMngVolunteerMngVO 志愿者信息 @@ -1777,6 +1786,13 @@ @PostMapping("/shop/saveStore") R saveStore(@RequestBody ShopStoreVO storeVO); + /** + * 新增店铺 + * @param storeVO 店铺信息 + * @return 新增结果 + */ + @PostMapping("/shop/addStore") + R addStore(@RequestBody ShopStoreVO storeVO); /** * 编辑店铺、启用、禁用 @@ -1900,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); /** * 购物车添加 @@ -2062,6 +2086,13 @@ R getUserStoreInfo(@RequestParam("userId") Long userId); /** + * 获取用户商户详情 + * @param account 用户账号 + */ + @GetMapping("/shop/getUserStoreInfoByAccount") + R<ShopStoreVO> getUserStoreInfoByAccount(@RequestParam("account") String account); + + /** * 订单导出信息 * @param comShopOrderExportDTO 订单导出信息 * @return 订单导出信息 @@ -2092,4 +2123,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