no

DESKTOP-71BH0QO\L、ming

2021-04-22 ec78622b2952b22200ece6fedf9d02b3905941bb

 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);

    /**
     * 增加志愿者
@@ -1776,6 +1786,13 @@
    @PostMapping("/shop/saveStore")
    R saveStore(@RequestBody ShopStoreVO storeVO);

    /**
     * 新增店铺
     * @param storeVO   店铺信息
     * @return  新增结果
     */
    @PostMapping("/shop/addStore")
    R addStore(@RequestBody ShopStoreVO storeVO);

    /**
     * 编辑店铺、启用、禁用
@@ -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);


    /**
     * 订单发货
@@ -2053,6 +2086,13 @@
    R getUserStoreInfo(@RequestParam("userId") Long userId);

    /**
     * 获取用户商户详情
     * @param account 用户账号
     */
    @GetMapping("/shop/getUserStoreInfoByAccount")
    R<ShopStoreVO> getUserStoreInfoByAccount(@RequestParam("account") String account);

    /**
     * 订单导出信息
     * @param comShopOrderExportDTO 订单导出信息
     * @return  订单导出信息
@@ -2083,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);
}