From e93aad02d2dd2a6e624e81ea0adb3611a8fc43e5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 26 十二月 2024 17:16:19 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/BalanceChangeRecordServiceImpl.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/BalanceChangeRecordServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/BalanceChangeRecordServiceImpl.java
index 4d0426c..e317ae3 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/BalanceChangeRecordServiceImpl.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/BalanceChangeRecordServiceImpl.java
@@ -14,7 +14,7 @@
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.bean.BeanUtils;
import com.ruoyi.other.api.domain.ShopBalanceStatement;
-import com.ruoyi.other.api.feignClient.ShopBalanceStatementClient;
+import com.ruoyi.other.api.feignClient.ShopClient;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -29,15 +29,14 @@
@Service
public class BalanceChangeRecordServiceImpl extends ServiceImpl<BalanceChangeRecordMapper, BalanceChangeRecord> implements BalanceChangeRecordService {
@Resource
- private ShopBalanceStatementClient shopBalanceStatementClient;
+ private ShopClient shopClient;
@Override
public IPage<BalanceChangeRecord> pageList(BalanceQuery agentQuery) {
Page<BalanceChangeRecord> page = new Page<>();
page.setCurrent(agentQuery.getPageNum());
page.setSize(agentQuery.getPageSize());
- IPage<BalanceChangeRecord> shopIPage = this.baseMapper.pageList(page, agentQuery);
- return shopIPage;
+ return this.baseMapper.pageList(page, agentQuery);
}
@Override
@@ -60,7 +59,7 @@
R<List<ShopBalanceStatement>> r;
try {
- r = shopBalanceStatementClient.getList(shopBalanceStatement);
+ r = shopClient.getShopBalanceStatementList(shopBalanceStatement);
} catch (Exception e) {
log.error("获取店铺余额对账单列表时出错", e);
return null;
@@ -86,10 +85,13 @@
long current = page.getCurrent();
long size = page.getSize();
- int fromIndex = (int) (current - 1);
+ if (current < 1) {
+ current = 1;
+ }
+ int fromIndex = (int) ((current - 1) * size);
int toIndex = (int) Math.min(fromIndex + size, walletStatisticsDetailList.size());
- if (fromIndex < 0 || toIndex > walletStatisticsDetailList.size()) {
+ if (fromIndex >= walletStatisticsDetailList.size()) {
throw new ServiceException("页面参数无效");
}
--
Gitblit v1.7.1