Merge branch 'hotfix-20220720-wenwenusersub'

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

@@ -16,6 +16,7 @@ import com.qunzhixinxi.hnqz.admin.config.TaxNotifyConfig;
 import com.qunzhixinxi.hnqz.admin.entity.MonitoringIndicator;
 import com.qunzhixinxi.hnqz.admin.entity.SysCertResultRecord;
 import com.qunzhixinxi.hnqz.admin.entity.SysDeptSub;
+import com.qunzhixinxi.hnqz.admin.entity.SysUserSub;
 import com.qunzhixinxi.hnqz.admin.entity.WmScorePackage;
 import com.qunzhixinxi.hnqz.admin.entity.WmScorePackageSettleNote;
 import com.qunzhixinxi.hnqz.admin.entity.WmScorePackageStatus;
@@ -41,6 +42,9 @@ import com.qunzhixinxi.hnqz.admin.entity.input.TaskSettleInfo;
 import com.qunzhixinxi.hnqz.admin.entity.output.SettleAmountMonitorOutput;
 import com.qunzhixinxi.hnqz.admin.enums.ChannelEnum;
 import com.qunzhixinxi.hnqz.admin.enums.DelEnum;
+import com.qunzhixinxi.hnqz.admin.enums.GigCallBackStatus;
+import com.qunzhixinxi.hnqz.admin.enums.GigChannelEnum;
+import com.qunzhixinxi.hnqz.admin.enums.GigTypeEnum;
 import com.qunzhixinxi.hnqz.admin.enums.LockEnum;
 import com.qunzhixinxi.hnqz.admin.enums.PackageFinishStatusEnum;
 import com.qunzhixinxi.hnqz.admin.enums.ScorePackageStatusEnum;
@@ -53,6 +57,7 @@ import com.qunzhixinxi.hnqz.admin.service.SysDeptService;
 import com.qunzhixinxi.hnqz.admin.service.SysDeptSubService;
 import com.qunzhixinxi.hnqz.admin.service.SysUserRoleService;
 import com.qunzhixinxi.hnqz.admin.service.SysUserService;
+import com.qunzhixinxi.hnqz.admin.service.SysUserSubService;
 import com.qunzhixinxi.hnqz.admin.service.WmScorePackageService;
 import com.qunzhixinxi.hnqz.admin.service.WmScorePackageSettleNoteService;
 import com.qunzhixinxi.hnqz.admin.service.WmScorePackageStatusService;
@@ -190,6 +195,8 @@ public class PartyAServiceImpl implements PartyAService {
 
 	private final UserAgreementSignatureRecordMapper userAgreementSignatureRecordMapper;
 
+	private final SysUserSubService sysUserSubService;
+
 	/**
 	 * 税邦云增员
 	 *
@@ -262,6 +269,9 @@ public class PartyAServiceImpl implements PartyAService {
 			log.info("税邦云增员失败：{},{}，原因是：{}", member.getRealname(), member.getUsername(), response.getMessage());
 		}
 
+		// 更新userSub
+		this.updateUserSub(response, member);
+
 		log.info("{}：税邦云增员结束, 身份证号：{}", taxHelperAddMemberDTO.getUsername(), taxHelperAddMemberDTO.getIdNumber());
 		return getResultMap(CommonConstants.CLIENT_ERROR_CODE + "", response.getMessage());
 	}
@@ -1555,6 +1565,46 @@ public class PartyAServiceImpl implements PartyAService {
 		sysCertResultRecordMapper.insert(record);
 	}
 
+	/**
+	 * 更新usersub对应的税邦云认证状态
+	 *
+	 * @param response
+	 * @param updateUser
+	 */
+	private void updateUserSub(TaxHelperResponse response, SysUser updateUser) {
+		SysUserSub userSub = sysUserSubService.getOne(Wrappers.<SysUserSub>lambdaQuery()
+				.eq(SysUserSub::getUserId, updateUser.getUserId())
+				.eq(SysUserSub::getDeptId, updateUser.getDeptId())
+				.eq(SysUserSub::getGigType, GigTypeEnum.TAX_HELPOR));
+		LocalDateTime now = LocalDateTime.now();
+
+		Integer certStatus = response.success() ? TaxHelperCertStatus.ADD_MEMBER.getCode() : TaxHelperCertStatus.UN_CERT.getCode();
+		if (userSub != null) {
+			// 更新
+			SysUserSub updateUserSub = new SysUserSub();
+			updateUserSub.setId(userSub.getId());
+			updateUserSub.setCertRemark(response.getMessage());
+			updateUserSub.setCertStatus(certStatus);
+			updateUserSub.setCallbackStatus(GigCallBackStatus.RETURNED);
+			updateUserSub.setUpdateTime(now);
+			updateUserSub.setUpdateUser(0);
+			sysUserSubService.updateById(updateUserSub);
+		} else {
+			// 新增
+			SysUserSub saveUserSub = new SysUserSub();
+			saveUserSub.setDeptId(updateUser.getDeptId());
+			saveUserSub.setUserId(updateUser.getUserId());
+			saveUserSub.setGigType(GigTypeEnum.REN_LI_JIA);
+			saveUserSub.setGigChannel(GigChannelEnum.DEFAULT);
+			saveUserSub.setCertRemark(response.getMessage());
+			saveUserSub.setCertStatus(certStatus);
+			saveUserSub.setCallbackStatus(GigCallBackStatus.RETURNED);
+			saveUserSub.setCreateTime(now);
+			saveUserSub.setCreateUser(0);
+			sysUserSubService.save(saveUserSub);
+		}
+	}
+
 	/**
 	 * 积分包信息校验
 	 *