新增社区共建评论模块2

lidongdong

2023-11-13 48a703dec596b5d2c1b04b0b4f7ed0f28c1ca898

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/XmostBeautifulApi.java

@@ -99,14 +99,23 @@
                                  @RequestParam(value = "condition", required = false) String condition,
                                  @RequestParam(value = "userName", required = false) String userName,
                                  @RequestParam(value = "communityId", required = false) String communityId,
                                  @RequestParam(value = "orderType", required = false) String orderType)
                                  @RequestParam(value = "orderType", required = false) String orderType,
                                  @RequestParam(value = "merchantId", required = false) String merchantId)
    {
        if(StringUtils.isEmpty(communityId))
        {
            communityId=getCommunityId()+"";
        }

        String userId=null;

        if(StringUtils.isEmpty(merchantId))
        {
            userId=getUserId()+"";
        }

        return communityService.getList(pageNum,pageSize,goodsId,orderNumber,goodsName,
                condition,userName,communityId,getUserId()+"",orderType);
                condition,userName,communityId,userId,orderType,merchantId);
    }

    /**
@@ -423,6 +432,11 @@
            return R.fail("商家id不能为空");
        }

        if(StringUtils.isEmpty(item.getOrderId()))
        {
            return R.fail("订单id不能为空");
        }

        if(StringUtils.isEmpty(item.getUserId()))
        {
            return R.fail("评论人id不能为空");
@@ -476,6 +490,68 @@
        return communityService.WithdrawInsert(item);
    }

    /**
     * 商家提现列表
     * @param disposeType
     * @return
     */
    @GetMapping("/withdraw/getList")
    public R WithdrawGetList(@RequestParam("pageNum") int pageNum,
                             @RequestParam("pageSize") int pageSize,
                             @RequestParam(value = "disposeType", required = false) String disposeType,
                             @RequestParam(value = "merchantName", required = false) String merchantName,
                             @RequestParam(value = "merchantId", required = false) String  merchantId,
                             @RequestParam(value = "communityId", required = false) String communityId)
    {
        if(StringUtils.isEmpty(communityId))
        {
            communityId=getCommunityId()+"";
        }

        if(StringUtils.isEmpty(merchantId))
        {
            return R.fail("商家id不能为空");
        }

        return communityService.WithdrawGetList(pageNum,pageSize,disposeType, merchantName,merchantId,communityId);
    }


    /***************************************************************************************************************
     *
     *                               路北社区系统配置   商家折扣      兑换地点信息
     *
     ****************************************************************************************************************/

    /**
     * 详情
     * @param
     * @return
     */
    @GetMapping("/Community/Config/getData")
    public R ConfiggetData(@RequestParam("communityId") String communityId)
    {
        return communityService.ConfiggetData(communityId);
    }


    /*******************************************************************************************************************
     *
     *
     *                         社区折扣
     *
     *
     ******************************************************************************************************************/

    /**
     * 分页查询
     * @param
     * @return
     */
    @GetMapping("/community/discount/getList")
    public R CommunityDiscountgetList(@RequestParam("communityId") String communityId)
    {
        return communityService.CommunityDiscountgetList(communityId);
    }

}