feat: 新增回调中状态

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/entity/SysUserSub.java

@@ -3,9 +3,9 @@ package com.qunzhixinxi.hnqz.admin.entity;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+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.UserSubCertStatusEnum;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -48,6 +48,11 @@ public class SysUserSub extends Model<SysUserSub> {
 	 */
 	private GigChannelEnum gigChannel;
 
+	/**
+	 * 回调状态
+	 */
+	private GigCallBackStatus callbackStatus;
+
 	/**
 	 * 认证状态
 	 */

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

@@ -0,0 +1,27 @@
+package com.qunzhixinxi.hnqz.admin.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 回调状态enum
+ *
+ * @author lixuesong
+ * @date 2022年03月18日 17:44
+ */
+@Getter
+@AllArgsConstructor
+public enum GigCallBackStatus {
+
+	// 回调状态
+	IN_PROGRESS(1, "进行中"),
+	RETURNED(2, "已返回");
+
+	@EnumValue
+	private int code;
+
+	private String desc;
+
+
+}

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

@@ -1,33 +0,0 @@
-package com.qunzhixinxi.hnqz.admin.enums;
-
-import com.baomidou.mybatisplus.annotation.EnumValue;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * {@code TaxHelperCertStatus} 税邦云认证枚举
- *
- * @author Hengchen.Sun
- * @author Li Xuesong
- * @version 1.0.0
- * @date 2021-02-24, 2022-03-02
- * @since ver.1.0.0
- */
-@Getter
-@AllArgsConstructor
-public enum UserSubCertStatusEnum {
-
-	// 认证状态
-	UN_CERT(10, "未认证"),                    // 未增员
-	ADD_MEMBER(11, "已增员"),                 // 未认证未绑卡
-	CHECKED_UNBIND(12, "已认证，未绑卡"),      // 已认证未绑卡
-	CHECKING_BIND(13, "认证中已绑卡"),         // 认证中已绑卡
-	CHECKING_UNBIND(14, "认证中未绑卡"),       // 认证中未绑卡
-	CERT(15, "已认证"),                    	 // 已认证已绑卡
-	UNCHECKED_BIND(16, "未认证已绑卡");        // 未认证已绑卡
-
-	@EnumValue
-	private int code;
-
-	private String desc;
-}

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

@@ -13,6 +13,7 @@ import com.qunzhixinxi.hnqz.admin.api.entity.SysUser;
 import com.qunzhixinxi.hnqz.admin.entity.SysUserSub;
 import com.qunzhixinxi.hnqz.admin.entity.dto.UserSignCertDTO;
 import com.qunzhixinxi.hnqz.admin.enums.DelEnum;
+import com.qunzhixinxi.hnqz.admin.enums.GigCallBackStatus;
 import com.qunzhixinxi.hnqz.admin.enums.GigTypeEnum;
 import com.qunzhixinxi.hnqz.admin.enums.LockEnum;
 import com.qunzhixinxi.hnqz.admin.enums.RenlijiaCertStatus;
@@ -95,6 +96,7 @@ public class GigSignCertReceiver extends BaseRabbiMqHandler<String> {
 							LambdaUpdateWrapper<SysUserSub> updateWrapper = Wrappers.<SysUserSub>lambdaUpdate()
 									.eq(SysUserSub::getUserId, user.getUserId())
 									.eq(SysUserSub::getDeptId, dept.getDeptId())
+									.set(SysUserSub::getCallbackStatus, GigCallBackStatus.RETURNED)
 									.set(SysUserSub::getUpdateTime, now)
 									.set(SysUserSub::getUpdateUser, 0)
 									.set(SysUserSub::getCertRemark, stageResult);

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

@@ -20,6 +20,7 @@ import com.qunzhixinxi.hnqz.admin.entity.model.GigBaseInfoModel;
 import com.qunzhixinxi.hnqz.admin.entity.model.GigInfoModel;
 import com.qunzhixinxi.hnqz.admin.entity.model.GigUserInfoModel;
 import com.qunzhixinxi.hnqz.admin.entity.vo.SysUserSubVO;
+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.MemberIDCardType;
@@ -302,7 +303,7 @@ public class SysUserSignCertServiceImpl implements SysUserSignCertService {
 		}
 		List<SysUserSub> userSubList = sysUserSubService.list(userSubWrapper);
 		if (CollUtil.isNotEmpty(userSubList)) {
-			// 封装请求数据 TODO 只把未认证或认证失败的发起认证
+			// 封装请求数据
 			BaseMap gigInfo = new BaseMap();
 			userSubList.stream()
 					.filter(sysUserSub -> {
@@ -362,6 +363,12 @@ public class SysUserSignCertServiceImpl implements SysUserSignCertService {
 				infoModel.setBaseInfo(baseInfoModel);
 				infoModel.setUserInfo(userInfoModel);
 				gigInfo.put(userSub.getGigType().name(), infoModel);
+
+				// 更新为进行中状态
+				SysUserSub updateUserSub = new SysUserSub();
+				updateUserSub.setId(userSub.getId());
+				updateUserSub.setCallbackStatus(GigCallBackStatus.IN_PROGRESS);
+				sysUserSubService.updateById(updateUserSub);
 			});
 			// 发送mq
 			if (CollUtil.isNotEmpty(gigInfo)) {
@@ -450,10 +457,15 @@ public class SysUserSignCertServiceImpl implements SysUserSignCertService {
 				gigInfo.put(userSub.getGigType().name(),
 						this.buildOladingBindCardConfirmModel(sysUser, userSub, dept.getTaxCode(), userSignCertDTO.getBankCardNumber()));
 			}
+			// 更新为进行中状态
+			SysUserSub updateUserSub = new SysUserSub();
+			updateUserSub.setId(userSub.getId());
+			updateUserSub.setCallbackStatus(GigCallBackStatus.IN_PROGRESS);
+			sysUserSubService.updateById(updateUserSub);
 		});
 
-		// 发送mq
 		if (CollUtil.isNotEmpty(gigInfo)) {
+			// 发送mq
 			rabbitMqClient.sendMessage(MqConstants.DIRECT_MODE_GIG_BANK_CARD_QUEUE, JSONUtil.toJsonStr(gigInfo));
 		}
 	}