From 78c244afc28bf1890e27fcdd241b42eb81ee1d49 Mon Sep 17 00:00:00 2001
From: shahaibo <1023316923@qq.com>
Date: Sun, 15 Sep 2024 13:37:09 +0800
Subject: [PATCH] TASK:mixi;

---
 .../common/tasks/MiTuExportScheduledTask.java | 26 +++++++++----------
 .../com/mixi/service/TAppProductService.java  | 13 ++++++++++
 .../impl/SalesIncentivesServiceImpl.java      |  2 +-
 3 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/mixi/common/tasks/MiTuExportScheduledTask.java b/src/main/java/com/mixi/common/tasks/MiTuExportScheduledTask.java
index 0dc552c..4b172d4 100644
--- a/src/main/java/com/mixi/common/tasks/MiTuExportScheduledTask.java
+++ b/src/main/java/com/mixi/common/tasks/MiTuExportScheduledTask.java
@@ -620,10 +620,10 @@ public class MiTuExportScheduledTask {
                         imagePath = getImagePath(previousPluCode);
 
                         // 合并单元格并插入图片或占位符
-                        if (startRow < rowNum) {
+                        if (startRow < rowNum - 1) {
                             mergeCells(sheet, startRow, rowNum - 1);
-                            linkImageToCell(workbook, sheet, startRow, rowNum - 1, headers.length - 1, imagePath, channelSftp);
                         }
+                        linkImageToCell(workbook, sheet, startRow, rowNum - 1, headers.length - 1, imagePath, channelSftp);
 
                         startRow = rowNum;
                         previousPluCode = currentPluCode;
@@ -654,11 +654,11 @@ public class MiTuExportScheduledTask {
                     rowNum++;
                 }
                 // 处理最后一个PLU_CODE的数据
-                if (startRow < rowNum) {
+                if (startRow < rowNum - 1) {
                     String currentPluCode = transactionSummaryList.get(transactionSummaryList.size() - 1).getPLU_CODE();
                     imagePath = getImagePath(currentPluCode);
-                    mergeCells(sheet, startRow, rowNum);
-                    linkImageToCell(workbook, sheet, startRow, rowNum, headers.length - 1, imagePath, channelSftp);
+                    mergeCells(sheet, startRow, rowNum - 1);
+                    linkImageToCell(workbook, sheet, startRow, rowNum - 1, headers.length - 1, imagePath, channelSftp);
                 }
             }
 
@@ -750,8 +750,8 @@ public class MiTuExportScheduledTask {
                         // 合并单元格并插入图片
                         if (startRow < rowNum - 1) {
                             mergeCells(sheet, startRow, rowNum - 1);
-                            linkImageToCell(workbook, sheet, startRow, rowNum - 1, headers.length - 1, imagePath, channelSftp);
                         }
+                        linkImageToCell(workbook, sheet, startRow, rowNum - 1, headers.length - 1, imagePath, channelSftp);
 
                         startRow = rowNum;
                         previousPluCode = currentPluCode;
@@ -783,12 +783,12 @@ public class MiTuExportScheduledTask {
                     rowNum++;
                 }
 
-                if (startRow < rowNum) {
+                if (startRow < rowNum - 1) {
                     String currentPluCode = weeklyHeavyStockList.get(weeklyHeavyStockList.size() - 1).getPLU_CODE();
                     imagePath = getImagePath(currentPluCode);
-                    mergeCells(sheet, startRow, rowNum);
+                    mergeCells(sheet, startRow, rowNum - 1);
                     if (imagePath != null && !imagePath.isEmpty()) {
-                        linkImageToCell(workbook, sheet, startRow, rowNum, headers.length - 1, imagePath, channelSftp);
+                        linkImageToCell(workbook, sheet, startRow, rowNum - 1, headers.length - 1, imagePath, channelSftp);
                     }
                 }
             }
@@ -932,8 +932,8 @@ public class MiTuExportScheduledTask {
                         // 新的PLU_CODE，合并之前的单元格，并插入图片
                         if (startRow < rowNum - 1) {
                             mergeCells(sheet, startRow, rowNum - 1);
-                            linkImageToCell(workbook, sheet, startRow, rowNum - 1, 0, imagePath, channelSftp);
                         }
+                        linkImageToCell(workbook, sheet, startRow, rowNum - 1, 0, imagePath, channelSftp);
                         startRow = rowNum;
                         previousPluCode = weeklyHeavyStock.getPLU_CODE();
                     }
@@ -986,11 +986,11 @@ public class MiTuExportScheduledTask {
                 }
 
                 // 确保处理最后一个Plu Code
-                if (startRow < rowNum) {
+                if (startRow < rowNum - 1) {
                     String currentPluCode = weeklyHeavyStockList.get(weeklyHeavyStockList.size() - 1).getPLU_CODE();
                     imagePath = getImagePath(currentPluCode);
-                    mergeCells(sheet, startRow, rowNum);
-                    linkImageToCell(workbook, sheet, startRow, rowNum, 0, imagePath, channelSftp);
+                    mergeCells(sheet, startRow, rowNum - 1);
+                    linkImageToCell(workbook, sheet, startRow, rowNum - 1, 0, imagePath, channelSftp);
                 }
 
             }
diff --git a/src/main/java/com/mixi/service/TAppProductService.java b/src/main/java/com/mixi/service/TAppProductService.java
index 29c1b18..0d6c2da 100644
--- a/src/main/java/com/mixi/service/TAppProductService.java
+++ b/src/main/java/com/mixi/service/TAppProductService.java
@@ -716,6 +716,19 @@ public class TAppProductService extends ServiceImpl<TProductMapper, TProduct> {
                     }
                     return result;
                 });
+        List<AppNewProductVO> records = convert.getRecords();
+        List<AppNewProductVO> newRecords = new ArrayList<>();
+        for (AppNewProductVO record : records) {
+            if (record.getIsSoldOut() == 0) {
+                newRecords.add(record);
+            }
+        }
+        for (AppNewProductVO record : records) {
+            if (record.getIsSoldOut() == 1) {
+                newRecords.add(record);
+            }
+        }
+        convert.setRecords(newRecords);
         return PageBaseResponse.success(convert);
     }
     private List<TProduct> findByBatchId(String batchId, Long accountId ) {
diff --git a/src/main/java/com/mixi/service/impl/SalesIncentivesServiceImpl.java b/src/main/java/com/mixi/service/impl/SalesIncentivesServiceImpl.java
index 5bcd17f..142f51b 100644
--- a/src/main/java/com/mixi/service/impl/SalesIncentivesServiceImpl.java
+++ b/src/main/java/com/mixi/service/impl/SalesIncentivesServiceImpl.java
@@ -152,7 +152,7 @@ public class SalesIncentivesServiceImpl extends ServiceImpl<TaskRuleMapper, Task
         LocalDate today = LocalDate.now();
 
         // 获取昨日日期
-        LocalDate yesterday = today.minusDays(30);
+        LocalDate yesterday = today.minusDays(60);
 
         // 格式化日期
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");