feat: 小程序平安银行增员

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/ApiController.java

@@ -2418,18 +2418,24 @@ public class ApiController {
 					config.setAppSecrete(deptSub.getAppSecret());
 					config.setQueryUrl(deptSub.getQueryUrl());
 
+
 					TaxHelperAddMemberModel model = new TaxHelperAddMemberModel(config);
-					model.setIdCard(userUpdateInput.getIdCardNumber());
-					model.setType(Integer.parseInt(deptSub.getSubjectUserType()));
+					model.setIdCard(sysUser.getIdCardNumber());
 					model.setPhone(sysUser.getUsername());
+					model.setType(Integer.parseInt(deptSub.getSubjectUserType()));
 					model.setName(sysUser.getRealname());
 					model.setNotifyUrl("http://localhost:8808");
-
+					boolean isPingAnBank = StrUtil.isNotEmpty(sysUser.getBankCardNumber());
+					if (isPingAnBank){
+						model.setPayAccount(sysUser.getBankCardNumber());
+					}
 					model.setEnterpriseCode(sysDept.getTaxCode());
 					if (StringUtils.isEmpty(model.getEnterpriseCode())) {
+
 						errorMap.put(SubjectTypeEnum.TYPE_SHUIBANGYUN, "未配置企业的统一社会信用代码");
 						continue;
 					}
+
 					TaxHelperAddMemberRequest request = new TaxHelperAddMemberRequest(model);
 					TaxHelperResponse response = taxHelperService.addMembers(request);
 
@@ -2441,15 +2447,16 @@ public class ApiController {
 					record.setMessage(StringUtils.isNotEmpty(response.getMessage()) ? response.getMessage() : "无");
 					record.setStatus(null);
 					record.setSubjectType(1);
-					record.setMethod("增员");
+					record.setMethod(isPingAnBank ? "增员(平安银行)" : "增员");
 					record.setUserId(sysUser.getUserId());
 					sysCertResultRecordMapper.insert(record);
 
 					if (response.success()) {
-						sysUser.setCertStatus(TaxHelperCertStatus.ADD_MEMBER.getCode());
+						sysUser.setCertStatus(isPingAnBank? TaxHelperCertStatus.UNCHECKED_BIND.getCode() : TaxHelperCertStatus.ADD_MEMBER.getCode());
 					} else {
 						log.info("税邦云增员失败：{},{}，原因是：{}", sysUser.getRealname(), sysUser.getUsername(), response.getMessage());
 						userUpdateInput.setIdCardNumber(null);
+						userUpdateInput.setBankCardNumber(null);
 						errorMap.put(SubjectTypeEnum.TYPE_SHUIBANGYUN, "税邦云增员失败");
 					}
 				}
@@ -2465,10 +2472,12 @@ public class ApiController {
 		sysUser.setAvatar(userUpdateInput.getAvatar());
 		if (StringUtils.isNotEmpty(userUpdateInput.getIdCardNumber())) {
 			sysUser.setIdCardNumber(userUpdateInput.getIdCardNumber());
+
 		}
 		// 姓名去除空格（包括字符之间的所有空格都会去除）
 		sysUser.setRealname(StrUtil.cleanBlank(userUpdateInput.getRealname()));
 		sysUser.setUserSign(userUpdateInput.getUserSign());
+		sysUser.setBankCardNumber(userUpdateInput.getBankCardNumber());
 		if (StringUtils.isNotEmpty(userUpdateInput.getTaxHelperAgreementSignature())) {
 			sysUser.setTaxHelperAgreementSignature(StringUtils.equals(SignatureStatusEnum.SIGNED.name(), userUpdateInput
 					.getTaxHelperAgreementSignature()) ? 1 : 0);

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/view/user/UserUpdateInput.java

@@ -2,6 +2,7 @@ package com.qunzhixinxi.hnqz.admin.view.user;
 
 
 import com.qunzhixinxi.hnqz.admin.api.enums.SignatureStatusEnum;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -50,4 +51,9 @@ public class UserUpdateInput {
 	private String taxHelperAgreementSignature;
 
 	private List<String> subList;
+
+	/**
+	 * 银行卡号
+	 */
+	private String bankCardNumber;
 }