From 2cab2f69fe7efff3f1f014022be707a6648754e3 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 13 四月 2026 14:14:42 +0800
Subject: [PATCH] fix: 改为补充发货信息才扣减库存、销售订单缺失审批通过状态、审批流程编号重复

---
 src/main/java/com/ruoyi/approve/utils/DailyRedisCounter.java |   86 +++++++++++++++++++++++++++++++++++++++---
 1 files changed, 79 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/ruoyi/approve/utils/DailyRedisCounter.java b/src/main/java/com/ruoyi/approve/utils/DailyRedisCounter.java
index eec0e4a..3f9aeca 100644
--- a/src/main/java/com/ruoyi/approve/utils/DailyRedisCounter.java
+++ b/src/main/java/com/ruoyi/approve/utils/DailyRedisCounter.java
@@ -1,12 +1,21 @@
 package com.ruoyi.approve.utils;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ruoyi.approve.mapper.ApproveProcessMapper;
+import com.ruoyi.approve.pojo.ApproveProcess;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.time.Duration;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.Calendar;
+import java.util.Date;
 import java.util.concurrent.TimeUnit;
 
 
@@ -21,7 +30,10 @@
         this.redisTemplate = redisTemplate;
     }
 
-    /**
+    @Value("${ruoyi.approvalNumberPrefix}")
+    private String approvalNumberPrefix;
+
+    /**鏌ョ紦瀛�
      * 鑾峰彇鎸囧畾璁℃暟鍣ㄥ湪浠婃棩鐨勬暟鍊硷紝骞惰嚜澧�1
      * @param counterName 璁℃暟鍣ㄥ悕绉帮紙渚嬪锛歭ogin_count銆乷rder_count锛�
      * @return 浠婃棩鑷鍚庣殑璁℃暟鍊�
@@ -39,6 +51,69 @@
         return count;
     }
 
+    @Autowired
+    private ApproveProcessMapper approveProcessMapper;
+
+    /**
+     * 鑾峰彇褰撳墠鏃堕棿鐨�  寮�濮嬫棩鏈�  锛岀粨鏉熸棩鏈�
+     * @return
+     */
+    public static StartAndEndDateDto getDateTime(){
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        Date date = new Date();
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(date);
+        cal.add(Calendar.DATE,1);
+        String startDateTime = simpleDateFormat.format(date);
+        String endDateTime = simpleDateFormat.format(cal.getTime());
+        StartAndEndDateDto startAndEndDateDto = new StartAndEndDateDto();
+        startAndEndDateDto.setStartDate(startDateTime);
+        startAndEndDateDto.setEndDate(endDateTime);
+        return startAndEndDateDto;
+    }
+
+    /**鏌ユ暟鎹簱
+     * 鑾峰彇鎸囧畾璁℃暟鍣ㄥ湪浠婃棩鐨勬暟鍊硷紝骞惰嚜澧�1
+     * @return 浠婃棩鑷鍚庣殑璁℃暟鍊�
+     */
+    public long incrementAndGetByDb() {
+        String today = LocalDate.now().format(DATE_FORMAT);
+        String key = approvalNumberPrefix + ":approveNum:" + today;
+        String lockKey = "lock:" + key;
+
+        if (Boolean.FALSE.equals(redisTemplate.hasKey(key))) {
+            Boolean acquired = redisTemplate.opsForValue().setIfAbsent(lockKey, "1", 10, TimeUnit.SECONDS);
+            if (Boolean.TRUE.equals(acquired)) {
+                try {
+                    if (Boolean.FALSE.equals(redisTemplate.hasKey(key))) {
+                        StartAndEndDateDto dateTime = getDateTime();
+                        LambdaQueryWrapper<ApproveProcess> approveProcessLambdaQueryWrapper = new LambdaQueryWrapper<>();
+                        approveProcessLambdaQueryWrapper
+                                .eq(ApproveProcess::getApproveDelete, 0)
+                                .gt(ApproveProcess::getCreateTime, dateTime.getStartDate())
+                                .lt(ApproveProcess::getCreateTime, dateTime.getEndDate());
+                        Long count = approveProcessMapper.selectCount(approveProcessLambdaQueryWrapper);
+                        long initialCount = (count == null) ? 0 : count;
+
+                        redisTemplate.opsForValue().set(key, String.valueOf(initialCount), 24, TimeUnit.HOURS);
+                    }
+                } finally {
+                    // 閲婃斁閿�
+                    redisTemplate.delete(lockKey);
+                }
+            } else {
+                try {
+                    Thread.sleep(100);
+                } catch (InterruptedException e) {
+                    Thread.currentThread().interrupt();
+                }
+                return incrementAndGetByDb(); // 閫掑綊閲嶈瘯
+            }
+        }
+
+        return redisTemplate.opsForValue().increment(key);
+    }
+
     /**
      * 鑾峰彇鎸囧畾璁℃暟鍣ㄥ湪浠婃棩鐨勫綋鍓嶆暟鍊�
      * @param counterName 璁℃暟鍣ㄥ悕绉�
@@ -54,12 +129,9 @@
      * 璁＄畻璺濈娆℃棩鍑屾櫒鐨勭鏁�
      */
     private long calculateSecondsUntilMidnight() {
-        LocalDate tomorrow = LocalDate.now().plusDays(1);
-        LocalDate midnight = tomorrow.atStartOfDay().toLocalDate();
-        return java.time.Duration.between(
-                LocalDate.now().atTime(23, 59, 59),
-                midnight.atTime(0, 0, 0)
-        ).getSeconds() + 1;
+        LocalDateTime now = LocalDateTime.now();
+        LocalDateTime midnight = now.toLocalDate().plusDays(1).atStartOfDay();
+        return Duration.between(now, midnight).getSeconds();
     }
 
     /**

--
Gitblit v1.9.3