From a7e6a3b52c64ba9add0ceb643d6915473a7770a4 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 14 九月 2023 16:48:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java | 13 ++-----------
1 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java
index 9d0a328..4dabd48 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java
@@ -329,7 +329,8 @@
p.setIsdeleted(Constants.ZERO);
//鏌ヨ鍏ㄩ儴绫诲埆灞炴�т俊鎭�
List<BaseCateParam> paramList = baseCateParamMapper.selectList(new QueryWrapper<>(p));
- BigDecimal rate = getPriceRate();
+ //榛樿獚鍔犱环绯绘暟
+ BigDecimal rate = systemDictDataBiz.getGoodsPriceRate();
OssModel ossModel = initOssModel();
Date date = new Date();
for(BaseData data : allLis){
@@ -378,16 +379,6 @@
}
}
- private BigDecimal getPriceRate() {
- try {
-
- BigDecimal rate = new BigDecimal(Double.parseDouble(systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.GOODS_PRICE_RATE).getCode()));
- return rate;
- }catch (Exception e){
- return new BigDecimal(1.2);
- }
-
- }
private void dealBgImgAll(OssModel ossModel, Integer id, BaseData data) {
int i =0;
--
Gitblit v1.9.3