#feat .

yanghui

2022-11-28 42521c9b51c1bd9a40036f18fd610cd46601222d

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

@@ -2974,11 +2974,11 @@
    /**
     * 删除商品
     *
     * @param id
     * @param goodsId
     * @return
     */
    @PostMapping("/shopFlower/deleteShopGoods")
    R deleteFlowerShopGoods(@RequestBody Long[] id);
    @DeleteMapping("/shopFlower/deleteShopGoods")
    R deleteFlowerShopGoods(@RequestParam("goodsId") Long goodsId);

    /**
     * 修改商品状态
@@ -2990,12 +2990,12 @@
    R changeFlowerStatus(@RequestParam("id") Long id, @RequestParam("status") Integer status);

    /**
     * 修改商品状态
     * 商品详情
     *
     * @param goodsId
     * @return
     */
    @PostMapping("/shopFlower/shopGoodsDetail")
    @GetMapping("/shopFlower/shopGoodsDetail")
    R shopFlowerGoodsDetail(@RequestParam("goodsId") Long goodsId);


@@ -6541,6 +6541,14 @@
    R getMerchant(@RequestParam("merchantId") Long merchantId);

    /**
     * 获取便民服务商家详情
     * @param userId
     * @return
     */
    @GetMapping("/convenient/merchant/getMerchantByUserId")
    R getMerchantByUserId(@RequestParam("userId") Long userId);

    /**
     * 禁用/启用便民服务商家
     * @param disableOrEnableConvenientMerchantDTO
     * @return
@@ -6570,6 +6578,14 @@
     */
    @GetMapping("/convenient/getUserMerchantInfoByAccount")
    R<ConvenientMerchantVO> getUserMerchantInfoByAccount(@RequestParam("account") String account);

    /**
     * 获取用户便民服务商家详情
     * @param account 商家绑定账号
     * @return
     */
    @GetMapping("/convenient/getMerchantInfoByAccount")
    R<ConvenientMerchantVO> getMerchantInfoByAccount(@RequestParam("account") String account);

    /**
     * 获取商便民服务商家信息
@@ -10582,7 +10598,7 @@

    @GetMapping("/sanshuo/expert/backstageList2")
    R expertBackStageList(@RequestParam(value = "level",required = false)Integer level,@RequestParam(value = "page",required = false)Integer page,
                          @RequestParam(value = "size",required = false)Integer size);
                          @RequestParam(value = "size",required = false)Integer size,@RequestParam(value = "keyWord",required = false)String  keyWord);

    /**
     * 查询社区id集合
@@ -10643,7 +10659,7 @@
     * @param operator
     * @return
     */
    @DeleteMapping("/point/delete")
    @DeleteMapping("/convenient/point/delete")
    R deletePoint(@RequestParam("pointId") Long pointId, @RequestParam("operator") Long operator);

    /**
@@ -10651,7 +10667,7 @@
     * @param pointId
     * @return
     */
    @GetMapping("/point/detail")
    @GetMapping("/convenient/point/detail")
    R detailPoint(@RequestParam("pointId") Long pointId);

    /**
@@ -10659,7 +10675,7 @@
     * @param convenientGoodsCategoryDTO
     * @return
     */
    @PostMapping("/goodsCategory/add")
    @PostMapping("/convenient/goodsCategory/add")
    R addGoodsCategory(@RequestBody ConvenientGoodsCategoryDTO convenientGoodsCategoryDTO);

    /**
@@ -10667,7 +10683,7 @@
     * @param convenientGoodsCategoryDTO
     * @return
     */
    @PutMapping("/goodsCategory/put")
    @PutMapping("/convenient/goodsCategory/put")
    R putGoodsCategory(@RequestBody ConvenientGoodsCategoryDTO convenientGoodsCategoryDTO);

    /**
@@ -10675,7 +10691,7 @@
     * @param categoryId
     * @return
     */
    @DeleteMapping("/goodsCategory/delete")
    @DeleteMapping("/convenient/goodsCategory/delete")
    R deleteGoodsCategory(@RequestParam("categoryId") Long categoryId, @RequestParam("operator") Long operator);

    /**
@@ -10683,7 +10699,7 @@
     * @param categoryId
     * @return
     */
    @GetMapping("/goodsCategory/get")
    @GetMapping("/convenient/goodsCategory/get")
    R getGoodsCategory(@RequestParam("categoryId") Long categoryId);

    /**
@@ -10691,7 +10707,7 @@
     * @param pageConvenientGoodsCategoryDTO
     * @return
     */
    @PostMapping("/goodsCategory/page")
    @PostMapping("/convenient/goodsCategory/page")
     R pageGoodsCategory(@RequestBody PageConvenientGoodsCategoryDTO pageConvenientGoodsCategoryDTO);

    @GetMapping("/dataCount")
@@ -10710,7 +10726,7 @@
     * 获取所有商品分类
     * @return
     */
    @GetMapping("/goodsCategory/getAllGoodsCategories")
    @GetMapping("/convenient/goodsCategory/getAllGoodsCategories")
    R getAllGoodsCategories();

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

    /**
@@ -10786,8 +10802,8 @@
     * @param orderId 订单id
     * @return 订单详情
     */
    @PostMapping("/shopFlower/orderDetail")
    R orderDetailFlower(@RequestParam("orderId") Long orderId);
    @GetMapping("/shopFlower/orderDetail")
    R orderDetailFlower(@RequestParam("orderId") Long orderId,@RequestParam(value = "phone",required = false) String phone);

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

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

    /**
@@ -10900,4 +10916,199 @@
    @ApiOperation(value = "取货码")
    @GetMapping("/shopFlower/getQRCode")
    R getQRCode(@RequestParam("id") Long id);

    /**
     * 保存配送单
     * @param comShopFlowerOrderDeliveryDTO
     */
    @PostMapping("/shopFlower/saveDelivery")
    R saveDelivery(@RequestBody ComShopFlowerOrderDeliveryDTO comShopFlowerOrderDeliveryDTO);

    /**
     * 更新配送单
     * @param comShopFlowerOrderDeliveryDTO
     */
    @PostMapping("/shopFlower/updateDelivery")
    R updateDelivery(@RequestBody ComShopFlowerOrderDeliveryDTO comShopFlowerOrderDeliveryDTO);

    /**
     * 已配送、已送达 分页查询
     * @param pageComFlowerOrderDeliveryDTO
     * @return
     */
    @PostMapping("/shopFlower/pageDelivery")
    R pageDelivery(@RequestBody PageComFlowerOrderDeliveryDTO pageComFlowerOrderDeliveryDTO);

    /**
     * 未配送 分页查询
     * @param pageComFlowerOrderDeliveryDTO
     * @return
     */
    @PostMapping("/shopFlower/pageNoDelivery")
    R pageNoDelivery(@RequestBody PageComFlowerOrderDeliveryDTO pageComFlowerOrderDeliveryDTO);

    /**
     * 未配送-开始配送-订单列表
     * @param pageComFlowerOrderListDTO
     * @return
     */
    @PostMapping("/shopFlower/pageNoDeliveryOrderList")
    R pageNoDeliveryOrderList(@RequestBody PageComFlowerOrderListDTO pageComFlowerOrderListDTO);

    /**
     * 根据商家id查询商家的订单
     * @param pageComFlowerOrderListDTO
     * @return
     */
    @PostMapping("/shopFlower/pageOrderByStoreId")
    R pageOrderByStoreId(@RequestBody PageComFlowerOrderListDTO pageComFlowerOrderListDTO);

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

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

    /**
     * 获取社区动态置顶banner
     * @param communityId  社区id
     * */
    @PostMapping("/easyphoto/getUserRewardsNew")
    R getUserRewardsNew(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId);

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

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


    /**
     * 创建退款订单
     * @param comShopFlowerRefundOrderDTO
     * @return
     */
    @PostMapping("/shopFlower/createRefundOrder")
    R createRefundOrder(@RequestBody ComShopFlowerRefundOrderDTO comShopFlowerRefundOrderDTO);

    /**
     * 分页查询
     * @param pageComOrderRefundDTO
     * @return
     */
    @PostMapping("/shopFlower/pageRefundOrder")
    R pageRefundOrder(@RequestBody PageComOrderRefundDTO pageComOrderRefundDTO);

    /**
     * 修改退款订单
     * @param comShopFlowerRefundOrderDTO
     * @return
     */
    @PostMapping("/shopFlower/updateRefundOrder")
    R updateRefundOrder(@RequestBody ComShopFlowerRefundOrderDTO comShopFlowerRefundOrderDTO);


    /**
     * 商家后台-退款申请统计
     * @param storeId
     * @return
     */
    @GetMapping("/shopFlower/selectCountGroupStatus")
    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);

    /**
     * 商家后台经营数据统计-上
     * @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,@RequestParam("tab")  Integer tab);

    /**
     * 统计上架的上下架商品数量
     * @param userId
     * @return
     */
    @GetMapping("/shopFlower/countSaleByUserId")
    R countSaleByUserId(@RequestParam("userId") Long userId);
}