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 b14b19964..19a6f0b4d 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 @@ -5,6 +5,7 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.czg.account.entity.ShopUser; import com.czg.account.service.ShopInfoService; +import com.czg.account.service.ShopUserService; import com.czg.constant.TableValueConstant; import com.czg.market.entity.MkDistributionAmountFlow; import com.czg.market.vo.MkDistributionAmountFlowVO; @@ -37,6 +38,8 @@ import java.util.Map; public class MkDistributionFlowServiceImpl extends ServiceImpl implements MkDistributionFlowService{ @DubboReference private ShopInfoService shopInfoService; + @DubboReference + private ShopUserService shopUserService; @Override public Map pageInfo(Long shopId, LocalDateTime startTime, LocalDateTime endTime, String key, String status, Long id) { @@ -55,14 +58,15 @@ public class MkDistributionFlowServiceImpl extends ServiceImpl distributionFlow(long loginIdAsLong, String startTime, String endTime, Long shopId, String status) { + public Map distributionFlow(long userId, String startTime, String endTime, Long shopId, String status) { + ShopUser shopUserInfo = shopUserService.getShopUserInfo(shopId, userId); PageHelper.startPage(PageUtil.buildPageHelp()); List list = mapper.pageInfo(shopId, StrUtil.isBlank(startTime) ? null : DateUtil.parseLocalDateTime(startTime), - StrUtil.isBlank(endTime) ? null : DateUtil.parseLocalDateTime(endTime), status,null, null, null); + StrUtil.isBlank(endTime) ? null : DateUtil.parseLocalDateTime(endTime), status,null, shopUserInfo.getId(), null); 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, null, null)); + StrUtil.isBlank(endTime) ? null : DateUtil.parseLocalDateTime(endTime), status,null, shopUserInfo.getId(), null)); return map; } }