feat: 回调失败同步置空阿拉钉、金园数科的身份照片

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/enums/GigTypeEnum.java

@@ -17,7 +17,7 @@ public enum GigTypeEnum {
 	// 零工平台类型
 	REN_LI_JIA(0, "人力家", "人力家"),
 	TAX_HELPOR(1, "税邦云", "税邦云"),
-	OLADING(2, "钉灵工", "海南飞亿"),
+	OLADING(2, "钉灵工", "钉灵工-海南飞亿"),
 	YEE(3, "易联数科", "易联数科"),
 	JIN_YUAN(4, "钉灵工", "金园数科");
 

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

@@ -12,6 +12,7 @@ import com.qunzhixinxi.hnqz.admin.entity.WmScorePackage;
 import com.qunzhixinxi.hnqz.admin.entity.WmScorePackageSettleNote;
 import com.qunzhixinxi.hnqz.admin.entity.dto.UserSignCertDTO;
 import com.qunzhixinxi.hnqz.admin.enums.GigCallBackStatus;
+import com.qunzhixinxi.hnqz.admin.enums.GigTypeEnum;
 import com.qunzhixinxi.hnqz.admin.enums.OladingCertStatus;
 import com.qunzhixinxi.hnqz.admin.service.SysUserSubService;
 import com.qunzhixinxi.hnqz.admin.service.WmScorePackageService;
@@ -314,7 +315,11 @@ public class GigThirdApiServiceImpl implements GigThirdApiService {
 			updateUserSubWrapper.set(SysUserSub::getIdCardFrontUrl, null);
 			updateUserSubWrapper.set(SysUserSub::getIdCardBackUrl, null);
 		}
-		updateUserSubWrapper.eq(SysUserSub::getId, userSub.getId());
+		updateUserSubWrapper.eq(SysUserSub::getUserId, userSub.getUserId());
+		updateUserSubWrapper.eq(SysUserSub::getDeptId, userSub.getDeptId());
+		// 同时修改自由职家、金园数科的状态和数据
+		updateUserSubWrapper.in(SysUserSub::getGigType, GigTypeEnum.OLADING, GigTypeEnum.JIN_YUAN);
+		updateUserSubWrapper.ne(SysUserSub::getCertStatus, Integer.parseInt(OladingCertStatus.CERT.getCode()));
 		updateUserSubWrapper.set(SysUserSub::getUpdateTime, LocalDateTime.now());
 		updateUserSubWrapper.set(SysUserSub::getUpdateUser, 0);
 		updateUserSubWrapper.set(SysUserSub::getCallbackStatus, GigCallBackStatus.RETURNED);
@@ -359,25 +364,43 @@ public class GigThirdApiServiceImpl implements GigThirdApiService {
 		}
 
 		Map<String, String> subMap = new HashMap<>();
-		SysUserSub updateUserSub = new SysUserSub();
+//		SysUserSub updateUserSub = new SysUserSub();
+		LambdaUpdateWrapper<SysUserSub> updateUserSubWrapper = Wrappers.lambdaUpdate();
 		if (OladingCommonRequest.UploadTaxpayerAgreementStatus.SUCCESS.equals(agreementStatus)) {
 			subMap.put("certStatus", OladingCertStatus.CERT.name());
-			updateUserSub.setCertStatus(Integer.valueOf(OladingCertStatus.CERT.getCode()));
+//			updateUserSub.setCertStatus(Integer.valueOf(OladingCertStatus.CERT.getCode()));
+			updateUserSubWrapper.set(SysUserSub::getCertStatus, Integer.valueOf(OladingCertStatus.CERT.getCode()));
 		} else {
 			subMap.put("certStatus", OladingCertStatus.SIGNED.name());
-			updateUserSub.setCertStatus(Integer.valueOf(OladingCertStatus.SIGNED.getCode()));
+//			updateUserSub.setCertStatus(Integer.valueOf(OladingCertStatus.SIGNED.getCode()));
+			updateUserSubWrapper.set(SysUserSub::getCertStatus, Integer.valueOf(OladingCertStatus.SIGNED.getCode()));
 		}
-		updateUserSub.setId(userSub.getId());
-		updateUserSub.setCallbackStatus(GigCallBackStatus.RETURNED);
-		updateUserSub.setUpdateTime(LocalDateTime.now());
-		updateUserSub.setUpdateUser(0);
+//		updateUserSub.setId(userSub.getId());
+//		updateUserSub.setCallbackStatus(GigCallBackStatus.RETURNED);
+//		updateUserSub.setUpdateTime(LocalDateTime.now());
+//		updateUserSub.setUpdateUser(0);
+//		if ("0".equals(req.getCode())) {
+//			updateUserSub.setFailReason(String.valueOf(req.getData().get("failReason")));
+//		} else {
+//			updateUserSub.setFailReason(req.getMessage());
+//		}
+		// 更新状态
+//		sysUserSubService.updateById(updateUserSub);
+		updateUserSubWrapper.eq(SysUserSub::getUserId, userSub.getUserId());
+		updateUserSubWrapper.eq(SysUserSub::getDeptId, userSub.getDeptId());
+		// 同时修改自由职家、金园数科的状态和数据
+		updateUserSubWrapper.in(SysUserSub::getGigType, GigTypeEnum.OLADING, GigTypeEnum.JIN_YUAN);
+		updateUserSubWrapper.ne(SysUserSub::getCertStatus, Integer.parseInt(OladingCertStatus.CERT.getCode()));
+		updateUserSubWrapper.set(SysUserSub::getUpdateTime, LocalDateTime.now());
+		updateUserSubWrapper.set(SysUserSub::getUpdateUser, 0);
+		updateUserSubWrapper.set(SysUserSub::getCallbackStatus, GigCallBackStatus.RETURNED);
 		if ("0".equals(req.getCode())) {
-			updateUserSub.setFailReason(String.valueOf(req.getData().get("failReason")));
+			updateUserSubWrapper.set(SysUserSub::getFailReason, String.valueOf(req.getData().get("failReason")));
 		} else {
-			updateUserSub.setFailReason(req.getMessage());
+			updateUserSubWrapper.set(SysUserSub::getFailReason, req.getMessage());
 		}
 		// 更新状态
-		sysUserSubService.updateById(updateUserSub);
+		sysUserSubService.update(updateUserSubWrapper);
 
 		// 结果放到redis
 		String key = CacheConstants.USER_SIGN_CERT_RESPONSE_KEY + userSub.getUserId();

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

@@ -372,7 +372,7 @@ public class SysUserSignCertServiceImpl implements SysUserSignCertService {
 				}
 
 				// 如果存在相同手机号、身份证、姓名信息的用户，并且是认证过，则不发起，直接返回签约认证状态
-				if (checkExistCerted(sysUser, userSub)) {
+				if (this.checkExistCerted(sysUser, userSub)) {
 					// 直接返回，不发起
 					return false;
 				}
@@ -383,7 +383,7 @@ public class SysUserSignCertServiceImpl implements SysUserSignCertService {
 				return true;
 			case OLADING:
 				// 如果存在相同手机号、身份证、姓名信息的用户，并且是认证过，则不发起，直接返回签约认证状态
-				if (checkExistCerted(sysUser, userSub)) {
+				if (this.checkExistCerted(sysUser, userSub)) {
 					// 直接返回，不发起
 					return false;
 				}