wst

common/helpers/Logistics.php

@@ -108,18 +108,19 @@ class Logistics
     // 2.创建订单和产品(以前不存在/已提交的产品).
     function createOrder($order)
     {
+        $baseOrder = $order[0];
         $request = [
-            'order_no' => $order['SN'],   // 客户系统中的订单号
+            'order_no' => $baseOrder['SN'],   // 客户系统中的订单号
             'delivery_method_id' => '60', // 快递方式ID. TODO: 133(test)
             'warehouse_id' => '1',   // 仓库ID. TODO:
             'country' => 'China',    // 收件人国家 Malaysia
-            'state' => Region::getCnName($order['PROVINCE']), // ,   // 收件人省 Johor(test)
-            'city' => Region::getCnName($order['CITY']) . Region::getCnName($order['COUNTY']),   // 收件市县
-            'post_code' => $order['ZIP_CODE'], // 收件人邮政编码
-            'address' => $order['ADDRESS'],    // 收件人送货地址
-            'consignee' => $order['CONSIGNEE_REAL_NAME'],  // 收货人姓名，使用订单中的收货人真实姓名
-            'consignee_ic_number' => $order['CONSIGNEE_ID_NO'], // 收件人身份证号
-            'telephone' => $order['MOBILE'],  // 收件人电话号码
+            'state' => Region::getCnName($baseOrder['PROVINCE']), // ,   // 收件人省 Johor(test)
+            'city' => Region::getCnName($baseOrder['CITY']) . Region::getCnName($baseOrder['COUNTY']),   // 收件市县
+            'post_code' => $baseOrder['ZIP_CODE'], // 收件人邮政编码
+            'address' => $baseOrder['ADDRESS'],    // 收件人送货地址
+            'consignee' => $baseOrder['CONSIGNEE_REAL_NAME'],  // 收货人姓名，使用订单中的收货人真实姓名
+            'consignee_ic_number' => $baseOrder['CONSIGNEE_ID_NO'], // 收件人身份证号
+            'telephone' => $baseOrder['MOBILE'],  // 收件人电话号码
             'sender' => 'Elken',    // 发件人名字
             'sender_country' => 'Malaysia',    // 发件人国家
             'sender_state' => 'Selangor', // ,   // 发件人省

frontendApi/modules/v1/controllers/ShopController.php

@@ -459,12 +459,12 @@ class ShopController extends BaseController {
     public function actionLogistics()
     {
         $orderSn = \Yii::$app->request->get('sn');
-        $order = Order::find()
-            ->alias('O')
-            ->where('SN=:SN', [':SN' => $orderSn])
-            ->select('O.*,U.REAL_NAME,OG.REAL_PRICE,OG.BUY_NUMS,OG.SKU_CODE,OG.GOODS_TITLE,OG.REAL_PV')
+        $order = OrderGoods::find()
+            ->alias('OG')
+            ->where('OG.ORDER_SN=:ORDER_SN', [':ORDER_SN' => $orderSn])
+            ->select('OG.ORDER_SN,OG.REAL_PRICE,OG.BUY_NUMS,OG.SKU_CODE,OG.GOODS_TITLE,OG.REAL_PV,O.*,U.REAL_NAME')
+            ->join('LEFT JOIN', Order::tableName() . ' AS O', 'OG.ORDER_SN=O.SN')
             ->join('LEFT JOIN', User::tableName() . ' AS U', 'U.ID=O.USER_ID')
-            ->join('RIGHT JOIN', OrderGoods::tableName() . ' AS OG', 'OG.ORDER_SN=O.SN')
             ->asArray()
             ->all();
 
@@ -473,7 +473,7 @@ class ShopController extends BaseController {
         if (!$order) {
             return static::notice('订单【' . $orderSn . '】不存在');
         }
-        if ($order['SEND_AT'] > 0) {
+        if ($order[0]['SEND_AT'] > 0) {
             return static::notice('订单【' . $orderSn . '】不可重复推送');
         }
 
@@ -501,8 +501,8 @@ class ShopController extends BaseController {
         $createdAtStart = strtotime('yesterday');
         $createdAtEnd = strtotime(date('Y-m-d')) - 1;
         // 早5点推送，前一天0-24点的订单
-        $orderList = Order::find()
-            ->alias('O')
+        $orderList = OrderGoods::find()
+            ->alias('OG')
             ->where(
                 '(O.CREATED_AT BETWEEN :CREATED_AT_START AND :CREATED_AT_END) AND O.STATUS=:STATUS AND O.SEND_AT=:SEND_AT AND PAY_TYPE=:PAY_TYPE',
                 [
@@ -513,9 +513,9 @@ class ShopController extends BaseController {
                     'PAY_TYPE' => 'online',
                 ]
             )
-            ->select('O.*,U.REAL_NAME,OG.REAL_PRICE,OG.BUY_NUMS,OG.SKU_CODE,OG.GOODS_TITLE,OG.REAL_PV')
+            ->select('OG.ORDER_SN,OG.REAL_PRICE,OG.BUY_NUMS,OG.SKU_CODE,OG.GOODS_TITLE,OG.REAL_PV,O.*,U.REAL_NAME')
+            ->join('LEFT JOIN', Order::tableName() . ' AS O', 'OG.ORDER_SN=O.SN')
             ->join('LEFT JOIN', User::tableName() . ' AS U', 'U.ID=O.USER_ID')
-            ->join('RIGHT JOIN', OrderGoods::tableName() . ' AS OG', 'OG.ORDER_SN=O.SN')
             ->asArray()
             ->all();