|
@@ -507,6 +507,7 @@ public class TAdminController {
|
|
admin.setUsername(registerParam.getUsername());
|
|
admin.setUsername(registerParam.getUsername());
|
|
admin.setName(registerParam.getName());
|
|
admin.setName(registerParam.getName());
|
|
admin.setIfForeign(registerParam.getIfForeign());
|
|
admin.setIfForeign(registerParam.getIfForeign());
|
|
|
|
+ admin.setCompanyType(registerParam.getCompanyType());
|
|
if (Pattern.matches(phoneReg, phoneOrEmail)) {
|
|
if (Pattern.matches(phoneReg, phoneOrEmail)) {
|
|
admin.setPhone(registerParam.getPhoneOrEmail());
|
|
admin.setPhone(registerParam.getPhoneOrEmail());
|
|
} else if (Pattern.matches(emailReg, phoneOrEmail)) {
|
|
} else if (Pattern.matches(emailReg, phoneOrEmail)) {
|
|
@@ -516,8 +517,7 @@ public class TAdminController {
|
|
}
|
|
}
|
|
if (registerParam.getCompanyType().equals("1")) { // 如果是七云平台
|
|
if (registerParam.getCompanyType().equals("1")) { // 如果是七云平台
|
|
admin.setTradeMerchantNo("777138500523174"); //七云商户报备号
|
|
admin.setTradeMerchantNo("777138500523174"); //七云商户报备号
|
|
- // TODO 汇付上线后改为“1”
|
|
|
|
- admin.setPayPlatform("0");
|
|
|
|
|
|
+ admin.setPayPlatform("1");
|
|
} else {
|
|
} else {
|
|
admin.setPayPlatform("0");
|
|
admin.setPayPlatform("0");
|
|
}
|
|
}
|