yanghui
2022-11-21 007d460f90b0d6156e2af5d341a488def9a9502a
#feat 提交自提点校验
4个文件已修改
23 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/SysUserDOMapper.xml 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java
@@ -260,4 +260,7 @@
    @ApiModelProperty("商家后台账号id")
    private Long backstageUserId;
    @ApiModelProperty("是否为自提点")
    private Boolean isPoint;
}
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
@@ -440,4 +440,11 @@
     * 是否为物业公司后台账号
     * */
    Long isPropertyAccount(String phone);
    /**
     * 判读是否为自提点账号
     * @param phone
     * @return
     */
    int checkPoint(String phone);
}
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -541,6 +541,15 @@
            loginUserInfoVO.setBackstageUserId(sysUser.getUserId());
            loginUserInfoVO.setBackstageType(5);
        }
        //获取自提点账号
        if (StrUtil.isNotBlank(sysUserDO.getPhone())){
            if(userDao.checkPoint(sysUserDO.getPhone()) > 0){
                loginUserInfoVO.setIsPoint(true);
            }else {
                loginUserInfoVO.setIsPoint(false);
            }
        }
        return R.ok(loginUserInfoVO);
    }
@@ -2887,6 +2896,7 @@
        sysUserDO.setPhone(convenientMerchantDTO.getMobilePhone());
        sysUserDO.setName(convenientMerchantDTO.getContacts());
        sysUserDO.setPassword(encode);
        sysUserDO.setAppId("wx118de8a734d269f0");
        try {
            userDao.insert(sysUserDO);
            return R.ok(sysUserDO.getUserId());
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/SysUserDOMapper.xml
@@ -108,5 +108,8 @@
    <select id="selectByUserId" resultMap="BaseResultMap">
        SELECT u1.* FROM sys_user u1 WHERE u1.phone = (SELECT phone FROM sys_user u2 WHERE u2.user_id=#{userId}) AND u1.app_id in ('wx118de8a734d269f0','wx0cef797390444b75')
    </select>
    <select id="checkPoint" resultType="int">
        select count(1) from com_convenient_elevating_point where wechat_account = #{phone} and business_status = 1 and is_del = 0
    </select>
</mapper>