第三方支付

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

@@ -124,6 +124,14 @@ public class MerchantServiceImpl implements IMerchantService {
                 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()){
+                return stringVault;
+            }else if(StringUtils.isEmpty(stringVault.getData())){
+                return VaultsResponse.failed("APPid为空");
+            }
             return openModifyVault;
         }else{
             if(dto.getIncoming_status().equals("0") || dto.getIncoming_status().equals("-1")){
@@ -154,16 +162,14 @@ 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)){
                    //终端绑定交易
                    BindDto bd = new BindDto();