Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-25 6c6c0825e59377261b9972af95e1e4dafb43fcfd

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

@@ -10758,7 +10758,7 @@
     *            收货地址id
     * @return 删除结果
     */
    @PostMapping("/shopFlower/shopDelUserAddress")
    @DeleteMapping("/shopFlower/shopDelUserAddress")
    R shopFlowerDelUserAddress(@RequestParam("addressId") Long addressId);

    /**
@@ -10794,7 +10794,7 @@
     * @param orderId 订单id
     * @return 订单详情
     */
    @PostMapping("/shopFlower/orderDetail")
    @GetMapping("/shopFlower/orderDetail")
    R orderDetailFlower(@RequestParam("orderId") Long orderId);

    /**
@@ -10812,7 +10812,7 @@
     * @param orderId 订单id
     * @return 删除结果
     */
    @PostMapping("/shopFlower/orderDelete")
    @DeleteMapping("/shopFlower/orderDelete")
    R orderDeleteFlower(@RequestParam("orderId") Long orderId);

    /**
@@ -10881,7 +10881,7 @@
     * @param pageComShopFlowerEvaluateDTO
     * @return
     */
    @PostMapping("/pageEvaluate")
    @PostMapping("/shopFlower/pageEvaluate")
    R pageEvaluate(@RequestBody PageComShopFlowerEvaluateDTO pageComShopFlowerEvaluateDTO);

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

    /**
     * 查询我的店铺各类统计数据
     * @param storeId
     * @param userId
     * @return
     */
    @GetMapping("/shopFlower/selectCountByStoreId")
    R selectCountByStoreId(Long storeId);
    @GetMapping("/shopFlower/selectCountByUserId")
    R selectCountByUserId(@RequestParam("userId") Long userId);


    /**
@@ -11030,5 +11030,54 @@
     * @return
     */
    @GetMapping("/shopFlower/selectCountGroupStatus")
    R selectCountGroupStatus(Long storeId);
    R selectCountGroupStatus(@RequestParam("storeId") Long storeId);

    /**
     * 新增商品浏览量
     * @param goodsId
     * @return
     */
    @GetMapping("/shopFlower/incrGoodsView")
    R incrGoodsView(@RequestParam("goodsId") Long goodsId);

    /**
     * 出入账分页
     * @param pageComShopFlowerOrderPayDTO
     * @return
     */
    @PostMapping("/shopFlower/pageOrderPay")
    R pageOrderPay(@RequestBody PageComShopFlowerOrderPayDTO pageComShopFlowerOrderPayDTO);

    /**
     * 获取商家的营业额和可结算金额
     * @param storeId
     * @return
     */
    @GetMapping("/shopFlower/getQuota")
    R getQuota(@RequestParam("storeId") Long storeId);

    /**
     * 取消退款
     * @param id
     * @return
     */
    @GetMapping("/shopFlower/refundOrderCancel")
    R refundOrderCancel(@RequestParam("id") Long id);

    /**
     * 退款订单详情
     * @param id
     * @return
     */
    @GetMapping("/shopFlower/refundOrderDetail")
    R refundOrderDetail(@RequestParam("id") Long id);

    /**
     * 清点商品 确认送达详情
     * @param pageComFlowerOrderListDTO
     * @return
     */
    @PostMapping("/shopFlower/pageOrderByDeliveryNo")
    R pageOrderByDeliveryNo(@RequestBody PageComFlowerOrderListDTO pageComFlowerOrderListDTO);

}