springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/AddFmsServiceAdminDTO.java
@@ -4,8 +4,6 @@ import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import javax.validation.constraints.Pattern; import javax.validation.constraints.Size; import com.fasterxml.jackson.annotation.JsonFormat; @@ -25,13 +23,9 @@ public class AddFmsServiceAdminDTO { @ApiModelProperty("服务用户") @NotBlank @Size(min = 1, max = 10) private String userName; @ApiModelProperty("联系电话") @NotBlank(message = "联系电话不能为空") @Pattern(message = "联系电话格式错误", regexp = "^(13[0-9]|14[01456879]|15[0-3,5-9]|16[2567]|17[0-8]|18[0-9]|19[0-3,5-9])\\d{8}$") private String phone; @ApiModelProperty("服务时间") @@ -53,6 +47,9 @@ @ApiModelProperty("服务过程图片，多张逗号隔开") private String processImage; @ApiModelProperty("分派服务人员id") private Long memberId; @ApiModelProperty(value = "所属社区", hidden = true) private Long communityId;
@@ -26,7 +26,7 @@ private Long serviceId; @ApiModelProperty("评分星级（1.非常差2.差3.一般4.满意5.非常满意）") private String starLevel; private Integer starLevel; @ApiModelProperty("内") private String evaluateContent; springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
@@ -1191,4 +1191,11 @@ */ @PostMapping("/mcs/bindPhone") R bindOrAddMcsUser(@RequestBody @Valid BindUserPhoneDTO bindUserPhoneDTO); /** * 删除用户信息缓存 * @param phone */ @DeleteMapping("/deleteUserCashByPhone") R deleteUserCashByPhone(@RequestParam("phone") String phone); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComFmsTeamMemberServiceImpl.java
@@ -2,7 +2,6 @@ import static java.util.Objects.isNull; import static java.util.Objects.nonNull; import static org.apache.commons.lang3.StringUtils.isBlank; import static org.apache.commons.lang3.StringUtils.isNotBlank; import static org.apache.commons.lang3.StringUtils.isNotEmpty; @@ -18,6 +17,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -33,6 +33,7 @@ import com.panzhihua.common.model.vos.community.fms.ComFmsTeamMemberImportExcelVO; import com.panzhihua.common.model.vos.community.fms.ComFmsTeamMemberImportMistakeExcelVO; import com.panzhihua.common.model.vos.community.fms.ComFmsTeamMemberVO; import com.panzhihua.common.service.user.UserService; import com.panzhihua.service_community.dao.ComFmsTeamDAO; import com.panzhihua.service_community.dao.ComFmsTeamMemberDAO; import com.panzhihua.service_community.dao.ComFmsTeamMemberRelationDAO; @@ -61,6 +62,8 @@ private ComFmsTeamMemberRelationDAO comFmsTeamMemberRelationDAO; @Resource private ComFmsTeamTypeDAO comFmsTeamTypeDAO; @Resource private UserService userService; /** * 新增团队成员 @@ -193,7 +196,18 @@ .eq(ComFmsTeamMemberRelation::getMemberId, deleteTeamMemberDTO.getId()).eq(ComFmsTeamMemberRelation::getTeamId, deleteTeamMemberDTO.getTeamId())); if (num > 0) { if (count == 1) { //只存在一个团队中直接删除 this.baseMapper.deleteById(deleteTeamMemberDTO.getId()); // 删除用户信息缓存 userService.deleteUserCashByPhone(comFmsTeamMember.getPhone()); } else { //存在多个团队中，删除与该团队关联 ComFmsTeam fmsTeam = comFmsTeamDAO.selectById(deleteTeamMemberDTO.getTeamId()); String cascadeIds = comFmsTeamMember.getCascadeIds(); List<List> lists = JSONArray.parseArray(cascadeIds, List.class); List<List> collect = lists.stream().filter(e -> !e.toString().equals(Arrays.asList(fmsTeam.getTeamType(), fmsTeam.getId()).toString())).collect(Collectors.toList()); comFmsTeamMember.setCascadeIds(collect.toString()); this.baseMapper.updateById(comFmsTeamMember); } return R.ok(); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComFmsServiceMapper.xml
@@ -104,13 +104,13 @@ LEFT JOIN sys_user t2 ON t1.user_id = t2.user_id WHERE t1.community_id = #{adminDTO.communityId} <if test="adminDTO.dealStatus != null and adminDTO.dealStatus == 1"> AND t1.member_id = #{adminDTO.memberId} AND t1.member_id = #{adminDTO.memberId} AND t1.service_status = 2 </if> <if test="adminDTO.dealStatus != null and adminDTO.dealStatus == 2"> AND t1.service_status = 1 </if> <if test="adminDTO.dealStatus != null and adminDTO.dealStatus == 3"> AND t1.service_status = 4 AND t1.service_status IN (3,4) </if> ORDER BY t1.created_at DESC </select> springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComFmsTeamMemberMapper.xml
@@ -74,7 +74,7 @@ </select> <select id="exportTeamMember" resultType="com.panzhihua.common.model.vos.community.fms.ComFmsTeamMemberExportExcelVO"> SELECT t4.`name` AS teamTypeName, t3.`name` AS teamName, t2.`name` AS teamMember, t2.id_card, t2.phone, SELECT t4.`name` AS teamType, t3.`name` AS teamName, t2.`name` AS teamMember, t2.id_card, t2.phone, CASE WHEN t2.gender = 1 THEN '男' springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
@@ -1332,4 +1332,13 @@ return userService.bindOrAddMcsUser(bindUserPhoneDTO); } /** * 删除用户信息缓存 * @param phone */ @DeleteMapping("/deleteUserCashByPhone") public R deleteUserCashByPhone(@RequestParam("phone") String phone) { return userService.deleteUserCashByPhone(phone); } } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
@@ -820,4 +820,10 @@ * @return */ R updateStreetId(AdministratorsUserVO administratorsUserVO); /** * 删除用户信息缓存 * @param phone */ R deleteUserCashByPhone(String phone); } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -2955,6 +2955,20 @@ } /** * 删除用户信息缓存 * @param phone */ @Override public R deleteUserCashByPhone(String phone) { SysUserDO sysUserDO = this.userDao.selectOne(new LambdaQueryWrapper<SysUserDO>().eq(SysUserDO::getPhone, phone).eq(SysUserDO::getType, 1)); if (nonNull(sysUserDO)) { String userKey = UserConstants.LOGIN_USER_INFO + sysUserDO.getUserId(); stringRedisTemplate.delete(userKey); } return R.ok(); } /** * 微商业街新增商家账号 * @param mcsMerchantDTO * @return 商家用户id
