Merge remote-tracking branch 'origin/master'

DESKTOP-71BH0QO\L、ming

2021-04-21 3ffa739e77cdafdc4be1aa153acb3423071cd102

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -1788,6 +1788,13 @@


    /**
     * 根据电话号获取店铺
     * @param phone 电话号
     */
    @GetMapping("/shop/getStoreByPhone")
    R getStoreByPhone(@RequestParam("phone") String phone);

    /**
     * 编辑店铺、启用、禁用
     * @param storeVO 数据
     * @param id 商铺id
@@ -1909,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);

    /**
     * 购物车添加
@@ -2101,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);
}