From acb1b57cdf0f160b802f31c4f41b4daf4d2e9ce6 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 19 十二月 2024 10:30:08 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/ShopClient.java | 6 +++++-
/dev/null | 18 ------------------
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopBalanceStatementServiceImpl.java | 6 +++---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/BalanceChangeRecordServiceImpl.java | 6 +++---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/ShopClientFallbackFactory.java | 6 ++++++
5 files changed, 17 insertions(+), 25 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/ShopBalanceStatementClientFallbackFactory.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/ShopBalanceStatementClientFallbackFactory.java
deleted file mode 100644
index 0710bf6..0000000
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/ShopBalanceStatementClientFallbackFactory.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.ruoyi.other.api.factory;
-
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.other.api.domain.ShopBalanceStatement;
-import com.ruoyi.other.api.feignClient.ShopBalanceStatementClient;
-import org.springframework.cloud.openfeign.FallbackFactory;
-
-import java.util.List;
-
-public class ShopBalanceStatementClientFallbackFactory implements FallbackFactory<ShopBalanceStatementClient> {
- @Override
- public ShopBalanceStatementClient create(Throwable cause) {
- return new ShopBalanceStatementClient(){
-
- @Override
- public R<List<ShopBalanceStatement>> getList(ShopBalanceStatement shopBalanceStatement) {
- return R.fail("获取门店余额流水失败：" + cause.getMessage());
- }
- };
- }
-}
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/ShopClientFallbackFactory.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/ShopClientFallbackFactory.java
index 8319da3..1c2144f 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/ShopClientFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/ShopClientFallbackFactory.java
@@ -2,6 +2,7 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.other.api.domain.Shop;
+import com.ruoyi.other.api.domain.ShopBalanceStatement;
import com.ruoyi.other.api.feignClient.ShopClient;
import lombok.extern.slf4j.Slf4j;
import org.springframework.cloud.openfeign.FallbackFactory;
@@ -38,6 +39,11 @@
public R<Set<Integer>> getShopIdByName(String shopName) {
return R.fail("根据门店名称获取门店id失败：" + cause.getMessage());
}
+
+ @Override
+ public R<List<ShopBalanceStatement>> getShopBalanceStatementList(ShopBalanceStatement shopBalanceStatement) {
+ return R.fail();
+ }
};
}
}
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/ShopBalanceStatementClient.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/ShopBalanceStatementClient.java
deleted file mode 100644
index a0bb471..0000000
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/ShopBalanceStatementClient.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.ruoyi.other.api.feignClient;
-
-import com.ruoyi.common.core.constant.ServiceNameConstants;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.other.api.domain.ShopBalanceStatement;
-import com.ruoyi.other.api.factory.ShopBalanceStatementClientFallbackFactory;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.List;
-
-@FeignClient(contextId = "ShopBalanceStatementClient", value = ServiceNameConstants.OTHER_SERVICE, fallbackFactory = ShopBalanceStatementClientFallbackFactory.class)
-public interface ShopBalanceStatementClient {
-
- @PostMapping("/shop-balance-statement/getList")
- R<List<ShopBalanceStatement>> getList(@RequestBody ShopBalanceStatement shopBalanceStatement);
-}
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/ShopClient.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/ShopClient.java
index cf409f1..3019063 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/ShopClient.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/ShopClient.java
@@ -4,6 +4,7 @@
import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.other.api.domain.Shop;
+import com.ruoyi.other.api.domain.ShopBalanceStatement;
import com.ruoyi.other.api.factory.ShopClientFallbackFactory;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
@@ -42,8 +43,11 @@
R<Shop> getShopByPhone(@RequestParam("phone") String phone);
@PostMapping("/getShopByUserIds")
- public R<List<Shop>> getShopByUserIds(@RequestBody List<Long> userIds);
+ R<List<Shop>> getShopByUserIds(@RequestBody List<Long> userIds);
@GetMapping("/getShopIdByName")
R<Set<Integer>> getShopIdByName(String shopName);
+
+ @PostMapping("/shop-balance-statement/getList")
+ R<List<ShopBalanceStatement>> getShopBalanceStatementList(@RequestBody ShopBalanceStatement shopBalanceStatement);
}
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;
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopBalanceStatementServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopBalanceStatementServiceImpl.java
index 8a94449..2276d32 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopBalanceStatementServiceImpl.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopBalanceStatementServiceImpl.java
@@ -41,9 +41,9 @@
)
));
- BigDecimal totalCommission = shopCommissionMap.get(1);
- BigDecimal totalSubordinateCommission = shopCommissionMap.get(2);
- BigDecimal totalServiceCharge = shopCommissionMap.get(3);
+ BigDecimal totalCommission = shopCommissionMap.getOrDefault(1,BigDecimal.ZERO);
+ BigDecimal totalSubordinateCommission = shopCommissionMap.getOrDefault(2,BigDecimal.ZERO);
+ BigDecimal totalServiceCharge = shopCommissionMap.getOrDefault(3,BigDecimal.ZERO);
BigDecimal totalAmount = totalCommission.add(totalSubordinateCommission).add(totalServiceCharge);
shopCommissionStatisticsVO.setTotalAmount(totalAmount);
--
Gitblit v1.7.1