|
|
@@ -90,6 +90,7 @@ public class MerchantServiceImpl implements IMerchantService {
|
|
|
public VaultsResponse merchantCreateOpen(UserDto dto) {
|
|
|
VaultsResponse<UserSearchBack> vaultsResponse = this.merchantQuery(dto.getPhone(),null);
|
|
|
if(!vaultsResponse.validate()){
|
|
|
+ log.info("UserSearchBack==="+vaultsResponse);
|
|
|
return vaultsResponse;
|
|
|
}
|
|
|
UserSearchBack searchBack = vaultsResponse.getData();
|
|
|
@@ -109,11 +110,11 @@ public class MerchantServiceImpl implements IMerchantService {
|
|
|
//添加商户
|
|
|
VaultsResponse<String> createVault = this.merchantCreate(dto);
|
|
|
if(!createVault.validate()){
|
|
|
+ log.info("createVault==="+createVault);
|
|
|
return createVault;
|
|
|
}
|
|
|
dto.setMerchant_id(createVault.getData());
|
|
|
}else{
|
|
|
- log.info("MerchantId==="+searchBack.getMerchant_id());
|
|
|
if(searchBack != null && !searchBack.getMerchant_id().equals(dto.getMerchant_id())){
|
|
|
return VaultsResponse.failed("手机号码已被注册");
|
|
|
}
|
|
|
@@ -123,12 +124,14 @@ public class MerchantServiceImpl implements IMerchantService {
|
|
|
//修改开户/入驻信息
|
|
|
VaultsResponse<String> indvmodifyVault = this.modifyVault(dto);
|
|
|
if(!indvmodifyVault.validate()){
|
|
|
+ log.info("indvmodifyVault==="+indvmodifyVault);
|
|
|
return indvmodifyVault;
|
|
|
}
|
|
|
VaultsResponse<String> openModifyVault = this.merchantOpenModify(dto);
|
|
|
|
|
|
VaultsResponse<String> stringVault = updateMerchantId(dto.getId(), dto.getSourceId(), dto.getMerchant_id(),2,dto.getRemained_amt());
|
|
|
if(!stringVault.validate()){
|
|
|
+ log.info("stringVault==="+stringVault);
|
|
|
return stringVault;
|
|
|
}
|
|
|
if(dto.getSourceId().equals(1)){
|
|
|
@@ -140,6 +143,7 @@ public class MerchantServiceImpl implements IMerchantService {
|
|
|
bd.setName("("+code+")"+dto.getMerchant_short_name());
|
|
|
return paymentService.bindPos(bd);
|
|
|
}
|
|
|
+ log.info("openModifyVault==="+openModifyVault);
|
|
|
return openModifyVault;
|
|
|
}else{
|
|
|
if(dto.getIncoming_status().equals("0") || dto.getIncoming_status().equals("-1")){
|
|
|
@@ -148,12 +152,14 @@ public class MerchantServiceImpl implements IMerchantService {
|
|
|
//个人
|
|
|
VaultsResponse<String> indvregisterVault = this.merchantIndvregister(dto);
|
|
|
if(!indvregisterVault.validate()){
|
|
|
+ log.info("indvregisterVault==="+indvregisterVault);
|
|
|
return indvregisterVault;
|
|
|
}
|
|
|
}else{
|
|
|
//商户
|
|
|
VaultsResponse<String> entregisterVault = this.merchantEntregister(dto);
|
|
|
if(!entregisterVault.validate()){
|
|
|
+ log.info("entregisterVault==="+entregisterVault);
|
|
|
return entregisterVault;
|
|
|
}
|
|
|
}
|
|
|
@@ -161,6 +167,7 @@ public class MerchantServiceImpl implements IMerchantService {
|
|
|
}else{
|
|
|
VaultsResponse<String> indvmodifyVault = this.modifyVault(dto);
|
|
|
if(!indvmodifyVault.validate()){
|
|
|
+ log.info("indvmodifyVault==="+indvmodifyVault);
|
|
|
return indvmodifyVault;
|
|
|
}
|
|
|
}
|
|
|
@@ -168,12 +175,14 @@ public class MerchantServiceImpl implements IMerchantService {
|
|
|
//入驻
|
|
|
VaultsResponse<String> openVault = this.merchantOpen(dto);
|
|
|
if(!openVault.validate()){
|
|
|
+ log.info("openVault==="+openVault);
|
|
|
return openVault;
|
|
|
}
|
|
|
// if(status != 2){
|
|
|
VaultsResponse<String> stringVault = updateMerchantId(dto.getId(), dto.getSourceId(), dto.getMerchant_id(),2,dto.getRemained_amt());
|
|
|
|
|
|
if(!stringVault.validate()){
|
|
|
+ log.info("stringVault==="+stringVault);
|
|
|
return stringVault;
|
|
|
}
|
|
|
if(dto.getSourceId().equals(1)){
|
qin