Merge branch 'hotfix-renlijianotify-20220514'

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

@@ -621,12 +621,12 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 			if (userSub != null) {
 				SysUserSub updateUserSub = new SysUserSub();
 				updateUserSub.setId(userSub.getId());
-				updateUserSub.setCertStatus(Optional.ofNullable(sysUser.getRljCertStatus())
-						.orElseGet(RenlijiaCertStatus.CER_STATUS_4::getCode));
+				// 认证状态
+				Integer certStatus = Optional.ofNullable(sysUser.getRljCertStatus())
+						.orElseGet(RenlijiaCertStatus.CER_STATUS_4::getCode);
+				updateUserSub.setCertStatus(certStatus);
 				// 发起成功或认证成功，才修改CallbackStatus状态
-				if (sysUser.getRljCertStatus() != null
-						&& (RenlijiaCertStatus.CER_STATUS_1.getCode() == sysUser.getRljCertStatus()
-						|| RenlijiaCertStatus.CER_STATUS_3.getCode() == sysUser.getRljCertStatus())) {
+				if (RenlijiaCertStatus.CER_STATUS_3.getCode() == certStatus) {
 					updateUserSub.setCallbackStatus(GigCallBackStatus.IN_PROGRESS);
 				} else {
 					updateUserSub.setCallbackStatus(GigCallBackStatus.RETURNED);

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

@@ -9,6 +9,7 @@ import com.qunzhixinxi.hnqz.admin.api.constant.CacheConstants;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysUser;
 import com.qunzhixinxi.hnqz.admin.entity.*;
 import com.qunzhixinxi.hnqz.admin.entity.input.SettleNoteStatusOutput;
+import com.qunzhixinxi.hnqz.admin.enums.GigCallBackStatus;
 import com.qunzhixinxi.hnqz.admin.enums.GigTypeEnum;
 import com.qunzhixinxi.hnqz.admin.enums.RenlijiaCertStatus;
 import com.qunzhixinxi.hnqz.admin.mapper.WmSettleAccountReceiveMapper;
@@ -203,6 +204,8 @@ public class WmSettlementServiceImpl implements WmSettlementService {
 			SysUserSub updateUserSub = new SysUserSub();
 			updateUserSub.setId(userSub.getId());
 			updateUserSub.setCertRemark(item.getRemark());
+			updateUserSub.setCertStatus(item.getStatus());
+			updateUserSub.setCallbackStatus(GigCallBackStatus.RETURNED);
 			updateUserSub.setUpdateTime(LocalDateTime.now());
 			updateUserSub.setUpdateUser(0);
 			sysUserSubService.updateById(updateUserSub);