feat: 部分调整

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

@@ -382,7 +382,7 @@ public class SysUserSignCertServiceImpl implements SysUserSignCertService {
 		}
 		BaseMap gigInfo = new BaseMap();
 		userSubList.forEach(userSub -> {
-			// 更新银行预留手机号
+			// 更新银行预留手机号 TODO 改为回调之后更新手机号和银行卡
 			SysUserSub updateUserSub = new SysUserSub();
 			updateUserSub.setId(userSub.getId());
 			updateUserSub.setBankPhone(userSignCertDTO.getBankPhone());
@@ -396,14 +396,19 @@ public class SysUserSignCertServiceImpl implements SysUserSignCertService {
 			SysDept dept = sysDeptService.getById(sysUser.getDeptId());
 			// 封装请求数据
 			if (GigTypeEnum.TAX_HELPOR.equals(userSub.getGigType())) {
-				gigInfo.put(userSub.getGigType().name(), this.buildTaxHelperBindCardConfirmModel(sysUser, userSub, dept));
+				gigInfo.put(userSub.getGigType().name(), this.buildTaxHelperBindCardConfirmModel(sysUser, userSub, dept, userSignCertDTO.getVerifyCode()));
 			} else if (GigTypeEnum.YEE.equals(userSub.getGigType())) {
 				gigInfo.put(userSub.getGigType().name(), this.buildYeeBindCardConfirmModel(sysUser, userSub, dept));
+			} else if (GigTypeEnum.OLADING.equals(userSub.getGigType())) {
+				// TODO
+				gigInfo.put(userSub.getGigType().name(), this.buildOladingBindCardConfirmModel(sysUser, userSub, dept));
 			}
 		});
 
 		// 发送mq
-		rabbitMqClient.sendMessage(MqConstants.DIRECT_MODE_GIG_BANK_CARD_QUEUE, JSONUtil.toJsonStr(gigInfo));
+		if (CollUtil.isNotEmpty(gigInfo)) {
+			rabbitMqClient.sendMessage(MqConstants.DIRECT_MODE_GIG_BANK_CARD_QUEUE, JSONUtil.toJsonStr(gigInfo));
+		}
 	}
 
 	/**
@@ -412,14 +417,15 @@ public class SysUserSignCertServiceImpl implements SysUserSignCertService {
 	 * @param sysUser
 	 * @param userSub
 	 * @param dept
+	 * @param verifyCode
 	 * @return
 	 */
-	public GigInfoModel buildTaxHelperBindCardConfirmModel(SysUser sysUser, SysUserSub userSub, SysDept dept) {
+	private GigInfoModel buildTaxHelperBindCardConfirmModel(SysUser sysUser, SysUserSub userSub, SysDept dept, String verifyCode) {
 		// 基础信息
 		GigBaseInfoModel baseInfoModel = new GigBaseInfoModel();
 		baseInfoModel.setGigType(userSub.getGigType());
 		baseInfoModel.setGigChannel(userSub.getGigChannel());
-		baseInfoModel.setCaptcha("134679");
+		baseInfoModel.setCaptcha(verifyCode);
 		baseInfoModel.setNotifyUrl(taxNotifyConfig.getNotifyUrl());
 		// 用户信息
 		GigUserInfoModel userInfoModel = new GigUserInfoModel();
@@ -447,7 +453,38 @@ public class SysUserSignCertServiceImpl implements SysUserSignCertService {
 	 * @param dept
 	 * @return
 	 */
-	public GigInfoModel buildYeeBindCardConfirmModel(SysUser sysUser, SysUserSub userSub, SysDept dept) {
+	private GigInfoModel buildYeeBindCardConfirmModel(SysUser sysUser, SysUserSub userSub, SysDept dept) {
+		// 基础信息
+		GigBaseInfoModel baseInfoModel = new GigBaseInfoModel();
+		baseInfoModel.setGigChannel(userSub.getGigChannel());
+		baseInfoModel.setGigType(userSub.getGigType());
+		// 用户信息
+		GigUserInfoModel userInfoModel = new GigUserInfoModel();
+		userInfoModel.setName(sysUser.getRealname());
+		userInfoModel.setUsername(sysUser.getUsername());
+		userInfoModel.setEntCode(dept.getTaxCode());
+		userInfoModel.setIdCard(sysUser.getIdCardNumber());
+		userInfoModel.setBankPhone(userSub.getBankPhone());
+		userInfoModel.setBankCard(userSub.getBankCardNumber());
+		userInfoModel.setNewBankCard(userSub.getBankCardNumber());
+		userInfoModel.setAddress("北京市-房山区-长阳镇");
+
+		GigInfoModel infoModel = new GigInfoModel();
+		infoModel.setBaseInfo(baseInfoModel);
+		infoModel.setUserInfo(userInfoModel);
+
+		return infoModel;
+	}
+
+	/**
+	 * 封装自由职家换绑model
+	 *
+	 * @param sysUser
+	 * @param userSub
+	 * @param dept
+	 * @return
+	 */
+	private GigInfoModel buildOladingBindCardConfirmModel(SysUser sysUser, SysUserSub userSub, SysDept dept) {
 		// 基础信息
 		GigBaseInfoModel baseInfoModel = new GigBaseInfoModel();
 		baseInfoModel.setGigChannel(userSub.getGigChannel());