Merge remote-tracking branch 'origin/milestone-20250702-金币重构一期' into milestone-20250702-金币重构一期

src/main/java/com/example/demo/controller/RateController.java

@@ -60,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);
         if (rate.getNum() == null || rate.getNum().equals(BigDecimal.ZERO)) {

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());

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());