From acb1b57cdf0f160b802f31c4f41b4daf4d2e9ce6 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 19 十二月 2024 10:30:08 +0800
Subject: [PATCH] 合并代码

---
 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/BalanceChangeRecordServiceImpl.java |    6 +++---
 1 files changed, 3 insertions(+), 3 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..2932024 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,7 +29,7 @@
 @Service
 public class BalanceChangeRecordServiceImpl extends ServiceImpl<BalanceChangeRecordMapper, BalanceChangeRecord> implements BalanceChangeRecordService {
     @Resource
-    private ShopBalanceStatementClient shopBalanceStatementClient;
+    private ShopClient shopClient;
 
     @Override
     public IPage<BalanceChangeRecord> pageList(BalanceQuery agentQuery) {
@@ -60,7 +60,7 @@
 
         R<List<ShopBalanceStatement>> r;
         try {
-            r = shopBalanceStatementClient.getList(shopBalanceStatement);
+            r = shopClient.getShopBalanceStatementList(shopBalanceStatement);
         } catch (Exception e) {
             log.error("获取店铺余额对账单列表时出错", e);
             return null;

--
Gitblit v1.7.1