qin 1 年之前
父节点
当前提交
927ed17f85
共有 1 个文件被更改,包括 2 次插入5 次删除
  1. 2 5
      src/main/java/com/poteviohealth/ym/ipos/service/impl/MerchantServiceImpl.java

+ 2 - 5
src/main/java/com/poteviohealth/ym/ipos/service/impl/MerchantServiceImpl.java

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