|
|
@ -12,7 +12,7 @@ import lombok.extern.slf4j.Slf4j;
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 取消搬家任务
|
|
|
|
* 取消搬家任务 cancelCollectTask
|
|
|
|
* 复制历史界面,取消进行中的搬家任务
|
|
|
|
* 复制历史界面,取消进行中的搬家任务
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@ExtensionService("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();
|
|
|
|
return R.ok();
|
|
|
|