diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/mapper/MkDistributionFlowMapper.java b/cash-service/market-service/src/main/java/com/czg/service/market/mapper/MkDistributionFlowMapper.java index 041bbd56..e38adde7 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/mapper/MkDistributionFlowMapper.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/mapper/MkDistributionFlowMapper.java @@ -17,6 +17,6 @@ import java.util.List; */ public interface MkDistributionFlowMapper extends BaseMapper { - List pageInfo(Long shopId, LocalDateTime startTime, LocalDateTime endTime, String status, String key, Long id, String type); - BigDecimal totalAmount(Long shopId, LocalDateTime startTime, LocalDateTime endTime, String status, String key, Long id, String type); + List pageInfo(Long shopId, LocalDateTime startTime, LocalDateTime endTime, String status, String key, Long id, String type, Long userId); + BigDecimal totalAmount(Long shopId, LocalDateTime startTime, LocalDateTime endTime, String status, String key, Long id, String type, Long userId); } diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionFlowServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionFlowServiceImpl.java index 463761de..8c9baf7d 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionFlowServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionFlowServiceImpl.java @@ -45,7 +45,7 @@ public class MkDistributionFlowServiceImpl extends ServiceImpl pageInfo(Long shopId, LocalDateTime startTime, LocalDateTime endTime, String key, String status, Long id) { PageHelper.startPage(PageUtil.buildPageHelp()); - List list = mapper.pageInfo(shopId, startTime, endTime, status, key, id, null); + List list = mapper.pageInfo(shopId, startTime, endTime, status, key, id, null, null); Page page = PageUtil.convert(new PageInfo<>(list)); Map map = BeanUtil.beanToMap(page); map.put("successAmount", getOneAs(new QueryWrapper().eq(MkDistributionFlow::getShopId, shopId) @@ -66,11 +66,11 @@ public class MkDistributionFlowServiceImpl extends ServiceImpl list = mapper.pageInfo(shopId, StrUtil.isBlank(startTime) ? null : DateUtil.parseLocalDateTime(startTime), - StrUtil.isBlank(endTime) ? null : DateUtil.parseLocalDateTime(endTime), status,null, shopUserInfo == null ? null : shopUserInfo.getId(), null); + StrUtil.isBlank(endTime) ? null : DateUtil.parseLocalDateTime(endTime), status,null, shopUserInfo == null ? null : shopUserInfo.getId(), null, userId); Page page = PageUtil.convert(new PageInfo<>(list)); Map map = BeanUtil.beanToMap(page); map.put("totalAmount", mapper.totalAmount(shopId, StrUtil.isBlank(startTime) ? null : DateUtil.parseLocalDateTime(startTime), - StrUtil.isBlank(endTime) ? null : DateUtil.parseLocalDateTime(endTime), status,null, shopUserInfo == null ? null : shopUserInfo.getId(), null)); + StrUtil.isBlank(endTime) ? null : DateUtil.parseLocalDateTime(endTime), status,null, shopUserInfo == null ? null : shopUserInfo.getId(), null, userId)); return map; } } diff --git a/cash-service/market-service/src/main/resources/mapper/MkDistributionFlowMapper.xml b/cash-service/market-service/src/main/resources/mapper/MkDistributionFlowMapper.xml index cd9b27a1..86cdd704 100644 --- a/cash-service/market-service/src/main/resources/mapper/MkDistributionFlowMapper.xml +++ b/cash-service/market-service/src/main/resources/mapper/MkDistributionFlowMapper.xml @@ -35,6 +35,9 @@ and d.id=#{id} + + and d.user_id=#{userId} + and a.type=#{type} @@ -70,5 +73,8 @@ and a.type=#{type} + + and d.user_id=#{userId} +