Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-26 73f86cb94faa49f1157d6c9f00737a28f63507f4

Merge branch 'local_20221104' into huacheng_test

 springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/CommunityConvenientApi.java

@@ -438,4 +438,27 @@
        return communityService.pageGoodsCategory(pageConvenientGoodsCategoryDTO);
    }


    /**
     * 商家后台经营数据统计-上
     * @param storeId
     * @return
     */
    @GetMapping("/merchant/selectSumOrderAndAmountByStoreId")
    @ApiOperation(value = "经营数据统计-上")
    public R selectSumOrderAndAmountByStoreId(@RequestParam("storeId") Long storeId){
        return communityService.selectSumOrderAndAmountByStoreId(storeId);
    }

    /**
     * 统计时间区域的订单量 15天 30天 一年
     * @param storeId
     * @param type
     * @return
     */
    @GetMapping("/merchant/selectOrderLineChart")
    @ApiOperation(value = "统计时间区域的订单量 15天 30天 一年")
    public  R selectOrderLineChart(@RequestParam("storeId") Long storeId,@RequestParam("type")  Integer type){
        return communityService.selectOrderLineChart(storeId,type);
    }
}

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

@@ -11080,4 +11080,19 @@
    @PostMapping("/shopFlower/pageOrderByDeliveryNo")
    R pageOrderByDeliveryNo(@RequestBody PageComFlowerOrderListDTO pageComFlowerOrderListDTO);

    /**
     * 商家后台经营数据统计-上
     * @param storeId
     * @return
     */
    @GetMapping("/shopFlower/selectSumOrderAndAmountByStoreId")
    R selectSumOrderAndAmountByStoreId(@RequestParam("storeId") Long storeId);

    /**
     * 统计时间区域的订单量 15天 30天 一年
     * @param storeId
     * @param type
     * @return
     */
    @GetMapping("/shopFlower/selectOrderLineChart") R selectOrderLineChart(@RequestParam("storeId") Long storeId,@RequestParam("type")  Integer type);
}

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

@@ -157,4 +157,27 @@
    }


    /**
     * 商家后台经营数据统计-上
     * @param storeId
     * @return
     */
    @GetMapping("selectSumOrderAndAmountByStoreId")
    @ApiOperation(value = "商家后台经营数据统计-上")
    public R selectSumOrderAndAmountByStoreId(@RequestParam("storeId") Long storeId){
        return communityService.selectSumOrderAndAmountByStoreId(storeId);
    }

    /**
     * 统计时间区域的订单量 15天 30天 一年
     * @param storeId
     * @param type
     * @return
     */
    @GetMapping("selectOrderLineChart")
    @ApiOperation(value = "商家后台-统计时间区域的订单量 15天 30天 一年")
    public  R selectOrderLineChart(@RequestParam("storeId") Long storeId,@RequestParam("type")  Integer type){
        return communityService.selectOrderLineChart(storeId,type);
    }

}