|
|
@@ -246,7 +246,7 @@ public class MerchantServiceImpl implements IMerchantService {
|
|
|
}
|
|
|
|
|
|
private VaultsResponse updateMerchantId(Integer id, Integer source, String merchantId,Integer status,Long remainedAmt) {
|
|
|
- VaultsResponse vaultsResponse = VaultsResponse.failed();
|
|
|
+ VaultsResponse vaultsResponse;
|
|
|
OperatorIdParams operatorIdParams = new OperatorIdParams();
|
|
|
operatorIdParams.setOperatorId(TokenContext.cureOperatorId());
|
|
|
operatorIdParams.setId(id.toString());
|
|
|
@@ -256,10 +256,7 @@ public class MerchantServiceImpl implements IMerchantService {
|
|
|
operatorIdParams.setCode(code);
|
|
|
operatorIdParams.setRemainedAmt(remainedAmt);
|
|
|
if(source.equals(3)){
|
|
|
- VaultsResponse cus = customerFeignClient.updateMerchantId(operatorIdParams);
|
|
|
- if(!cus.validate()){
|
|
|
- return cus;
|
|
|
- }
|
|
|
+ vaultsResponse = customerFeignClient.updateMerchantId(operatorIdParams);
|
|
|
}else{
|
|
|
vaultsResponse = partnerFeignClient.updateMerchantId(operatorIdParams);
|
|
|
}
|