Merge branch 'feat-taxhelperPA-20211228'

# Conflicts:
#	hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/ApiController.java
#	hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmDaDrugEntServiceImpl.java

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/vo/UserVO.java

@@ -30,6 +30,7 @@ import lombok.Data;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author hnqz
@@ -243,4 +244,10 @@ public class UserVO implements Serializable {
 	@ApiModelProperty(value="税邦云协议签署")
 	private Integer taxHelperAgreementSignature;
 
+	/**
+	 * 结算主体和通道
+	 */
+	@ApiModelProperty(value="结算主体类型")
+	private Map<String, Integer> subjectTypeAndChannel;
+
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/ApiController.java

@@ -729,6 +729,13 @@ public class ApiController {
 				// 判断是否有配置医院拜访的任务类型模板
 				mapOne.put("checkHospitalTemplate", wmDeptTaskTypeTemplateService.checkDeptIdHospitalTemplate(sysU.getDeptId()));
 
+				// 结算通道
+
+				Map<String, Integer> collect = sysDeptSubService.list(Wrappers.<SysDeptSub>lambdaQuery().eq(SysDeptSub::getDeptId, sysU.getDeptId()))
+						.stream()
+						.collect(Collectors.toMap(SysDeptSub::getSubjectType, SysDeptSub::getSubjectChannel));
+				mapOne.put("subjectTypeAndChannel", collect);
+
 				list.add(mapOne);
 
 				roleList.addAll(roleIdList);
@@ -2609,18 +2616,24 @@ public class ApiController {
 					config.setAppSecrete(deptSub.getAppSecret());
 					config.setQueryUrl(deptSub.getQueryUrl());
 
+
 					TaxHelperAddMemberModel model = new TaxHelperAddMemberModel(config);
 					model.setIdCard(userUpdateInput.getIdCardNumber());
-					model.setType(Integer.parseInt(deptSub.getSubjectUserType()));
 					model.setPhone(sysUser.getUsername());
+					model.setType(Integer.parseInt(deptSub.getSubjectUserType()));
 					model.setName(sysUser.getRealname());
 					model.setNotifyUrl("http://localhost:8808");
-
+					boolean isPingAnBank = StrUtil.isNotEmpty(userUpdateInput.getBankCardNumber());
+					if (isPingAnBank){
+						model.setPayAccount(userUpdateInput.getBankCardNumber());
+					}
 					model.setEnterpriseCode(sysDept.getTaxCode());
 					if (StringUtils.isEmpty(model.getEnterpriseCode())) {
+
 						errorMap.put(SubjectTypeEnum.TYPE_SHUIBANGYUN, "未配置企业的统一社会信用代码");
 						continue;
 					}
+
 					TaxHelperAddMemberRequest request = new TaxHelperAddMemberRequest(model);
 					TaxHelperResponse response = taxHelperService.addMembers(request);
 
@@ -2632,15 +2645,16 @@ public class ApiController {
 					record.setMessage(StringUtils.isNotEmpty(response.getMessage()) ? response.getMessage() : "无");
 					record.setStatus(null);
 					record.setSubjectType(1);
-					record.setMethod("增员");
+					record.setMethod(isPingAnBank ? "增员(平安银行)" : "增员");
 					record.setUserId(sysUser.getUserId());
 					sysCertResultRecordMapper.insert(record);
 
 					if (response.success()) {
-						sysUser.setCertStatus(TaxHelperCertStatus.ADD_MEMBER.getCode());
+						sysUser.setCertStatus(isPingAnBank? TaxHelperCertStatus.UNCHECKED_BIND.getCode() : TaxHelperCertStatus.ADD_MEMBER.getCode());
 					} else {
 						log.info("税邦云增员失败：{},{}，原因是：{}", sysUser.getRealname(), sysUser.getUsername(), response.getMessage());
 						userUpdateInput.setIdCardNumber(null);
+						userUpdateInput.setBankCardNumber(null);
 						errorMap.put(SubjectTypeEnum.TYPE_SHUIBANGYUN, "税邦云增员失败");
 					}
 				}
@@ -2656,10 +2670,12 @@ public class ApiController {
 		sysUser.setAvatar(userUpdateInput.getAvatar());
 		if (StringUtils.isNotEmpty(userUpdateInput.getIdCardNumber())) {
 			sysUser.setIdCardNumber(userUpdateInput.getIdCardNumber());
+
 		}
 		// 姓名去除空格（包括字符之间的所有空格都会去除）
 		sysUser.setRealname(StrUtil.cleanBlank(userUpdateInput.getRealname()));
 		sysUser.setUserSign(userUpdateInput.getUserSign());
+		sysUser.setBankCardNumber(userUpdateInput.getBankCardNumber());
 		if (StringUtils.isNotEmpty(userUpdateInput.getTaxHelperAgreementSignature())) {
 			sysUser.setTaxHelperAgreementSignature(StringUtils.equals(SignatureStatusEnum.SIGNED.name(), userUpdateInput
 					.getTaxHelperAgreementSignature()) ? 1 : 0);

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/SysUserController.java

@@ -40,12 +40,14 @@ import com.qunzhixinxi.hnqz.admin.api.entity.SysUser;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysUserRole;
 import com.qunzhixinxi.hnqz.admin.api.vo.UserVO;
 import com.qunzhixinxi.hnqz.admin.config.UpmsConfig;
+import com.qunzhixinxi.hnqz.admin.entity.SysDeptSub;
 import com.qunzhixinxi.hnqz.admin.entity.dto.CommonUserDTO;
 import com.qunzhixinxi.hnqz.admin.entity.input.UserCertificationInput;
 import com.qunzhixinxi.hnqz.admin.entity.model.excel.CommonUserExcelModel;
 import com.qunzhixinxi.hnqz.admin.enums.SubjectTypeEnum;
 import com.qunzhixinxi.hnqz.admin.mapper.*;
 import com.qunzhixinxi.hnqz.admin.service.SysDeptService;
+import com.qunzhixinxi.hnqz.admin.service.SysDeptSubService;
 import com.qunzhixinxi.hnqz.admin.service.SysUserService;
 import com.qunzhixinxi.hnqz.admin.service.WmDaAgentService;
 import com.qunzhixinxi.hnqz.admin.service.WmDaDrugEntService;
@@ -90,17 +92,10 @@ public class SysUserController {
 
 	private final SysUserService userService;
 	private final SysDeptService sysDeptService;
-	private final SysDeptMapper sysDeptMapper;
+	private final SysDeptSubService sysDeptSubService;
 	private final SysUserMapper sysUserMapper;
 	private final RedisTemplate redisTemplate;
-	private final DingService dingService;
-	private final UpmsConfig upmsConfig;
 	private final SysUserRoleMapper sysUserRoleMapper;
-	private final SysRoleMapper sysRoleMapper;
-	private final TaxHelperService taxHelperService;
-	private final WmDaAgentService wmDaAgentService;
-	private final WmDaDrugEntService wmDaDrugEntService;
-	private final SysCertResultRecordMapper sysCertResultRecordMapper;
 	private final QccService qccService;
 
 
@@ -301,7 +296,7 @@ public class SysUserController {
 		 * @Version: v2021.4.16
 		 * @Author: ryz
 		 * @Date: 2021/5/6
-		*/
+		 */
 		if (userDto.getRole().contains(6) || userDto.getRole().contains(10)) {
 			Map<String, String> params = new HashMap<>();
 			params.put("searchKey", sysDept.getName());
@@ -311,15 +306,15 @@ public class SysUserController {
 			if (qccRes.isSuccess()) {
 				for (EmployeeGetListDataItem item : qccRes.getResult()) {
 					if (userDto.getRealname().equals(item.getName())) {
-						if(userDto.getRole().contains(10)){
-							return R.failed(String.format("%s为该公司%s，不能为兼职CRC",item.getName(),item.getJob()));
-						}else{
-							return R.failed(String.format("%s为该公司%s，不能为兼职学术推广员",item.getName(),item.getJob()));
+						if (userDto.getRole().contains(10)) {
+							return R.failed(String.format("%s为该公司%s，不能为兼职CRC", item.getName(), item.getJob()));
+						} else {
+							return R.failed(String.format("%s为该公司%s，不能为兼职学术推广员", item.getName(), item.getJob()));
 						}
 
 					}
 				}
-				if(null != qccRes.getPaging()){
+				if (null != qccRes.getPaging()) {
 					PageInfo qccPage = qccRes.getPaging();
 					// 需要分页查询
 					if (qccPage.getTotalRecords() > qccPage.getPageIndex() * qccPage.getPageSize()) {
@@ -331,10 +326,10 @@ public class SysUserController {
 							if (qccRes.isSuccess()) {
 								for (EmployeeGetListDataItem item : qccRes.getResult()) {
 									if (userDto.getRealname().equals(item.getName())) {
-										if(userDto.getRole().contains(10)){
-											return R.failed(String.format("%s为该公司%s，不能为兼职CRC",item.getName(),item.getJob()));
-										}else{
-											return R.failed(String.format("%s为该公司%s，不能为兼职学术推广员",item.getName(),item.getJob()));
+										if (userDto.getRole().contains(10)) {
+											return R.failed(String.format("%s为该公司%s，不能为兼职CRC", item.getName(), item.getJob()));
+										} else {
+											return R.failed(String.format("%s为该公司%s，不能为兼职学术推广员", item.getName(), item.getJob()));
 										}
 									}
 								}
@@ -348,7 +343,7 @@ public class SysUserController {
 			}
 		}
 
-		if(ArrayUtils.contains(sysDept.getSubjectType(),SubjectTypeEnum.TYPE_SHUIBANGYUN.getCode())){
+		if (ArrayUtils.contains(sysDept.getSubjectType(), SubjectTypeEnum.TYPE_SHUIBANGYUN.getCode())) {
 			userDto.setCertStatus(TaxHelperCertStatus.UN_CERT.getCode());
 		}
 
@@ -606,7 +601,7 @@ public class SysUserController {
 	@SysLog("批量导入用户")
 	@PostMapping(value = "/batch")
 	@PreAuthorize("@pms.hasPermission('sys_user_add')")
-	public R batchUser(@RequestExcel List<CommonUserExcelModel> commonUserExcelModelList){
+	public R batchUser(@RequestExcel List<CommonUserExcelModel> commonUserExcelModelList) {
 
 		// 参数校验
 		if (CollectionUtils.isEmpty(commonUserExcelModelList)) {
@@ -1157,15 +1152,15 @@ public class SysUserController {
 					if (qccRes.isSuccess()) {
 						for (EmployeeGetListDataItem item : qccRes.getResult()) {
 							if (userDto.getRealname().equals(item.getName())) {
-								if(userDto.getRole().contains(10)){
-									return R.failed(String.format("%s为该公司%s，不能为兼职CRC",item.getName(),item.getJob()));
-								}else{
-									return R.failed(String.format("%s为该公司%s，不能为兼职学术推广员",item.getName(),item.getJob()));
+								if (userDto.getRole().contains(10)) {
+									return R.failed(String.format("%s为该公司%s，不能为兼职CRC", item.getName(), item.getJob()));
+								} else {
+									return R.failed(String.format("%s为该公司%s，不能为兼职学术推广员", item.getName(), item.getJob()));
 								}
 
 							}
 						}
-						if(null != qccRes.getPaging()){
+						if (null != qccRes.getPaging()) {
 							PageInfo qccPage = qccRes.getPaging();
 							// 需要分页查询
 							if (qccPage.getTotalRecords() > qccPage.getPageIndex() * qccPage.getPageSize()) {
@@ -1176,10 +1171,10 @@ public class SysUserController {
 									qccRes = qccService.getList(params);
 									if (qccRes.isSuccess()) {
 										for (EmployeeGetListDataItem item : qccRes.getResult()) {
-											if(userDto.getRole().contains(10)){
-												return R.failed(String.format("%s为该公司%s，不能为兼职CRC",item.getName(),item.getJob()));
-											}else{
-												return R.failed(String.format("%s为该公司%s，不能为兼职学术推广员",item.getName(),item.getJob()));
+											if (userDto.getRole().contains(10)) {
+												return R.failed(String.format("%s为该公司%s，不能为兼职CRC", item.getName(), item.getJob()));
+											} else {
+												return R.failed(String.format("%s为该公司%s，不能为兼职学术推广员", item.getName(), item.getJob()));
 											}
 										}
 									} else {
@@ -1299,10 +1294,10 @@ public class SysUserController {
 								if (sysRole.getRoleId() == 3) {
 									return R.failed("用户不能同时为药企管理员和经销商管理员");
 								}
-								if(!userDto.getUserId().equals(userVO.getUserId()) && sysRole.getRoleId() == 4){
+								if (!userDto.getUserId().equals(userVO.getUserId()) && sysRole.getRoleId() == 4) {
 									return R.failed("用户已存在CSO管理员角色,不能维护为其他经销商组织的CSO管理员角色");
 								}
-								if(!userDto.getUserId().equals(userVO.getUserId()) && sysRole.getRoleId() == 9){
+								if (!userDto.getUserId().equals(userVO.getUserId()) && sysRole.getRoleId() == 9) {
 									return R.failed("用户已存在CRO管理员角色,不能维护为其他经销商组织的CSO管理员角色");
 								}
 							}
@@ -1326,10 +1321,10 @@ public class SysUserController {
 								if (sysRole.getRoleId() == 3) {
 									return R.failed("用户不能同时为药企管理员和CRO管理员");
 								}
-								if(!userDto.getUserId().equals(userVO.getUserId()) && sysRole.getRoleId() == 4){
+								if (!userDto.getUserId().equals(userVO.getUserId()) && sysRole.getRoleId() == 4) {
 									return R.failed("用户已存在CSO管理员角色,不能维护为其他经销商组织的CRO管理员角色");
 								}
-								if(!userDto.getUserId().equals(userVO.getUserId()) && sysRole.getRoleId() == 9){
+								if (!userDto.getUserId().equals(userVO.getUserId()) && sysRole.getRoleId() == 9) {
 									return R.failed("用户已存在CRO管理员角色,不能维护为其他经销商组织的CRO管理员角色");
 								}
 							}
@@ -1337,7 +1332,7 @@ public class SysUserController {
 					}
 				}
 
-			}else if (userDto.getRole().contains(6)) {
+			} else if (userDto.getRole().contains(6)) {
 				UserDTO userDTO = new UserDTO();
 				userDTO.setPlatId(userDto.getUsername());
 				userDTO.setDelFlag("0");
@@ -1433,19 +1428,31 @@ public class SysUserController {
 	 */
 	@GetMapping("/selectUserList")
 	public R selectUserList(Page page, UserDTO userDTO) {
-		if(!"0".equals(userDTO.getSubType()) && !"1".equals(userDTO.getSubType())){
+		if (!"0".equals(userDTO.getSubType()) && !"1".equals(userDTO.getSubType())) {
 			userDTO.setSubType(null);
 		}
 
 		IPage<UserVO> userVosPage = userService.selectUserList(page, userDTO);
-		if("0".equals(userDTO.getSubType())){
-			List<UserVO> userDTOList = userVosPage.getRecords();
-			userDTOList.forEach(item->item.setCertStatus(null));
-		}
-		if("1".equals(userDTO.getSubType())){
-			List<UserVO> userDTOList = userVosPage.getRecords();
-			userDTOList.forEach(item->item.setRljCertStatus(null));
-		}
+
+		// 封装结算通道
+		Set<Integer> deptIds = userVosPage.getRecords().stream().map(UserVO::getDeptId).collect(Collectors.toSet());
+
+		Map<Integer, Map<String, Integer>> coll = sysDeptSubService.list(Wrappers.<SysDeptSub>lambdaQuery().in(SysDeptSub::getDeptId, deptIds))
+				.stream()
+				.collect(Collectors.groupingBy(SysDeptSub::getDeptId, Collectors.toMap(SysDeptSub::getSubjectType, SysDeptSub::getSubjectChannel)));
+
+		userVosPage.getRecords().forEach(item -> {
+			if ("0".equals(userDTO.getSubType())) {
+				item.setCertStatus(null);
+			} else if ("1".equals(userDTO.getSubType())) {
+				item.setRljCertStatus(null);
+			}
+
+			item.setSubjectTypeAndChannel(coll.get(item.getDeptId()));
+
+		});
+
+
 		return R.ok(userVosPage);
 	}
 
@@ -1612,7 +1619,7 @@ public class SysUserController {
 	public R listNoScopeAll(Page page, UserDTO userDTO) {
 		page.setSize(10000);
 		QueryWrapper<SysUser> queryWrapper = null;
-		if (userDTO.getDeptId() != null){
+		if (userDTO.getDeptId() != null) {
 			SysUser sysUser = new SysUser();
 			sysUser.setDeptId(userDTO.getDeptId());
 			queryWrapper = Wrappers.query(sysUser);

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/mapper/WmDaDrugEntMapper.java

@@ -43,7 +43,7 @@ public interface WmDaDrugEntMapper extends DataScopeMapper<WmDaDrugEnt> {
 	 * @param wmDaDrugEnt 实体对象
 	 * @return 分页列表
 	 */
-	IPage<List<WmDaDrugEnt>> selectPage(Page page, @Param("query") WmDaDrugEnt wmDaDrugEnt);
+	IPage<WmDaDrugEnt> selectPage(Page page, @Param("query") WmDaDrugEnt wmDaDrugEnt);
 
 	List<WmDaDrugEnt> selectByDrugId(WmDaDrugEnt wmDaDrugEnt);
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/WmDaDrugEntService.java

@@ -65,5 +65,5 @@ public interface WmDaDrugEntService extends IService<WmDaDrugEnt> {
 	 * @param wmDaDrugEnt 实体对象
 	 * @return 分页列表
 	 */
-	IPage<List<WmDaDrugEnt>> selectPage(Page page, WmDaDrugEnt wmDaDrugEnt);
+	IPage<WmDaDrugEnt> selectPage(Page page, WmDaDrugEnt wmDaDrugEnt);
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmDaAgentServiceImpl.java

@@ -544,19 +544,23 @@ public class WmDaAgentServiceImpl extends ServiceImpl<WmDaAgentMapper, WmDaAgent
 					.eq(SysDeptSub::getDeptId,sysDept.getDeptId())
 					.set(SysDeptSub::getEnableFlag, SubjectTypeEnum.ENABLE_FLAG_FALSE.getCode()));
 
-			for (String subType : wmDaAgent.getSubjectType()) {
+			for (Map.Entry<String, Integer> entry : wmDaAgent.getSubjectTypeAndChannel().entrySet()){
 				SysDeptSub condition = new SysDeptSub();
 				condition.setDeptId(sysDept.getDeptId());
-				condition.setSubjectType(subType);
+				condition.setSubjectType(entry.getKey());
+				condition.setSubjectChannel(entry.getValue());
 				SysDeptSub existSub = sysDeptSubMapper.selectOne(Wrappers.query(condition));
 				if(null != existSub){
 					existSub.setEnableFlag(SubjectTypeEnum.ENABLE_FLAG_TRUE.getCode());
+					existSub.setUpdateTime(LocalDateTime.now());
 					sysDeptSubMapper.updateById(existSub);
 				}else {
 					existSub = new SysDeptSub();
 					existSub.setEnableFlag(SubjectTypeEnum.ENABLE_FLAG_TRUE.getCode());
 					existSub.setDeptId(sysDept.getDeptId());
-					existSub.setSubjectType(subType);
+					condition.setSubjectType(entry.getKey());
+					condition.setSubjectChannel(entry.getValue());
+					existSub.setUpdateTime(LocalDateTime.now());
 					sysDeptSubMapper.insert(existSub);
 				}
 			}

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmDaDrugEntServiceImpl.java

@@ -81,25 +81,17 @@ public class WmDaDrugEntServiceImpl extends ServiceImpl<WmDaDrugEntMapper, WmDaD
 			 */
 			if(sysDeptService.saveDept(sysDept) > 0){
 
-				// Map<String, Integer> subjectTypeAndChannel = entity.getSubjectTypeAndChannel();
-
-				// for (Map.Entry<String, Integer> entry : subjectTypeAndChannel.entrySet()){
-				// 	SysDeptSub deptSub = new SysDeptSub();
-				// 	deptSub.setDeptId(sysDept.getDeptId());
-				// 	deptSub.setSubjectChannel(entry.getValue());
-				// 	deptSub.setSubjectType(entry.getKey());
-				// 	deptSub.setEnableFlag(SubjectTypeEnum.ENABLE_FLAG_TRUE.getCode());
-				// 	deptSub.setUpdateTime(sysDept.getCreateTime());
-				// 	sysDeptSubMapper.insert(deptSub);
-				//
-				// }
-
-				for (String subType : entity.getSubjectType()) {
+				Map<String, Integer> subjectTypeAndChannel = entity.getSubjectTypeAndChannel();
+
+				for (Map.Entry<String, Integer> entry : subjectTypeAndChannel.entrySet()){
 					SysDeptSub deptSub = new SysDeptSub();
 					deptSub.setDeptId(sysDept.getDeptId());
-					deptSub.setSubjectType(subType);
+					deptSub.setSubjectChannel(entry.getValue());
+					deptSub.setSubjectType(entry.getKey());
 					deptSub.setEnableFlag(SubjectTypeEnum.ENABLE_FLAG_TRUE.getCode());
+					deptSub.setUpdateTime(sysDept.getCreateTime());
 					sysDeptSubMapper.insert(deptSub);
+
 				}
 
 				return true;
@@ -138,21 +130,20 @@ public class WmDaDrugEntServiceImpl extends ServiceImpl<WmDaDrugEntMapper, WmDaD
 
 	@Override
 	public boolean saveDrugEnts(WmDaDrugEnt entity) {
-		Integer deptId = Integer.parseInt(System.currentTimeMillis() / 1000 + "");
-		entity.setDeptId(deptId + "");
+
+		entity.setDeptId(String.valueOf(System.currentTimeMillis() / 1000));
 		entity.setCreateTime(LocalDateTime.now());
-		boolean isSave = super.save(entity);
-		if (isSave) {
+
+		if (super.save(entity)) {
 			SysDept sysDept = new SysDept();
-//			sysDept.setDeptId(deptId);
 			sysDept.setName(entity.getEntname());
 			sysDept.setLevel(2);
-//			return sysDeptService.saveDept(sysDept)>0?true:false;
 			sysDept.setSubjectType(entity.getSubjectType());
 			sysDept.setDeptPermissions(entity.getDeptPermissions());
 			sysDeptService.save(sysDept);
 			entity.setDeptId(String.valueOf(sysDept.getDeptId()));
 			wmDaDrugEntMapper.updateById(entity);
+
 			List<SysDeptRelation> newList = new ArrayList<>();
 			SysDeptRelation sysDeptRelation = new SysDeptRelation();
 			sysDeptRelation.setAncestor(SecurityUtils.getUser().getDeptId());
@@ -163,18 +154,18 @@ public class WmDaDrugEntServiceImpl extends ServiceImpl<WmDaDrugEntMapper, WmDaD
 			sysDeptRelation1.setDescendant(Integer.valueOf(entity.getDeptId()));
 			newList.add(sysDeptRelation1);
 			sysDeptRelationService.saveBatch(newList);
-			/**
-			 * @Modify: start
-			 * @Author: ryz
-			 * @Date: 2021/4/19
-			 */
-			for (String subType : entity.getSubjectType()) {
+
+			// 创建结算渠道和通道
+			for (Map.Entry<String, Integer> entry : entity.getSubjectTypeAndChannel().entrySet()){
 				SysDeptSub deptSub = new SysDeptSub();
 				deptSub.setDeptId(sysDept.getDeptId());
-				deptSub.setSubjectType(subType);
+				deptSub.setSubjectType(entry.getKey());
+				deptSub.setSubjectChannel(entry.getValue());
+				deptSub.setUpdateTime(LocalDateTime.now());
 				deptSub.setEnableFlag(SubjectTypeEnum.ENABLE_FLAG_TRUE.getCode());
 				sysDeptSubMapper.insert(deptSub);
 			}
+
 			return true;
 		}
 		return false;
@@ -208,18 +199,15 @@ public class WmDaDrugEntServiceImpl extends ServiceImpl<WmDaDrugEntMapper, WmDaD
 	 * @return 分页列表
 	 */
 	@Override
-	public IPage<List<WmDaDrugEnt>> selectPage(Page page, WmDaDrugEnt wmDaDrugEnt) {
-		IPage<List<WmDaDrugEnt>> listIPage = wmDaDrugEntMapper.selectPage(page, wmDaDrugEnt);
-
-		// listIPage.getRecords().forEach(entList -> {
-		//
-		// 	entList.forEach( ent -> {
-		// 		Map<String, Integer> collect = sysDeptSubMapper.selectList(Wrappers.<SysDeptSub>lambdaQuery().eq(SysDeptSub::getDeptId, ent.getDeptId()))
-		// 				.stream()
-		// 				.collect(Collectors.toMap(SysDeptSub::getSubjectType, SysDeptSub::getSubjectChannel));
-		// 		ent.setSubjectTypeAndChannel(collect);
-		// 	});
-		// });
+	public IPage<WmDaDrugEnt> selectPage(Page page, WmDaDrugEnt wmDaDrugEnt) {
+		IPage<WmDaDrugEnt> listIPage = wmDaDrugEntMapper.selectPage(page, wmDaDrugEnt);
+
+		listIPage.getRecords().forEach(ent -> {
+				Map<String, Integer> collect = sysDeptSubMapper.selectList(Wrappers.<SysDeptSub>lambdaQuery().eq(SysDeptSub::getDeptId, ent.getDeptId()))
+						.stream()
+						.collect(Collectors.toMap(SysDeptSub::getSubjectType, SysDeptSub::getSubjectChannel));
+				ent.setSubjectTypeAndChannel(collect);
+		});
 
 		return listIPage;
 	}

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmScorePackageSettleNoteServiceImpl.java

@@ -616,7 +616,7 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 		} else {
 			if (!Objects.equals(noteList.size(), noteIdList.size())) {
 				// 删除锁
-				redisTemplate.delete(noteIdList);
+				noteIdList.forEach(id -> redisTemplate.delete(CacheConstants.SETTLE_PACKAGE_KEY + ":note_id_" + id));
 				log.error("当前用户存在其他结算请求");
 				return R.failed("当前用户存在其他结算请求");
 			}

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/view/user/UserUpdateInput.java

@@ -2,6 +2,7 @@ package com.qunzhixinxi.hnqz.admin.view.user;
 
 
 import com.qunzhixinxi.hnqz.admin.api.enums.SignatureStatusEnum;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -50,4 +51,9 @@ public class UserUpdateInput {
 	private String taxHelperAgreementSignature;
 
 	private List<String> subList;
+
+	/**
+	 * 银行卡号
+	 */
+	private String bankCardNumber;
 }