1

backendApi/modules/v1/controllers/ShopController.php

@@ -499,14 +499,14 @@ class ShopController extends BaseController {
             'AUTO_MAINTENANCE' => 'O.AUTO_MAINTENANCE',
             'PAY_TYPE' => 'O.PAY_TYPE',
 //            'CREATE_USER_NAME' => 'O.CREATE_USER',
-            'SKU_CODE' => 'O.SKU_CODE',
-            'DELIVERY_STATUS_NAME' => 'O.DELIVERY_STATUS_NAME',
+            'SKU_CODE' => 'OG.SKU_CODE',
+            'DELIVERY_STATUS_NAME' => 'O.DELIVERY_STATUS',
             'PAY_AT' => 'O.PAY_AT',
             'CONSIGNEE' => 'O.CONSIGNEE',
             'GOODS_TITLE' => 'O.GOODS_TITLE',
             'CREATE_USER' => 'O.CREATE_USER',
             'DEC_USER_NAME' => 'O.DEC_USER_ID',
-            'INVOICE_NO' => 'O.INVOICE_NO',
+            'INVOICE_NO' => 'OG.INVOICE_NO',
         ]);
 
         $condition = ' 1=1 ' . $filter['condition'];
@@ -550,14 +550,14 @@ class ShopController extends BaseController {
             'AUTO_MAINTENANCE' => 'O.AUTO_MAINTENANCE',
             'PAY_TYPE' => 'O.PAY_TYPE',
 //            'CREATE_USER_NAME' => 'O.CREATE_USER',
-            'SKU_CODE' => 'O.SKU_CODE',
-            'DELIVERY_STATUS_NAME' => 'O.DELIVERY_STATUS_NAME',
+            'SKU_CODE' => 'OG.SKU_CODE',
+            'DELIVERY_STATUS_NAME' => 'O.DELIVERY_STATUS',
             'PAY_AT' => 'O.PAY_AT',
             'CONSIGNEE' => 'O.CONSIGNEE',
             'GOODS_TITLE' => 'O.GOODS_TITLE',
             'CREATE_USER' => 'O.CREATE_USER',
             'DEC_USER_NAME' => 'O.DEC_USER_ID',
-            'INVOICE_NO' => 'O.INVOICE_NO',
+            'INVOICE_NO' => 'OG.INVOICE_NO',
         ]);
 
         $isSuper = AdminRole::isSuperAdmin(\Yii::$app->getUser()->getUserInfo()['roleId']);