kevin_zhangl 2 vuotta sitten
vanhempi
commit
e6c483252f

+ 1 - 1
common/helpers/Logistics.php

@@ -145,7 +145,7 @@ class Logistics
 
         LoggerTool::info(['actionLogisticsOrder', $request]);
 
-//        return $this->curl(self::createOrderUrl, $request);
+        return $this->curl(self::createOrderUrl, $request);
     }
 
     // 3.获取产品/包裹的重量和状态.

+ 41 - 27
frontendApi/modules/v1/controllers/ShopController.php

@@ -459,20 +459,19 @@ class ShopController extends BaseController {
     public function actionLogistics()
     {
         $orderSn = \Yii::$app->request->get('sn');
-        $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')
-            ->asArray()
-            ->all();
+        // TODO: Yii2框架BUG,使用find all left join时只返回一条数据
+//        $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')
+//            ->asArray()
+//            ->all();
 
         $sql = 'SELECT `OG`.`ORDER_SN`, `OG`.`REAL_PRICE`, `OG`.`BUY_NUMS`, `OG`.`SKU_CODE`, `OG`.`GOODS_TITLE`, `OG`.`REAL_PV`, `O`.*, `U`.`REAL_NAME` FROM `AR_ORDER_GOODS` `OG` LEFT JOIN `AR_ORDER` `O` ON OG.ORDER_SN=O.SN LEFT JOIN `AR_USER` `U` ON U.ID=O.USER_ID WHERE OG.ORDER_SN=:ORDER_SN';
         $order = Yii::$app->db->createCommand($sql)->bindValue(':ORDER_SN', $orderSn)->queryAll();
 
-        LoggerTool::info(['order', $order]);
-
         if (!$order) {
             return static::notice('订单【' . $orderSn . '】不存在');
         }
@@ -504,23 +503,38 @@ class ShopController extends BaseController {
         $createdAtStart = strtotime('yesterday');
         $createdAtEnd = strtotime(date('Y-m-d')) - 1;
         // 早5点推送,前一天0-24点的订单
-        $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',
-                [
-                    ':CREATED_AT_START' => $createdAtStart,
-                    ':CREATED_AT_END' => $createdAtEnd,
-                    ':STATUS' => \Yii::$app->params['orderStatus']['paid']['value'],
-                    ':SEND_AT' => 0,
-                    'PAY_TYPE' => 'online',
-                ]
-            )
-            ->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')
-            ->asArray()
-            ->all();
+//        $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',
+//                [
+//                    ':CREATED_AT_START' => $createdAtStart,
+//                    ':CREATED_AT_END' => $createdAtEnd,
+//                    ':STATUS' => \Yii::$app->params['orderStatus']['paid']['value'],
+//                    ':SEND_AT' => 0,
+//                    'PAY_TYPE' => 'online',
+//                ]
+//            )
+//            ->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')
+//            ->asArray()
+//            ->all();
+
+
+        // 早5点推送,前一天0-24点的订单
+        $sql = 'SELECT `OG`.`ORDER_SN`, `OG`.`REAL_PRICE`, `OG`.`BUY_NUMS`, `OG`.`SKU_CODE`, `OG`.`GOODS_TITLE`, `OG`.`REAL_PV`, `O`.*, `U`.`REAL_NAME` FROM `AR_ORDER_GOODS` `OG` 
+                LEFT JOIN `AR_ORDER` `O` ON OG.ORDER_SN=O.SN 
+                LEFT JOIN `AR_USER` `U` ON U.ID=O.USER_ID 
+                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';
+        $orderList = Yii::$app->db->createCommand($sql)->bindValues(                [
+            ':CREATED_AT_START' => $createdAtStart,
+            ':CREATED_AT_END' => $createdAtEnd,
+            ':STATUS' => \Yii::$app->params['orderStatus']['paid']['value'],
+            ':SEND_AT' => 0,
+            'PAY_TYPE' => 'online',
+        ])->queryAll();
+
 
         $orderSnSuccess = [];
         $orderSnFailed = [];