团长分成

src/main/java/com/poteviohealth/ym/ipos/controller/SettlementController.java

@@ -83,7 +83,7 @@ public class SettlementController extends BaseWebController {
     @PostMapping("/list")
     @ApiOperation(value = "取现记录",notes = "list")
     public VaultsResponse<CommonPage<SplitWithdraw>> list(@RequestBody SplitWithdrawDto dto){
-        dto.setIposMerchantId(TokenContext.cureWebUser().getIposMerchantId());
+       // dto.setIposMerchantId(TokenContext.cureWebUser().getIposMerchantId());
         return VaultsResponse.success(splitWithdrawService.pageList(dto));
     }
 

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;
@@ -26,7 +27,8 @@ 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", dto.getIposMerchantId());
+        wrapper.eq("operator_id", TokenContext.cureOperatorId());
+        wrapper.eq(StringUtils.isNotEmpty(dto.getIposMerchantId()),"merchant_id", dto.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());