修改杨家坪社区问题

lidongdong

2023-09-01 d28d43e9ababfa4c2a91e405702c1fffe18c46cd

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

@@ -4,7 +4,10 @@
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.VolunteerCreditsExchangeVO;
import com.panzhihua.common.model.vos.community.VolunteerMerchantEvaluateVO;
import com.panzhihua.common.model.vos.community.VolunteerMerchantVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.StringUtils;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
@@ -21,6 +24,10 @@

    @Resource
    private CommunityService communityService;


    @Resource
    private UserService userService;

    /**
     * 查询单个
@@ -82,17 +89,62 @@
     * @param
     * @return
     */
    @GetMapping("order/getList")
    public R getList(@RequestParam("pageNum") int pageNum,
                     @RequestParam("pageSize")  int pageSize,
                     @RequestParam(value = "goodsId", required = false) String goodsId,
                     @RequestParam(value = "orderNumber", required = false) String orderNumber,
                     @RequestParam(value = "goodsName", required = false) String goodsName,
                     @RequestParam(value = "condition", required = false) String condition,
                     @RequestParam(value = "userName", required = false) String userName)
    @GetMapping("/order/getList")
    public R orderMerchantGetList(@RequestParam("pageNum") int pageNum,
                                  @RequestParam("pageSize")  int pageSize,
                                  @RequestParam(value = "goodsId", required = false) String goodsId,
                                  @RequestParam(value = "orderNumber", required = false) String orderNumber,
                                  @RequestParam(value = "goodsName", required = false) String goodsName,
                                  @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)
    {
        if(StringUtils.isEmpty(communityId))
        {
            communityId=getCommunityId()+"";
        }
        return communityService.getList(pageNum,pageSize,goodsId,orderNumber,goodsName,
                condition,userName,null,getLoginUserInfo().getUserId()+"","1");
                condition,userName,communityId,getUserId()+"",orderType);
    }

    /**
     * 新增用户购买商家商品记录
     * @param
     * @return
     */
    @PostMapping("/order/insertMerchantData")
    public R insertMerchantData(@RequestBody VolunteerCreditsExchangeVO item)
    {

        if(StringUtils.isEmpty(item.getPalyIntegral()))
        {
            return R.fail("请输入兑换积分");
        }

        LoginUserInfoVO userInfoVO= getLoginUserInfo();
        if(StringUtils.isEmpty(item.getCommunityId()))
        {
            item.setCommunityId(userInfoVO.getCommunityId()+"");
        }
        item.setOrderType("2");
        item.setUserId(userInfoVO.getUserId()+"");
        item.setNeedScore(userInfoVO.getLoveIntegral());
        return communityService.insertMerchantData(item);
    }



    /**
     * 更新商家订单
     * @param item
     * @return
     */
    @PostMapping("/order/MerchantUpdate")
    public R orderMerchantUpdate(@RequestBody VolunteerCreditsExchangeVO item)
    {
        item.setOrderType("2");
        return communityService.update(item);
    }

    /**
@@ -111,7 +163,7 @@
    }

    /**
     * 新增
     * 新增社区
     * @param
     * @return
     */
@@ -123,20 +175,21 @@
        {
            item.setCommunityId(userInfoVO.getCommunityId()+"");
        }

        item.setOrderType("1");
        item.setUserId(userInfoVO.getUserId()+"");
        item.setNeedScore(userInfoVO.getLoveIntegral());
        return communityService.insertData(item);
    }

    /**
     * 更新
     * 更新社区
     * @param item
     * @return
     */
    @PostMapping("/order/update")
    public R update(@RequestBody VolunteerCreditsExchangeVO item)
    {
        item.setOrderType("1");
        return communityService.update(item);
    }

@@ -156,7 +209,7 @@
    }

    /**
     * 核销
     * 核销社区
     * @param id
     * @return
     */
@@ -170,5 +223,240 @@
        return communityService.conditionData(id);
    }

    /*************************************************************************************
     *
     *      路北社区商家模块
     *
     **************************************************************************************/
    /**
     * 分页查询
     * @param
     * @return
     */
    @GetMapping("/getList")
    public R volunteerMerchantGetList(@RequestParam("pageNum") int pageNum,
                                      @RequestParam("pageSize") int pageSize,
                                      @RequestParam(value = "merchantState", required = false) String merchantState,
                                      @RequestParam(value = "merchantType", required = false) String merchantType,
                                      @RequestParam(value = "name", required = false) String name)
    {
        return communityService.volunteerMerchantGetList(pageNum, pageSize,merchantState,merchantType,name,getCommunityId()+"");
    }

    /**
     * 分页查询商家分类
     * @param
     * @return
     */
    @GetMapping("/VolunteerMerchant/getList")
    public R merchantvolunteerTypeGetList(@RequestParam("pageNum")  int pageNum,
                                          @RequestParam("pageSize")  int pageSize)
    {
        return communityService.volunteerTypeGetList(pageNum,pageSize,"2");
    }

    /**
     * 修改商家
     * @param vtvo
     * @return
     */
    @PostMapping("/VolunteerMerchant/update")
    public R updateVolunteerMerchant(@RequestBody VolunteerMerchantVO vtvo)
    {
        return communityService.updateVolunteerMerchant(vtvo);
    }

    /**
     * 获取商家详情
     * @param id
     * @return
     */
    @GetMapping("/VolunteerMerchant/getById")
    public R volunteerMerchantGetById(@RequestParam("id") String id)
    {
        return communityService.volunteerMerchantGetById(id);
    }


    /**
     * 是否是商家
     * @return
     */
    @GetMapping("/VolunteerMerchant/isMerchant")
    public R isMerchant(@RequestParam("userId") String userId)
    {
        return communityService.isMerchant(userId);
    }


    /**
     * 社区取消订单
     * @param id
     * @return
     */
    @GetMapping("/order/communityCancellation")
    public R communityCancellation(@RequestParam("id") String id)
    {
        return communityService.communityCancellation(id);
    }

    /**
     * 用户设置积分支付密码
     * @param userId
     * @param pwd
     * @return
     */
    @GetMapping("/setUserPlayPwd")
    public R setUserPlayPwd(@RequestParam("userId") String userId,@RequestParam("pwd") String pwd)
    {
        if (StringUtils.isEmpty(userId))
        {
            return R.fail("userId不能为空");
        }

        if(StringUtils.isEmpty(pwd))
        {
            return R.fail("密码不能为空");
        }

        LoginUserInfoVO loginUserInfoVO=new LoginUserInfoVO();
        loginUserInfoVO.setUserId(Long.valueOf(userId));
        loginUserInfoVO.setPlayPwd(pwd);
        return userService.putUser(loginUserInfoVO);
    }


    /**
     * 判断密码是否正确
     * @param userId
     * @param pwd
     * @return
     */
    @GetMapping("/passwordIsCorrect")
    public R passwordIsCorrect(@RequestParam("userId") String userId,@RequestParam("pwd") String pwd)
    {
        if (StringUtils.isEmpty(userId))
        {
            return R.fail("userId不能为空");
        }

        if(StringUtils.isEmpty(pwd))
        {
            return R.fail("密码不能为空");
        }
        LoginUserInfoVO loginUserInfoVO=userService.getUserInfoByUserId(userId).getData();
        if(StringUtils.isEmpty(loginUserInfoVO.getPlayPwd()))
        {
            return R.fail(304,"您还未设置密码！");
        }


        if(StringUtils.equals(pwd,loginUserInfoVO.getPlayPwd()))
        {
            return R.ok();
        }
        return R.fail("密码错误");
    }




    /****************************************************************************************************************
     *
     *                      商家评论
     *
     ***************************************************************************************************************/

    /**
     * 商家评论分页查询
     * @param
     * @return
     */
    @GetMapping("/evaluate/getList")
    public R volunteerMerchantGetList(@RequestParam("pageNum") int pageNum,
                                      @RequestParam("pageSize") int pageSize,
                                      @RequestParam("communityId") String communityId,
                                      @RequestParam("merchantId") String merchantId)
    {
        if(StringUtils.isEmpty(communityId))
        {
            communityId=getCommunityId()+"";
        }
        if(StringUtils.isEmpty(merchantId))
        {
            return R.fail("商家id不能为空");
        }
        return communityService.volunteerMerchantGetList(pageNum,pageSize,communityId,merchantId);
    }

    /**
     * 商家评论获取详情
     * @param id
     * @return
     */
    @GetMapping("/evaluate/getData")
    public R volunteerMerchantGetData(@RequestParam("id") String id)
    {
        return communityService.volunteerMerchantGetData(id);
    }

    /**
     * 商家评论新增评价
     * @return
     */
    @PostMapping("/evaluate/insert")
    public R volunteerMerchantInsert(@RequestBody VolunteerMerchantEvaluateVO item)
    {
        if(item==null)
        {
            return R.fail("参数不能为空");
        }

        if(StringUtils.isEmpty(item.getCommunityId()))
        {
            item.setCommunityId(getCommunityId()+"");
        }

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

        if(StringUtils.isEmpty(item.getUserId()))
        {
            return R.fail("评论人id不能为空");
        }

        if(StringUtils.isEmpty(item.getEvaluateGrade()))
        {
            return R.fail("评论分数不能为空");
        }

        return communityService.volunteerMerchantInsert(item);
    }

    /**
     * 商家评论更新评价
     * @return
     */
    @PostMapping("/evaluate/update")
    public R volunteerMerchantUpdate(@RequestBody VolunteerMerchantEvaluateVO item)
    {
        return communityService.volunteerMerchantUpdate(item);
    }


    /**
     * 商家评论删除评价
     * @param id
     * @return
     */
    @DeleteMapping("/evaluate/delete")
    public R volunteerMerchantDelete(@RequestParam("id") String id)
    {
        return communityService.volunteerMerchantDelete(id);
    }



}