Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-21 90e72a7e206b16ae121121dec485d617163f3740

Merge branch 'local_20221104' into huacheng_test

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

@@ -10984,10 +10984,11 @@
    /**
     * 统计查询订单数量
     * @param deliveryType
     * @param storeId
     * @return
     */
    @GetMapping("/shopFlower/selectCountByDeliveryType")
    R selectCountByDeliveryType(Integer deliveryType,Long storeId);
    R selectCountByDeliveryType(@RequestParam("deliveryType") Integer deliveryType,@RequestParam("storeId")  Long storeId);

    /**
     * 查询我的店铺各类统计数据

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

@@ -433,7 +433,7 @@
     * @return
     */
    @GetMapping("/selectCountByDeliveryType")
    public R selectCountByDeliveryType(Integer deliveryType,Long storeId){
    public R selectCountByDeliveryType(@RequestParam("deliveryType") Integer deliveryType,@RequestParam("storeId")  Long storeId){
        return comShopFlowerOrderService.selectCountByDeliveryType(deliveryType,storeId);
    }