1

backendApi/modules/v1/controllers/ShopController.php

@@ -310,7 +310,7 @@ class ShopController extends BaseController {
             'AMOUNT'=> 'DP.AMOUNT',
             'PV'=> 'DP.PV',
             'STATUS'=> 'DP.STATUS',
-			'STORE_NUMS'=>'DP.STORE_NUMS',
+            'STORE_NUMS'=>'DP.STORE_NUMS',
         ]);
         $condition = $filter['condition'];
         $params = $filter['params'];
@@ -496,7 +496,17 @@ class ShopController extends BaseController {
             'ORDER_TYPE'=> 'O.ORDER_TYPE',
             'STATUS' => 'O.STATUS',
             'COUNTRY' => 'O.COUNTRY_ID',
-            'AUTO_MAINTENANCE' => 'O.AUTO_MAINTENANCE'
+            'AUTO_MAINTENANCE' => 'O.AUTO_MAINTENANCE',
+            'PAY_TYPE' => 'O.PAY_TYPE',
+            'CREATE_USER_NAME' => 'O.CREATE_USER_NAME',
+            'SKU_CODE' => 'O.SKU_CODE',
+            'DELIVERY_STATUS_NAME' => 'O.DELIVERY_STATUS_NAME',
+            'PAY_AT' => 'O.PAY_AT',
+            'CONSIGNEE' => 'O.CONSIGNEE',
+            'GOODS_TITLE' => 'O.GOODS_TITLE',
+            'CREATE_USER' => 'O.CREATE_USER',
+            'DEC_USER_NAME' => 'O.DEC_USER_NAME',
+            'INVOICE_NO' => 'O.INVOICE_NO',
         ]);
 
         $condition = ' 1=1 ' . $filter['condition'];
@@ -537,7 +547,17 @@ class ShopController extends BaseController {
             'ORDER_TYPE'=> 'O.ORDER_TYPE',
             'STATUS' => 'O.STATUS',
             'COUNTRY' => 'O.COUNTRY_ID',
-            'AUTO_MAINTENANCE' => 'O.AUTO_MAINTENANCE'
+            'AUTO_MAINTENANCE' => 'O.AUTO_MAINTENANCE',
+            'PAY_TYPE' => 'O.PAY_TYPE',
+            'CREATE_USER_NAME' => 'O.CREATE_USER_NAME',
+            'SKU_CODE' => 'O.SKU_CODE',
+            'DELIVERY_STATUS_NAME' => 'O.DELIVERY_STATUS_NAME',
+            'PAY_AT' => 'O.PAY_AT',
+            'CONSIGNEE' => 'O.CONSIGNEE',
+            'GOODS_TITLE' => 'O.GOODS_TITLE',
+            'CREATE_USER' => 'O.CREATE_USER',
+            'DEC_USER_NAME' => 'O.DEC_USER_NAME',
+            'INVOICE_NO' => 'O.INVOICE_NO',
         ]);
 
         $isSuper = AdminRole::isSuperAdmin(\Yii::$app->getUser()->getUserInfo()['roleId']);
@@ -822,10 +842,6 @@ class ShopController extends BaseController {
             'MOBILE'=> 'O.MOBILE',
             'PERIOD_NUM'=> 'O.PERIOD_NUM',
             'CREATED_AT'=> 'O.CREATED_AT',
-            'ORDER_TYPE'=> 'O.ORDER_TYPE',
-            'STATUS' => 'O.STATUS',
-            'COUNTRY' => 'O.COUNTRY_ID',
-            'AUTO_MAINTENANCE' => 'O.AUTO_MAINTENANCE'
         ]);
 
         $filter['condition'] = ' O.IS_DELETE=0 AND O.SN=:SN';
@@ -1191,7 +1207,7 @@ class ShopController extends BaseController {
     {
         $prefix = 'Inv'.$country_code;
         $currentDate = date('dmY',$pay_at?:time());
-        
+
         // 查询今天生成的最新发票号（包含当天日期格式的）
         $order = Order::find()
             ->where(['STATUS' => 1, 'IS_DELETE' => 0])

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

@@ -126,6 +126,10 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                     'header' => \Yii::t('ctx', 'shopOrderListOrderCode'), // 订单号
                     'headerOther' => ['width' => '200'],
                 ],
+                'INVOICE_NO' => [
+                    'header' => \Yii::t('ctx', 'taxInvoice'), // 发票号
+                    'headerOther' => ['width' => '200'],
+                ],
 //                'STATUS' => null,
                 'STATUS' => [
                     'header' => \Yii::t('ctx', 'shopOrderListOrderStatus'), // 订单状态
@@ -367,7 +371,7 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                     ],
                     'value' => function ($row) {
 
-                       return $this->getDeliveryStatus()[$row['DELIVERY_STATUS']]['label'] ?? '';
+                        return $this->getDeliveryStatus()[$row['DELIVERY_STATUS']]['label'] ?? '';
                     },
                 ],
                 'AUTO_MAINTENANCE' => [
@@ -425,7 +429,46 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                         ['id'=>1, 'name'=>\Yii::t('ctx', 'yes')],
                         ['id'=>0, 'name'=>\Yii::t('ctx', 'no')],
                     ]
-                ]
+                ],
+                'PAY_TYPE' => [
+                    'name' => \Yii::t('ctx', 'shopOrderListPayType'), // 支付方式
+                    'other'=> 'select',
+                    'selectData'=>self::getpayTypes()
+                ],
+                'CREATE_USER_NAME' => [
+                    'name' => \Yii::t('ctx', 'shopOrderListCreatorName'), // 创建人姓名
+                ],
+                'SKU_CODE' => [
+                    'name' => \Yii::t('ctx', 'shopOrderListProductCode'), // 存货编码
+                ],
+                'DELIVERY_STATUS_NAME' => [
+                    'name' => \Yii::t('ctx', 'shopOrderListShipmentStatus'), // 发货状态
+                    'other'=> 'select',
+                    'selectData'=>[
+                        ['id'=>0, 'name'=>\Yii::t('ctx', 'shopOrderListUndelivered')],
+                        ['id'=>1, 'name'=>\Yii::t('ctx', 'shopOrderListDelivered')],
+                        ['id'=>2, 'name'=>\Yii::t('ctx', 'shopOrderListConfirmReceipt')],
+                    ]
+                ],
+                'PAY_AT' => [
+                    'name' => \Yii::t('ctx', 'shopOrderListPaymentTime'), // 支付时间
+                    'other' => 'date'
+                ],
+                'CONSIGNEE' => [
+                    'name' => \Yii::t('ctx', 'shopOrderListRecipient'), // 收货人
+                ],
+                'GOODS_TITLE' => [
+                    'name' => \Yii::t('ctx', 'shopOrderListProductName'), // 存货名称
+                ],
+                'CREATE_USER' => [
+                    'name' => \Yii::t('ctx', 'shopOrderListCreatorNo'), // 创建人编号
+                ],
+                'DEC_USER_NAME' => [
+                    'name' => \Yii::t('ctx', 'shopOrderListStockist'), // 报单中心
+                ],
+                'INVOICE_NO' => [
+                    'name' => \Yii::t('ctx', 'taxInvoice'), // 发票号
+                ],
             ];
         }
         return $this->filterTypes;
@@ -544,6 +587,20 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
             ];
         }
 
+        return $data;
+    }
+    public function getpayTypes()
+    {
+        $payTypes = ShopGoods::payTypes();
+
+        $data = [];
+        foreach ($payTypes as $key=>$payType) {
+            $data[] = [
+                'id' => $key,
+                'name' => $payType['name'],
+            ];
+        }
+
         return $data;
     }
 }