修改订单期数

backendApi/modules/v1/controllers/ShopController.php

@@ -758,10 +758,10 @@ class ShopController extends BaseController {
             }
         } else {
             $filter = $this->filterCondition([
-                'ORDER_SN' => 'ORDER_SN',
-                'ORIGIN_PERIOD'=> 'ORIGIN_PERIOD',
-                'MODERN_PERIOD'=> 'MODERN_PERIOD',
-                'CREATED_AT'=> 'CREATED_AT',
+                'ORDER_SN' => 'P.ORDER_SN',
+                'ORIGIN_PERIOD'=> 'P.ORIGIN_PERIOD',
+                'MODERN_PERIOD'=> 'P.MODERN_PERIOD',
+                'CREATED_AT'=> 'P.CREATED_AT',
             ]);
             $listObj = new OrderPeriodAdjustList();
             $data = $listObj->getList(['condition' => $filter['condition'], 'params' => $filter['params']]);

backendApi/modules/v1/models/lists/shop/OrderPeriodAdjustList.php

@@ -2,6 +2,7 @@
 namespace backendApi\modules\v1\models\lists\shop;
 
 use common\libs\dataList\DataListInterface;
+use common\models\Order;
 use common\models\OrderPeriodAdjust;
 use common\libs\dataList\column\DateTime;
 
@@ -21,9 +22,12 @@ class OrderPeriodAdjustList extends \common\libs\dataList\DataList implements Da
     public function dataHandle()
     {
         $this->listData = OrderPeriodAdjust::lists($this->condition, $this->params, [
-            'select' => '*',
-            'orderBy' => 'CREATED_AT DESC, ID DESC',
-            'from' => OrderPeriodAdjust::tableName(),
+            'select' => 'P.*,O.ORDER_TYPE',
+            'orderBy' => 'P.CREATED_AT DESC, P.ID DESC',
+            'from' => OrderPeriodAdjust::tableName() . ' AS P',
+            'join' => [
+                ['LEFT JOIN', Order::tableName() . ' AS O', 'P.ORDER_SN=O.SN'],
+            ],
             'page' => $this->page,
             'pageSize' => $this->pageSize,
         ]);
@@ -40,8 +44,11 @@ class OrderPeriodAdjustList extends \common\libs\dataList\DataList implements Da
                 'ORDER_SN' => [
                     'header' => '订单号',
                 ],
-                'DEC_SN' => [
-                    'header' => '报单编号',
+                'ORDER_TYPE' => [
+                    'header' => '订单类型',
+                    'value' => function ($row) {
+                        return $row['ORDER_TYPE'] == 'ZC' ? '首单' : '复消';
+                    },
                 ],
                 'ORIGIN_PERIOD' => [
                     'header' => '调整前期数',