From e8a0fd29e22c43c2146ffae0564ff03cbf0fc2c4 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 14 十月 2025 09:57:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
index f54ec05..05b8303 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
@@ -171,6 +171,7 @@
public static final String LIQUID_LEVEL_UNIT ="LIQUID_LEVEL_UNIT" ;
public static final String OUT_HY_LOT_TOTAL ="OUT_HY_LOT_TOTAL" ;
public static final String BANNER_IMG ="BANNER_IMG" ;
+ public static final String COMPANY_LOCATION = "COMPANY_LOCATION";
public static final String GAODE_LOCATION_GEOAPI_URL = "GAODE_LOCATION_GEOAPI_URL";
public static boolean DEALING_HK_SYNCPRIVILEGE= false;
@@ -530,6 +531,7 @@
public interface RedisKeys {
public static final String IMPORTING_CARS ="IMPORTING_CARS";
public static final String CHECKING_JKCUSTOMER_LOCATION ="CHECKING_JKCUSTOMER_LOCATION";
+ public static final String JKLINE_JOB ="JKLINE_JOB_";
public static final String IMPORTING_JKCUSTOMER ="IMPORTING_JKCUSTOMER";
public static final String IMPORTING_JKORDERS ="IMPORTING_JKORDERS";
public static final String IMPORTING_JKLINE ="IMPORTING_JKLINE";
@@ -556,28 +558,21 @@
return d;
}
public static BigDecimal formatBigdecimal4Float(BigDecimal d) {
+ return formatBigdecimalScale(d,4);
+ }
+ public static BigDecimal formatBigdecimalScale(BigDecimal d,int scale) {
if (d == null) {
d = new BigDecimal(0.0);
}
//淇濈暀涓や綅灏忔暟涓斿洓鑸嶄簲鍏�
- d = d.setScale(4, BigDecimal.ROUND_HALF_UP);
+ d = d.setScale(scale, BigDecimal.ROUND_HALF_UP);
return d;
}
public static BigDecimal formatBigdecimal0Float(BigDecimal d) {
- if (d == null) {
- d = new BigDecimal(0.0);
- }
- //淇濈暀涓や綅灏忔暟涓斿洓鑸嶄簲鍏�
- d = d.setScale(0, BigDecimal.ROUND_HALF_UP);
- return d;
+ return formatBigdecimalScale(d,0);
}
public static BigDecimal formatBigdecimal2Float(BigDecimal d) {
- if (d == null) {
- d = new BigDecimal(0.0);
- }
- //淇濈暀涓や綅灏忔暟涓斿洓鑸嶄簲鍏�
- d = d.setScale(2, BigDecimal.ROUND_HALF_UP);
- return d;
+ return formatBigdecimalScale(d,2);
}
--
Gitblit v1.9.3