第三方支付

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

@@ -126,11 +126,8 @@ public class MerchantServiceImpl implements IMerchantService {
             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{

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

@@ -3,6 +3,7 @@ package com.poteviohealth.ym.ipos.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.poteviohealth.cgp.common.filter.TokenContext;
 import com.poteviohealth.cgp.common.model.CommonPage;
 import com.poteviohealth.cgp.common.utils.MyBatisConvertUtils;
 import com.poteviohealth.ym.ipos.mapper.SplitWithdrawMapper;
@@ -24,6 +25,7 @@ public class SplitWithdrawServiceImpl extends ServiceImpl<SplitWithdrawMapper, S
     public CommonPage<SplitWithdraw> pageList(SplitWithdrawDto dto) {
         Page<SplitWithdraw> page = MyBatisConvertUtils.convert2Page(dto);
         QueryWrapper<SplitWithdraw> wrapper = new QueryWrapper<>();
+        wrapper.eq("merchant_id", TokenContext.cureWebUser().getIposMerchantId());
         wrapper.eq(StringUtils.isNotEmpty(dto.getTransStatus()),"trans_status", dto.getTransStatus());
         wrapper.eq(StringUtils.isNotEmpty(dto.getAcctStatus()),"acct_status", dto.getAcctStatus());
         wrapper.ge(StringUtils.isNotEmpty(dto.getTransDateStart()), "trans_date",dto.getTransDateStart());