lidongdong
2023-08-31 f8f7f64ed0e7595ba988c906ffd73bd739c019d4
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/XmostBeautifulApi.java
@@ -4,6 +4,7 @@
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.VolunteerMerchantVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.StringUtils;
@@ -134,7 +135,7 @@
    /**
     * 更新商家
     * 更新商家订单
     * @param item
     * @return
     */
@@ -253,6 +254,16 @@
        return communityService.volunteerTypeGetList(pageNum,pageSize,"2");
    }
    /**
     * 修改商家
     * @param vtvo
     * @return
     */
    @PostMapping("/VolunteerMerchant/update")
    public R updateVolunteerMerchant(@RequestBody VolunteerMerchantVO vtvo)
    {
        return communityService.updateVolunteerMerchant(vtvo);
    }
    /**
     * 获取商家详情
@@ -333,6 +344,12 @@
            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();