第三方支付

src/main/java/com/poteviohealth/ym/ipos/service/impl/MerchantServiceImpl.java

@@ -154,14 +154,15 @@ public class MerchantServiceImpl implements IMerchantService {
             if(!openVault.validate()){
                 return openVault;
             }
+            VaultsResponse<String> stringVault = updateMerchantId(dto.getId(), dto.getSourceId(), dto.getMerchant_id(),2,dto.getRemained_amt());
+
+            if(!stringVault.validate()){
+                return stringVault;
+            }else if(StringUtils.isEmpty(stringVault.getData())){
+                return VaultsResponse.failed("APPid为空");
+            }
             if(status != 2){
-               VaultsResponse<String> stringVault = updateMerchantId(dto.getId(), dto.getSourceId(), dto.getMerchant_id(),2,dto.getRemained_amt());
 
-               if(!stringVault.validate()){
-                   return stringVault;
-               }else if(StringUtils.isEmpty(stringVault.getData())){
-                   return VaultsResponse.failed("APPid为空");
-               }
 
                if(dto.getSourceId().equals(1)){
                    //终端绑定交易