From 2ba06397d23871213743814e35b916344806f1f5 Mon Sep 17 00:00:00 2001 From: sunjiabei Date: Tue, 8 Jul 2025 14:57:44 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/example/demo/serviceImpl/ConsumeServiceImpl.java | 11 +++-------- .../com/example/demo/serviceImpl/RechargeServiceImpl.java | 10 ++++------ 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java index e8fd027..49ac168 100644 --- a/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java @@ -110,16 +110,11 @@ public class ConsumeServiceImpl implements ConsumeService { // 获取当前时间戳部分 String timestampPart = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS")); - // 获取自增计数器部分（三位数，不足补零） - AtomicInteger atomicInteger = new AtomicInteger(0); - - int count = atomicInteger.getAndUpdate(c -> (c >= 999) ? 0 : c + 1); - String counterPart = String.format("%03d", count); - - + Random random = new Random(); + int randomNumber = random.nextInt(900) + 100; //订单号生成 - userGoldRecord.setOrderCode("XF" + timestampPart + counterPart); + userGoldRecord.setOrderCode("XF" + timestampPart + randomNumber); userGoldRecord.setJwcode(consumeUser.getJwcode()); userGoldRecord.setGoodsName(consumeUser.getGoodsName()); userGoldRecord.setSumGold(-consumeUser.getSumGold()); diff --git a/src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java index 9c75c69..832db37 100644 --- a/src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java @@ -17,6 +17,7 @@ import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.Date; import java.util.List; +import java.util.Random; import java.util.concurrent.atomic.AtomicInteger; /** @@ -98,15 +99,12 @@ public class RechargeServiceImpl implements RechargeService { // 获取当前时间戳部分 String timestampPart = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS")); - // 获取自增计数器部分（三位数，不足补零） - AtomicInteger atomicInteger = new AtomicInteger(0); - - int count = atomicInteger.getAndUpdate(c -> (c >= 999) ? 0 : c + 1); - String counterPart = String.format("%03d", count); + Random random = new Random(); + int randomNumber = random.nextInt(900) + 100; //订单号生成 - userGoldRecord.setOrderCode("CZ" + timestampPart + counterPart); + userGoldRecord.setOrderCode("CZ" + timestampPart + randomNumber); userGoldRecord.setJwcode(rechargeUser.getJwcode()); userGoldRecord.setActivity(rechargeUser.getActivity()); userGoldRecord.setPermanentGold(rechargeUser.getPermanentGold()); From 0a068e447a574f616407d0f9911935d2072c8b44 Mon Sep 17 00:00:00 2001 From: sunjiabei Date: Tue, 8 Jul 2025 15:12:07 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B1=87=E7=8E=87=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/example/demo/controller/RateController.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/example/demo/controller/RateController.java b/src/main/java/com/example/demo/controller/RateController.java index 1d34ac1..74376b9 100644 --- a/src/main/java/com/example/demo/controller/RateController.java +++ b/src/main/java/com/example/demo/controller/RateController.java @@ -13,6 +13,7 @@ import org.springframework.util.ObjectUtils; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; +import java.math.BigDecimal; import java.util.Map; @@ -59,8 +60,8 @@ public class RateController { if (ObjectUtils.isEmpty(rate.getRateName())) { return Result.error("汇率名称不能为空"); } - if (rate.getNum() == null) { - return Result.error("汇率数值不能为空"); + if(rate.getNum()==null || rate.getNum().compareTo(BigDecimal.ZERO) <= 0){ + return Result.error(("汇率数值不能小于等于0")); } rateService.update(rate); return Result.success("编辑成功");