springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/HttpConstant.java
@@ -36,7 +36,8 @@ public static final String TEXT_XML = "text/xml"; /** 内江服务进出记录查询接口 */ public static final String NEIJIANG_URL = "https://mzj.scnjdx.gov.cn/proxy/comActCameraRecord/queryAll"; // public static final String NEIJIANG_URL = "https://mzj.scnjdx.gov.cn/proxy/comActCameraRecord/queryAll"; public static final String NEIJIANG_URL = "http://118.122.78.144:8086/comActCameraRecord/queryAll"; /** 测试服务报警记录查询接口 */ public static final String CALL_THE_POLICE_URL = "http://test.panzhihua.nhys.cdnhxx.com/api/communitybackstage/comPropertyAlarm/queryAll/noToken"; springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
@@ -1054,4 +1054,11 @@ */ @PutMapping("disableOrEnableMerchantUsers") R disableOrEnableMerchantUsers(@RequestBody DisableOrEnableConvenientMerchantDTO disableOrEnableConvenientMerchantDTO); /** * 根据openid维护社区团队里是否注册 * @param openid 用户微信唯一标识 */ @GetMapping("judgeCommunityTeam") void judgeCommunityTeam(@RequestParam("openid") String openid); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationHouseDAO.java
@@ -164,7 +164,7 @@ + " LEFT JOIN com_mng_population AS cmp ON cmp.id = cmphu.popul_id " + " left join com_mng_population_community_tags AS cmpct on cmp.id = cmpct.population_id " + "WHERE " + " cmphu.house_id = #{houseId} " + "<if test='relation != null '>" + " AND cmphu.relation = #{relation} " + " </if> " + "<if test='relationId != null '>" + " AND cmphu.relation_id = #{relationId} " + " group by id </if> " + " </if> " + "<if test='relationId != null '>" + " AND cmphu.relation_id = #{relationId} " + "</if> group by id " + " </script>") List<PopulationListVO> getGridVillageBuildingPopulationList(@Param("houseId") Long houseId, @Param("relation") Integer relation, @Param("relationId") Integer relationId); springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberRoleDAO.java
@@ -39,6 +39,13 @@ @Select("select * from sys_user where phone=#{phone} and type=1") SysUserVO getSysUserByPhone(@Param("phone") String phone); /** * 根据手机号查询小程序用户数量 * @param phone 手机号 * @return 小程序用户数量 */ Integer getSysUserByPhoneCount(@Param("phone") String phone); @Update("update sys_user u set u.phone=#{newphone} where u.phone=#{oldphone}") void updateUserPhone(@Param("newphone") String newphone, @Param("oldphone") String oldphone);
@@ -52,8 +52,7 @@ ComPbServiceTeamDO comPbServiceTeamDO = new ComPbServiceTeamDO(); BeanUtils.copyProperties(comPbServiceTeamDTO, comPbServiceTeamDO); comPbServiceTeamDO.setIsReg(2); SysUserVO sysUser = comPbMemberRoleDAO.getSysUserByPhone(comPbServiceTeamDTO.getPhone()); if (!ObjectUtils.isEmpty(sysUser)) { if (comPbMemberRoleDAO.getSysUserByPhoneCount(comPbServiceTeamDTO.getPhone()) > 0) { comPbServiceTeamDO.setIsReg(1); } int insert = comPbServiceTeamDAO.insert(comPbServiceTeamDO); springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbMemberRoleDOMapper.xml
New file @@ -0,0 +1,31 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.panzhihua.service_dangjian.dao.ComPbMemberRoleDAO"> <!-- 通用查询映射结果 --> <resultMap id="BaseResultMap" type="com.panzhihua.service_dangjian.model.dos.ComPbMemberRoleDO"> <id column="id" property="id" /> <result column="phone" property="phone" /> <result column="is_reg" property="isReg" /> <result column="name" property="name" /> <result column="sex" property="sex" /> <result column="birth_time" property="birthTime" /> <result column="position" property="position" /> <result column="position_two" property="positionTwo" /> <result column="job_responsibilities" property="jobResponsibilities" /> <result column="photo_path" property="photoPath" /> <result column="create_at" property="createAt" /> <result column="update_at" property="updateAt" /> <result column="community_id" property="communityId" /> </resultMap> <!-- 通用查询结果列 --> <sql id="Base_Column_List"> id, phone, is_reg, name, sex, birth_time, position, position_two, job_responsibilities, photo_path, create_at, update_at, community_id </sql> <select id="getSysUserByPhoneCount" resultType="integer"> select count(user_id) from sys_user where phone=#{phone} and type=1 </select> </mapper> springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
@@ -1192,4 +1192,13 @@ public R disableOrEnableMerchantUsers(@RequestBody DisableOrEnableConvenientMerchantDTO disableOrEnableConvenientMerchantDTO) { return userService.disableOrEnableMerchantUsers(disableOrEnableConvenientMerchantDTO); } /** * 根据openid维护社区团队里是否注册 * @param openid 用户微信唯一标识 */ @PostMapping("judgeCommunityTeam") public void judgeCommunityTeam(@RequestParam("openid") String openid) { userService.judgeCommunityTeam(openid); } } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
@@ -175,4 +175,17 @@ * @return */ int disableOrEnableMerchantUsers(@Param("status") Integer status, @Param("userIds") List<Long> userIds); /** * 根据手机号维护社区团队表是否注册 * @param phone 手机号 */ void judgeCommunityTeam(@Param("phone") String phone); /** * 根据手机号查询社区团队表中用户数量 * @param phone 手机号 * @return 用户数量 */ Integer getCommunityTeamCount(@Param("phone") String phone); } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
@@ -727,4 +727,10 @@ * @return */ R disableOrEnableMerchantUsers(DisableOrEnableConvenientMerchantDTO disableOrEnableConvenientMerchantDTO); /** * 根据openid维护社区团队里是否注册 * @param openid 用户微信唯一标识 */ void judgeCommunityTeam(String openid); } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -2629,25 +2629,66 @@ } /** * 修改便民服务商家绑定账号 * @param userId 用户id * @param account 修改账户 * @return 修改结果 */ @Override public R putUserAccount(Long userId, String account) { SysUserDO sysUserDO = userDao.selectById(userId); if (isNull(sysUserDO)) { return R.fail("用户不存在"); * 修改便民服务商家绑定账号 * @param userId 用户id * @param account 修改账户 * @return 修改结果 */ @Override public R putUserAccount(Long userId, String account) { SysUserDO sysUserDO = userDao.selectById(userId); if (isNull(sysUserDO)) { return R.fail("用户不存在"); } sysUserDO.setAccount(account); userDao.updateById(sysUserDO); return R.ok(); } sysUserDO.setAccount(account); userDao.updateById(sysUserDO); return R.ok(); } // /** // * 修改便民服务商家绑定账号 // * @param userId 用户id // * @param account 修改账户 // * @return 修改结果 // */ // @Override // public R putUserAccount(Long userId, String account) { // SysUserDO sysUserDO = userDao.selectById(userId); // if (isNull(sysUserDO)) { // return R.fail("用户不存在"); // } // String oldAccount = sysUserDO.getAccount(); // sysUserDO.setAccount(account); // int result = userDao.updateById(sysUserDO); // if (result > 0) { // SysRoleDO sysRoleDO = roleDAO.selectOne(new QueryWrapper<SysRoleDO>() // .lambda().eq(SysRoleDO::getRoleKey, Constants.CONVENIENT_MERCHANT_ROLE_KEY + oldAccount)); // if (nonNull(sysRoleDO)) { // sysRoleDO.setRoleKey(Constants.CONVENIENT_MERCHANT_ROLE_KEY + account); // roleDAO.updateById(sysRoleDO); // } // } // return R.ok(); // } @Override public R disableOrEnableMerchantUsers(DisableOrEnableConvenientMerchantDTO disableOrEnableConvenientMerchantDTO) { userDao.disableOrEnableMerchantUsers(disableOrEnableConvenientMerchantDTO.getType(), disableOrEnableConvenientMerchantDTO.getUserIds()); return R.ok(); } /** * 根据openid维护社区团队里是否注册 * @param openid 用户微信唯一标识 */ @Override public void judgeCommunityTeam(String openid){ //查询用户信息 SysUserDO userDO = this.userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getOpenid,openid)); if(userDO != null && StringUtils.isNotEmpty(userDO.getPhone())){ if(this.userDao.getCommunityTeamCount(userDO.getPhone()) > 0){ this.userDao.judgeCommunityTeam(userDO.getPhone()); } } } } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/UserDao.xml
@@ -422,5 +422,12 @@ select count(id) from event_grid_member_relation where grid_member_id = #{userId} </select> <update id="judgeCommunityTeam"> update com_pb_service_team set is_reg = 1 where phone = #{phone} </update> <select id="getCommunityTeamCount" resultType="integer"> select count(id) from com_pb_service_team where is_reg = 2 and phone = #{phone} </select> </mapper>
