feature/EK-3320

backendApi/modules/v1/controllers/ShopController.php

@@ -32,6 +32,7 @@ use common\models\Currency;
 use common\models\CurrencyConversions;
 use common\models\DeclarationPackage;
 use common\models\DecOrder;
+use common\models\Export;
 use common\models\FlowWallet;
 use common\models\forms\DecPackageForm;
 use common\models\forms\ExcelOrderDecForm;
@@ -860,11 +861,17 @@ class ShopController extends BaseController {
         }
 
         $form = new ShopExportForm();
-        $result = $form->run($filter, \Yii::t('ctx', 'actionOrderInvoiceExport'));
+        $result = $form->run($filter, \Yii::t('ctx', 'actionOrderInvoiceExport'),null,$orderSn);
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice(\Yii::t('ctx', 'startExporting')); // 导出开始，请到文件管理-导出文件查看
+
+        //查找最新的导出文件
+        $data = Export::findOneAsArray('REMARK=:REMARK', ['REMARK'=>$orderSn], [
+            'useSlaves' => true,
+            'orderBy' => 'CREATED_AT DESC',
+        ]);
+        return static::notice($data); // 导出开始，请到文件管理-导出文件查看
     }
 
     /**

backendApi/modules/v1/models/exportForms/BaseExportForm.php

@@ -18,14 +18,15 @@ class BaseExportForm extends Model
      * @param $filter
      * @param $listName
      * @param null $consoleRouter
+     * @param null $remark
      * 不传值默认导出controller、action和console里面的controller、action一致
      * @return bool
      * @throws \yii\db\Exception
      */
-    public function export($filter, $listName, $consoleRouter = null){
+    public function export($filter, $listName, $consoleRouter = null,$remark = null){
         $transaction = \Yii::$app->db->beginTransaction();
         try {
-            $this->exportObj->exportHandle($filter, $listName, $consoleRouter);
+            $this->exportObj->exportHandle($filter, $listName, $consoleRouter,$remark);
             $transaction->commit();
             return true;
         } catch (Exception $e) {

backendApi/modules/v1/models/exportForms/ShopExportForm.php

@@ -11,12 +11,13 @@ class ShopExportForm extends BaseExportForm
      * @param $filter
      * @param $listName
      * @param null $consoleRouter
+     * @param null $remark
      * @return bool
      * @throws \yii\db\Exception
      */
-    public function run($filter, $listName, $consoleRouter = null){
+    public function run($filter, $listName, $consoleRouter = null,$remark = null){
         $this->exportObj = ShopExport::instance();
-        return $this->export($filter, $listName, $consoleRouter);
+        return $this->export($filter, $listName, $consoleRouter,$remark);
     }
 
 

common/libs/export/BaseExport.php

@@ -468,14 +468,16 @@ class BaseExport extends Component {
      * @param $filter
      * @param $listName
      * @param null $consoleRouter
+     * @param null remark
      * @throws Exception
      */
-    public function exportHandle($filter, $listName, $consoleRouter = null){
+    public function exportHandle($filter, $listName, $consoleRouter = null,$remark = null){
         $params = [
             'moduleId' => $this->moduleId,
             'listName' => $listName,
             'action' => $consoleRouter ? $consoleRouter : Yii::$app->controller->id.'/'.Yii::$app->controller->action->id, // 这里这么写，是因为调用的异步路由和同步的控制器和方法是一样的，所以，只要不传默认调和同步一样的异步方法
             'userId' => Yii::$app->user->id,
+            'remark' => $remark,
         ];
         $this->webToAsync($params,$filter);
     }