feat: 发起签约认证修改

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

@@ -33,6 +33,11 @@ public class SysUserSub extends Model<SysUserSub> {
 	 */
 	private Integer userId;
 
+	/**
+	 * 部门id
+	 */
+	private Integer deptId;
+
 	/**
 	 * 零工平台类型（订单支付方式类型）
 	 */

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

@@ -28,10 +28,15 @@ public class GigUserInfoModel implements Serializable {
 	 */
 	private String name;
 
+	/**
+	 * 税号
+	 */
+	private String entCode;
+
 	/**
 	 * 手机号
 	 */
-	private String phone;
+	private String username;
 
 	/**
 	 * 身份证号

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

@@ -6,6 +6,7 @@ import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.qunzhixinxi.hnqz.admin.api.constant.MqConstants;
+import com.qunzhixinxi.hnqz.admin.api.entity.SysDept;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysUser;
 import com.qunzhixinxi.hnqz.admin.config.UpmsConfig;
 import com.qunzhixinxi.hnqz.admin.entity.SysUserSub;
@@ -18,11 +19,13 @@ import com.qunzhixinxi.hnqz.admin.enums.GigTypeEnum;
 import com.qunzhixinxi.hnqz.admin.enums.MemberIDCardType;
 import com.qunzhixinxi.hnqz.admin.enums.MemberType;
 import com.qunzhixinxi.hnqz.admin.enums.PayChannel;
+import com.qunzhixinxi.hnqz.admin.service.SysDeptService;
 import com.qunzhixinxi.hnqz.admin.service.SysUserService;
 import com.qunzhixinxi.hnqz.admin.service.SysUserSubService;
 import com.qunzhixinxi.hnqz.admin.service.gig.SysUserSignCertService;
 import com.qunzhixinxi.hnqz.common.core.entity.BaseMap;
 import com.qunzhixinxi.hnqz.common.rabbitmq.client.RabbitMqClient;
+import com.qunzhixinxi.hnqz.common.security.service.HnqzUser;
 import com.qunzhixinxi.hnqz.common.security.util.SecurityUtils;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -46,6 +49,8 @@ public class SysUserSignCertServiceImpl implements SysUserSignCertService {
 
 	private final SysUserSubService sysUserSubService;
 
+	private final SysDeptService sysDeptService;
+
 	private final RabbitMqClient rabbitMqClient;
 
 	private final UpmsConfig upmsConfig;
@@ -70,7 +75,8 @@ public class SysUserSignCertServiceImpl implements SysUserSignCertService {
 	 */
 	@Override
 	public void saveBaseInfo(UserSignCertDTO userSignCertDTO) {
-		Integer operateUserId = SecurityUtils.getUser().getId();
+		HnqzUser user = SecurityUtils.getUser();
+		Integer operateUserId = user.getId();
 		if (StrUtil.isNotBlank(userSignCertDTO.getIdCardNumber())) {
 			// 更新用户信息
 			SysUser updateUser = new SysUser();
@@ -83,6 +89,7 @@ public class SysUserSignCertServiceImpl implements SysUserSignCertService {
 		userSignCertDTO.getGigTypeList().forEach(gigType -> {
 			SysUserSub userSub = new SysUserSub();
 			userSub.setUserId(userSignCertDTO.getUserId());
+			userSub.setDeptId(user.getDeptId());
 			userSub.setGigType(gigType);
 			userSub.setBankCardNumber(userSignCertDTO.getBankCardNumber());
 			userSub.setBankPhone(userSignCertDTO.getBankPhone());
@@ -162,10 +169,11 @@ public class SysUserSignCertServiceImpl implements SysUserSignCertService {
 	 */
 	@Override
 	public boolean batchChannelCert(UserSignCertDTO userSignCertDTO) {
-		// redis
 		Integer userId = userSignCertDTO.getUserId();
 		// 根据用户id查询用户信息、认证信息
 		SysUser sysUser = sysUserService.getById(userId);
+		// 查询dept
+		SysDept dept = sysDeptService.getById(sysUser.getDeptId());
 		List<SysUserSub> userSubList = sysUserSubService.list(Wrappers.<SysUserSub>lambdaQuery()
 				.eq(SysUserSub::getUserId, userId));
 		if (CollUtil.isNotEmpty(userSubList)) {
@@ -181,7 +189,8 @@ public class SysUserSignCertServiceImpl implements SysUserSignCertService {
 				GigUserInfoModel userInfoModel = new GigUserInfoModel();
 				userInfoModel.setUserId(userId);
 				userInfoModel.setName(sysUser.getRealname());
-				userInfoModel.setPhone(sysUser.getUsername());
+				userInfoModel.setUsername(sysUser.getUsername());
+				userInfoModel.setEntCode(dept.getTaxCode());
 				userInfoModel.setDeptId(sysUser.getDeptId());
 				userInfoModel.setIdCard(sysUser.getIdCardNumber());
 				userInfoModel.setIdCardType(MemberIDCardType.ID_CARD);