From 4a99240038013c7d962040e6f8eabd2d72095fd7 Mon Sep 17 00:00:00 2001
From: renkang <94314517@qq.com>
Date: 星期四, 04 六月 2026 13:47:01 +0800
Subject: [PATCH] 短信问题
---
server/visits/dmvisit_service/src/main/java/com/doumee/core/conditoner/ConditionerUtil.java | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/conditoner/ConditionerUtil.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/conditoner/ConditionerUtil.java
index 0872b5e..45f4b3f 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/conditoner/ConditionerUtil.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/conditoner/ConditionerUtil.java
@@ -18,6 +18,8 @@
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
+import java.math.BigDecimal;
+import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -290,12 +292,8 @@
JSONObject body = new JSONObject(true);
putSessionFields(body, req);
body.put("is_pwr", req.getIs_pwr() != null ? req.getIs_pwr() : 1);
- if (req.getLi_dev() != null && !req.getLi_dev().isEmpty()) {
- body.put("li_dev", req.getLi_dev());
- }
- if (req.getD_dev() != null && !req.getD_dev().isEmpty()) {
- body.put("d_dev", req.getD_dev());
- }
+ body.put("li_dev", req.getLi_dev() != null ? req.getLi_dev() : Collections.emptyList());
+ body.put("d_dev", req.getD_dev() != null ? req.getD_dev() : Collections.emptyMap());
body.put("gs_name", req.getGs_name());
body.put("is_rest_stop", req.getIs_rest_stop() != null ? req.getIs_rest_stop() : 0);
body.put("gs_bz", StringUtils.defaultString(req.getGs_bz()));
@@ -309,6 +307,7 @@
}
req.fillSessionDefaults();
JSONObject body = new JSONObject(true);
+ putSessionFields(body, req);
body.put("id", req.getId());
body.put("is_pwr", req.getIs_pwr() != null ? req.getIs_pwr() : 1);
body.put("is_rest_stop", req.getIs_rest_stop() != null ? req.getIs_rest_stop() : 0);
@@ -317,16 +316,22 @@
body.put("left_money", req.getLeft_money());
}
body.put("is_stop", req.getIs_stop() != null ? req.getIs_stop() : 0);
- body.put("li_dev", req.getLi_dev());
- body.put("d_dev", req.getD_dev());
+ body.put("li_dev", req.getLi_dev() != null ? req.getLi_dev() : Collections.emptyList());
+ body.put("d_dev", req.getD_dev() != null ? req.getD_dev() : Collections.emptyMap());
body.put("gs_bz", StringUtils.defaultString(req.getGs_bz()));
putStopMoney(body, req.getStop_money());
return postJsonBody("/changeGs", body, Object.class);
}
private static void putStopMoney(JSONObject body, Object stopMoney) {
- if (stopMoney != null) {
- body.put("stop_money", stopMoney);
+ if (stopMoney == null) {
+ body.put("stop_money", "0");
+ return;
+ }
+ if (stopMoney instanceof BigDecimal) {
+ body.put("stop_money", ((BigDecimal) stopMoney).toPlainString());
+ } else {
+ body.put("stop_money", String.valueOf(stopMoney));
}
}
--
Gitblit v1.9.3