lidongdong
2023-08-31 0d15a472f111a8fd73b549ac0247313f32df0214
新增小程序设置积分支付密码接口   验证密码接口
6个文件已修改
75 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/XmostBeautifulApi.java 56 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/SysUser.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/SysUserMapper.xml 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserDO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/UserDao.xml 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/XmostBeautifulApi.java
@@ -5,6 +5,7 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.VolunteerCreditsExchangeVO;
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 +22,10 @@
    @Resource
    private CommunityService communityService;
    @Resource
    private UserService userService;
    /**
     * 查询单个
@@ -283,6 +288,57 @@
        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.equals(pwd,loginUserInfoVO.getPlayPwd()))
        {
            return R.ok();
        }
        return R.fail("密码错误");
    }
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java
@@ -238,6 +238,8 @@
    @ApiModelProperty("爱心积分")
    private String loveIntegral;
    @ApiModelProperty("爱心积分密码")
    private String playPwd;
    @ApiModelProperty("是否单位管理员 1是 0否")
    private Integer isCheckUnitAdmin;
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/SysUser.java
@@ -269,6 +269,9 @@
    @ApiModelProperty(value = "爱心积分")
    private String loveIntegral;
    @ApiModelProperty(value = "积分支付密码")
    private String playPwd;
    private String appId;
    /**
     * 启用状态(1.启用 2.禁用)
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/SysUserMapper.xml
@@ -43,12 +43,13 @@
        <result property="streetId" column="street_id"/>
        <result property="relationName" column="relation_name"/>
        <result property="loveIntegral" column="love_integral"/>
        <result property="playPwd" column="play_pwd"/>
    </resultMap>
    <!--查询单个-->
    <select id="queryById" resultMap="SysUserMap">
        select
          user_id, account, password, openid, session_key, unionid, phone, nick_name, name,
          user_id, account, password, openid, session_key, unionid, phone, nick_name, name,play_pwd,
               community_id, sex, id_card, birthday, image_url, type, job, is_volunteer, is_partymember,
               status, create_at, last_login_time, tags, family_id, face_url, face_state, reject_reson,
               area_id, card_photo_front, card_photo_back, family_book, continuous_landing_days, is_tips,
@@ -61,7 +62,7 @@
    <select id="queryAllByLimit" resultMap="SysUserMap">
        select
        user_id, account, password, openid, session_key, unionid, phone, nick_name, name, community_id, sex, id_card,
        birthday, image_url, type, job, is_volunteer, is_partymember, status, create_at, last_login_time, tags,
        birthday, image_url, type, job, is_volunteer, is_partymember, status, create_at, last_login_time, tags,play_pwd,
        family_id, face_url, face_state, reject_reson, area_id, card_photo_front, card_photo_back, family_book,love_integral,
        continuous_landing_days, is_tips, work_status, work_start_time, work_end_time, big_age_tips, plaintext_password
        from sys_user
@@ -185,7 +186,7 @@
    <select id="queryAllByList" resultMap="SysUserMap">
        select
        user_id, account, password, openid, session_key, unionid, phone, nick_name, name, community_id, sex, id_card,
        birthday, image_url, type, job, is_volunteer, is_partymember, status, create_at, last_login_time, tags,
        birthday, image_url, type, job, is_volunteer, is_partymember, status, create_at, last_login_time, tags,play_pwd,
        family_id, face_url, face_state, reject_reson, area_id, card_photo_front, card_photo_back, family_book,love_integral,
        continuous_landing_days, is_tips, work_status, work_start_time, work_end_time, big_age_tips, plaintext_password
        from sys_user
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserDO.java
@@ -199,6 +199,9 @@
    private String loveIntegral;
    private String playPwd;
    /**
     * 街道id
     */
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/UserDao.xml
@@ -41,10 +41,11 @@
        <result property="plaintextPassword" column="plaintext_password"/>
        <result property="relationName" column="relation_name"/>
        <result property="loveIntegral" column="love_integral"/>
        <result property="playPwd" column="play_pwd"/>
    </resultMap>
    <sql id="columns">
        `user_id`,`account`,`password`,`openid`,`session_key`,`unionid`,`phone`,`nick_name`,`name`,
        `user_id`,`account`,`password`,`openid`,`session_key`,`unionid`,`phone`,`nick_name`,`name`,play_pwd,
        `community_id`,`sex`,`id_card`,`birthday`,`image_url`,`type`,`job`,`is_volunteer`,`is_partymember`,
        `status`,`create_at`,`last_login_time`,`tags`,`family_id`,`face_url`,`face_state`,`reject_reson`,`area_id`,
        `card_photo_front`,`card_photo_back`,`family_book`,`continuous_landing_days`,`is_tips`,`work_status`,
@@ -100,6 +101,7 @@
        u.status,
        u.create_at,
        u.love_integral,
        u.play_pwd,
        u.last_login_time
        from sys_user u
        left join com_act a on u.community_id=a.community_id