From 91d017a582ea781c5e9e7d6bbb4f9afed4763c79 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 29 三月 2025 10:08:16 +0800
Subject: [PATCH] #修改 扫码收货字段优化
---
rsf-server/src/main/java/com/vincent/rsf/server/system/utils/SerialRuleUtils.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/utils/SerialRuleUtils.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/utils/SerialRuleUtils.java
index 02a3c1b..9e977d0 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/utils/SerialRuleUtils.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/utils/SerialRuleUtils.java
@@ -50,7 +50,7 @@
.list(new LambdaQueryWrapper<SerialRuleItem>()
.eq(SerialRuleItem::getRuleId, serialRule.getId())
.orderByAsc(SerialRuleItem::getSort));
- if (Objects.isNull(ruleItems)) {
+ if (Objects.isNull(ruleItems) || ruleItems.isEmpty()) {
throw new CoolException("缂栫爜瑙勫垯鏄庣粏涓虹┖锛侊紒");
}
@@ -64,7 +64,7 @@
format = DateUtils.format(new Date(), "yyyy");
} else if (serialRule.getReset().equals(SerialRuleReset.SERIAL_REST_TYPE_MONTH.type)) {
format = DateUtils.format(new Date(), "MM");
- } else {
+ } else if (serialRule.getReset().equals(SerialRuleReset.SERIAL_REST_TYPE_DAYS.type)){
format = DateUtils.format(new Date(), "dd");
}
//褰撳墠鍊艰嚜鍔ㄥ姞1
@@ -83,8 +83,11 @@
//鍒ゆ柇鏄惁璁剧疆鎴彇闀垮害鍜岃捣濮嬫埅鍙栦綅缃�
buffer.append(subStr(format, rule.getLenStr(), rule.getLen()));
} else if (rule.getWkType().equals(SerialRuleType.WK_FEILD.wkType)) {
- String subStr = subStr(objectToMap(obj).get(rule.getFeildValue()).toString(), rule.getLenStr(), rule.getLen());
- buffer.append(subStr);
+ String subStr;
+ if (!Objects.isNull(objectToMap(obj).get(rule.getFeildValue()))) {
+ subStr = subStr(objectToMap(obj).get(rule.getFeildValue()).toString(), rule.getLenStr(), rule.getLen());
+ buffer.append(subStr);
+ }
}
});
@@ -128,7 +131,7 @@
* @time 2025/3/5 14:00
*/
public static Map<?, ?> objectToMap (Object obj) {
- if (obj == null) {
+ if (Objects.isNull(obj)) {
return null;
}
ObjectMapper objectMapper = new ObjectMapper();
--
Gitblit v1.9.1