From 4fac54404a90bd4c992ee0f613999b99f66072ed Mon Sep 17 00:00:00 2001
From: qiushengjie <qiushengjie2010@foxmail.com>
Date: Wed, 6 Sep 2023 20:38:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E7=9A=84=E5=85=B6=E4=BB=96?=
 =?UTF-8?q?=E5=87=A0=E6=8E=A5=E5=8F=A3=E5=AF=B9=E5=BA=94=E7=9A=84=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../spi/move/CancelCollectTaskService.java    | 20 ++++++++++++++++++-
 .../spi/move/DeleteProductItemService.java    |  2 +-
 .../spi/move/FailRetryMoveTasksService.java   |  2 +-
 .../GetMoveHistoryProductListService.java     |  2 +-
 .../api/spi/move/MoveAgainDetailService.java  |  2 +-
 5 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/ms-biz/src/main/java/com/ms/api/spi/move/CancelCollectTaskService.java b/ms-biz/src/main/java/com/ms/api/spi/move/CancelCollectTaskService.java
index c2a8938d..b74fd9b6 100644
--- a/ms-biz/src/main/java/com/ms/api/spi/move/CancelCollectTaskService.java
+++ b/ms-biz/src/main/java/com/ms/api/spi/move/CancelCollectTaskService.java
@@ -12,7 +12,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /**
- * 取消搬家任务
+ * 取消搬家任务  cancelCollectTask
  * 复制历史界面，取消进行中的搬家任务
  */
 @ExtensionService("cancelCollectTask")
@@ -31,6 +31,24 @@ public class CancelCollectTaskService extends SPIBaseService implements Extensio
         // ----逻辑校验----
 
         // ----业务处理----
+//        if (!$this->webShop->validateCsrfToken()) {
+//            return $this->renderJSON(CommonTool::failResult('CSRF校验不通过'));
+//        }
+//
+//        list($successCancelDetailIds, $skipCancelDetailIds) = $this->moveUtil->cancelCollectTask();
+//        $html = '';
+//        if ($skipCancelDetailIds) {
+//            list($processingTaskCount, $taskDetailList,) = $this->productUtil->getHistoryProductList($_SESSION[SessionConst::shopId], ['taskDetailIds' => $skipCancelDetailIds], 1, count($skipCancelDetailIds));
+//            $html = $this->renderWithoutLayout(array(
+//                            'taskDetailList' => $taskDetailList,
+//                    ), 'move/batch/skip_cancel', true);
+//        }
+//
+//        return $this->renderJSON(CommonTool::successResult([
+//                'processCount' => count($successCancelDetailIds),
+//                'skipCount' => count($skipCancelDetailIds),
+//                'html' => $html
+//        ]));
 
         // ----结果返回----
         return R.ok();
diff --git a/ms-biz/src/main/java/com/ms/api/spi/move/DeleteProductItemService.java b/ms-biz/src/main/java/com/ms/api/spi/move/DeleteProductItemService.java
index 45b57d58..57058c46 100644
--- a/ms-biz/src/main/java/com/ms/api/spi/move/DeleteProductItemService.java
+++ b/ms-biz/src/main/java/com/ms/api/spi/move/DeleteProductItemService.java
@@ -15,7 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 
 /**
  * 删除铺货单
- *
+ * deleteDeleteTask  batchDeleteTaskDetail   deleteFailTaskDetail
  */
 @ExtensionService("deleteProductItem")
 @Slf4j
diff --git a/ms-biz/src/main/java/com/ms/api/spi/move/FailRetryMoveTasksService.java b/ms-biz/src/main/java/com/ms/api/spi/move/FailRetryMoveTasksService.java
index cfafa635..d46ddd70 100644
--- a/ms-biz/src/main/java/com/ms/api/spi/move/FailRetryMoveTasksService.java
+++ b/ms-biz/src/main/java/com/ms/api/spi/move/FailRetryMoveTasksService.java
@@ -12,7 +12,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /**
- * 失败重试
+ * 失败重试  failRetryMoveTasks
  * 复制历史界面，对复制失败的历史记录，进行失败重试
  */
 @ExtensionService("failRetryMoveTasks")
diff --git a/ms-biz/src/main/java/com/ms/api/spi/move/GetMoveHistoryProductListService.java b/ms-biz/src/main/java/com/ms/api/spi/move/GetMoveHistoryProductListService.java
index da857ede..e5d49829 100644
--- a/ms-biz/src/main/java/com/ms/api/spi/move/GetMoveHistoryProductListService.java
+++ b/ms-biz/src/main/java/com/ms/api/spi/move/GetMoveHistoryProductListService.java
@@ -24,7 +24,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * 铺货日志、搬家历史、复制历史
+ * 铺货日志、搬家历史、复制历史 historyProductList
  * 复制历史的搜索接口，根据状态，返回不同状态下的复制历史
  */
 @ExtensionService("getMoveHistoryProductList")
diff --git a/ms-biz/src/main/java/com/ms/api/spi/move/MoveAgainDetailService.java b/ms-biz/src/main/java/com/ms/api/spi/move/MoveAgainDetailService.java
index ec4fa6af..11de14a0 100644
--- a/ms-biz/src/main/java/com/ms/api/spi/move/MoveAgainDetailService.java
+++ b/ms-biz/src/main/java/com/ms/api/spi/move/MoveAgainDetailService.java
@@ -12,7 +12,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /**
- * 再次复制
+ * 再次复制  moveAgainDetail
  * 复制历史界面，对已复制成功的复制历史，进行再次复制操作
  */
 @ExtensionService("moveAgainDetail")