Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

yanghui

2022-11-17 1de0a85c067ceb62413d0f458899dca41b8322d0

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopFlowerApi.java

@@ -403,6 +403,35 @@
    }

    /**
     * 微信支付订单回调
     *
     * @param wxPayNotifyOrderDTO
     *            订单支付回调参数
     */
    @PostMapping("/wxOrderPayNotify")
    public void wxOrderPayNotifyFlower(@RequestBody WxPayNotifyOrderDTO wxPayNotifyOrderDTO) {
        comShopFlowerOrderService.wxOrderPayNotify(wxPayNotifyOrderDTO);
    }

    /**
     * 点击去支付订单
     *
     * @param orderPayDTO
     *            请求参数
     * @return 支付对象
     */
    @PostMapping("/wxPay")
    public R wxPayFlower(@RequestBody OrderPayDTO orderPayDTO) {
        return comShopFlowerOrderService.wxPay(orderPayDTO);
    }

    @GetMapping("/selectCountByDeliveryType")
    public R selectCountByDeliveryType(Integer deliveryType){
        return comShopFlowerOrderService.selectCountByDeliveryType(deliveryType);
    }


    /**
     * 统计用户订单数量
     *
     * @param userId