lixuesong 3 роки тому
батько
коміт
a4f30111f1

+ 2 - 2
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/mq/GigSignCertReceiver.java

@@ -389,18 +389,18 @@ public class GigSignCertReceiver extends BaseRabbiMqHandler<String> {
 			// 如果是已上传协议成功,则设置为已认证,否则还是已签约
 			if (OladingCommonRequest.UploadTaxpayerAgreementStatus.SUCCESS.name().equals(uploadTaxPayerAgreementStatus)) {
 				updateWrapper.set(SysUserSub::getCertStatus, Integer.parseInt(OladingCertStatus.CERT.getCode()));
+				updateWrapper.set(SysUserSub::getCallbackStatus, GigCallBackStatus.RETURNED);
 				certStatusMap.put("certStatus", OladingCertStatus.CERT.name());
 			} else {
 				updateWrapper.set(SysUserSub::getCertStatus, Integer.parseInt(OladingCertStatus.SIGNED.getCode()));
 				certStatusMap.put("certStatus", OladingCertStatus.SIGNED.name());
 			}
-			updateWrapper.set(SysUserSub::getCallbackStatus, GigCallBackStatus.RETURNED);
 		}
 		// 如果是签约中,则判断'阿拉丁签约方法'状态
 		if (OladingCommonRequest.SignUpStatus.SIGNING.name().equals(certStatus)) {
 			JSONObject stageResult = subjectResult.getJSONObject("stageResult");
 			JSONObject oladingSignUpResult = stageResult.getJSONObject("阿拉丁签约方法");
-			if (oladingSignUpResult == null || StrUtil.equals("1005", oladingSignUpResult.getStr("code"))) {
+			if (oladingSignUpResult != null && StrUtil.equals("1005", oladingSignUpResult.getStr("code"))) {
 				updateWrapper.set(SysUserSub::getCallbackStatus, GigCallBackStatus.RETURNED);
 			}
 		}