From 4ab710d8d70017f090dd9601099ded1a50a58a10 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 27 四月 2026 22:34:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/service/business/impl/PricingRuleServiceImpl.java | 39 +++++++++++++++++++++++++++------------
1 files changed, 27 insertions(+), 12 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/PricingRuleServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/PricingRuleServiceImpl.java
index 370418f..88de2ea 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/PricingRuleServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/PricingRuleServiceImpl.java
@@ -203,16 +203,16 @@
PricingRule existing = pricingRuleMapper.selectOne(qw);
if (existing != null) {
- // 鏇存柊
- existing.setFieldB(item.getUnitPrice());
+ // 鏇存柊锛堝厓杞垎锛�
+ existing.setFieldB(yuanToFen(item.getUnitPrice()));
existing.setUpdateTime(now);
pricingRuleMapper.updateById(existing);
} else {
- // 鏂板缓
+ // 鏂板缓锛堝厓杞垎锛�
PricingRule rule = new PricingRule();
rule.setType(Constants.ZERO);
rule.setFieldA(String.valueOf(item.getCategoryId()));
- rule.setFieldB(item.getUnitPrice());
+ rule.setFieldB(yuanToFen(item.getUnitPrice()));
rule.setCityId(request.getCityId());
rule.setDeleted(Constants.ZERO);
rule.setCreateTime(now);
@@ -252,7 +252,7 @@
PricingRule rule = existingMap.get(String.valueOf(category.getId()));
if (rule != null) {
vo.setPricingRuleId(rule.getId());
- vo.setUnitPrice(rule.getFieldB());
+ vo.setUnitPrice(fenToYuan(rule.getFieldB()));
}
return vo;
}).collect(Collectors.toList());
@@ -281,9 +281,9 @@
if (existing != null) {
existing.setFieldB(item.getStartDistance());
- existing.setFieldC(item.getStartPrice());
+ existing.setFieldC(yuanToFen(item.getStartPrice()));
existing.setFieldD(item.getExtraDistance());
- existing.setFieldE(item.getExtraPrice());
+ existing.setFieldE(yuanToFen(item.getExtraPrice()));
existing.setUpdateTime(now);
pricingRuleMapper.updateById(existing);
} else {
@@ -291,9 +291,9 @@
rule.setType(Constants.ONE);
rule.setFieldA(String.valueOf(item.getCategoryId()));
rule.setFieldB(item.getStartDistance());
- rule.setFieldC(item.getStartPrice());
+ rule.setFieldC(yuanToFen(item.getStartPrice()));
rule.setFieldD(item.getExtraDistance());
- rule.setFieldE(item.getExtraPrice());
+ rule.setFieldE(yuanToFen(item.getExtraPrice()));
rule.setCityId(request.getCityId());
rule.setDeleted(Constants.ZERO);
rule.setCreateTime(now);
@@ -334,9 +334,9 @@
if (rule != null) {
vo.setPricingRuleId(rule.getId());
vo.setStartDistance(rule.getFieldB());
- vo.setStartPrice(rule.getFieldC());
+ vo.setStartPrice(fenToYuan(rule.getFieldC()));
vo.setExtraDistance(rule.getFieldD());
- vo.setExtraPrice(rule.getFieldE());
+ vo.setExtraPrice(fenToYuan(rule.getFieldE()));
}
return vo;
}).collect(Collectors.toList());
@@ -566,7 +566,7 @@
PricingRule rule = existingMap.get(String.valueOf(i));
if (rule != null) {
vo.setPricingRuleId(rule.getId());
- vo.setDepositAmount(rule.getFieldB());
+ vo.setDepositAmount(fenToYuan(rule.getFieldB()));
}
result.add(vo);
}
@@ -653,4 +653,19 @@
return result;
}
+ private String yuanToFen(String yuan) {
+ if (yuan == null || yuan.isEmpty()) return "0";
+ return String.valueOf(new BigDecimal(yuan)
+ .multiply(new BigDecimal("100"))
+ .setScale(0, RoundingMode.HALF_UP)
+ .longValue());
+ }
+
+ private String fenToYuan(String fen) {
+ if (fen == null || fen.isEmpty()) return "0";
+ return new BigDecimal(fen)
+ .divide(new BigDecimal("100"), 2, RoundingMode.HALF_UP)
+ .toPlainString();
+ }
+
}
--
Gitblit v1.9.3