Explorar el Código

feat: EK-76: Member Auto-Maintenance.

kevinElken hace 10 meses
padre
commit
65462cb7f6

+ 2 - 2
backendApi/modules/v1/controllers/ShopController.php

@@ -428,7 +428,7 @@ class ShopController extends BaseController {
             'ORDER_TYPE'=> 'O.ORDER_TYPE',
             'STATUS' => 'O.STATUS',
             'COUNTRY' => 'O.COUNTRY_ID',
-            'IS_AUTO' => 'O.IS_AUTO'
+            'AUTO_MAINTENANCE' => 'O.AUTO_MAINTENANCE'
         ]);
         $condition = ' 1=1 ' . $filter['condition'];
         $params = $filter['params'];
@@ -454,7 +454,7 @@ class ShopController extends BaseController {
             'CREATED_AT'=> 'O.CREATED_AT',
             'ORDER_TYPE'=> 'O.ORDER_TYPE',
             'STATUS' => 'O.STATUS',
-            'IS_AUTO' => 'O.IS_AUTO'
+            'AUTO_MAINTENANCE' => 'O.AUTO_MAINTENANCE'
         ]);
         $filter['condition'] = !$filter['condition'] ? '1=1 AND O.IS_DELETE=0' : ('O.IS_DELETE=0 ' . $filter['condition']);
         $form = new ShopExportForm();

+ 7 - 7
backendApi/modules/v1/models/lists/shop/OrderList.php

@@ -377,10 +377,10 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                        return $this->getDeliveryStatus()[$row['DELIVERY_STATUS']]['label'] ?? '';
                     },
                 ],
-                'IS_AUTO' => [
-                    'header' => \Yii::t('ctx', 'shopOrderListIsAuto'), // 是否自动
+                'AUTO_MAINTENANCE' => [
+                    'header' => \Yii::t('ctx', 'shopListAutoMaintenance'),
                     'value' => function ($row) {
-                        return $row['IS_AUTO'] == 1 ? \Yii::t('ctx', 'shopOrderListIsAutoYes') : \Yii::t('ctx', 'shopOrderListIsAutoNo');
+                        return $row['AUTO_MAINTENANCE'] == 1 ? \Yii::t('ctx', 'yes') : \Yii::t('ctx', 'no');
                     },
                 ],
             ];
@@ -423,12 +423,12 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                         ['id' => $this->getOrderStatus()['failPaid']['value'], 'name' => $this->getOrderStatus()['failPaid']['label']]
                     ]
                 ],
-                'IS_AUTO' => [
-                    'name'=>\Yii::t('ctx', 'shopOrderListIsAuto'),
+                'AUTO_MAINTENANCE' => [
+                    'name'=>\Yii::t('ctx', 'shopListAutoMaintenance'),
                     'other'=> 'select',
                     'selectData'=> [
-                        ['id'=>1, 'name'=>\Yii::t('ctx', 'shopOrderListIsAutoYes')],
-                        ['id'=>0, 'name'=>\Yii::t('ctx', 'shopOrderListIsAutoNo')],
+                        ['id'=>1, 'name'=>\Yii::t('ctx', 'yes')],
+                        ['id'=>0, 'name'=>\Yii::t('ctx', 'no')],
                     ]
                 ]
             ];

+ 2 - 0
common/models/ApproachDecOrder.php

@@ -34,6 +34,7 @@ use Yii;
  * @property int $UPGRADE_TYPE 升级类型
  * @property string $ORI_LV 升级前级别
  * @property string $UPGRADE_LV 升级后级别
+ * @property int AUTO_MAINTENANCE AMP订单
  */
 class ApproachDecOrder extends \common\components\ActiveRecord
 {
@@ -92,6 +93,7 @@ class ApproachDecOrder extends \common\components\ActiveRecord
             'UPDATED_AT' => '更新时间',
             'IS_DEL' => '是否删除',
             'DELETED_AT' => '删除时间',
+            'AUTO_MAINTENANCE' => 'AMP订单',
         ];
     }
 }