Преглед изворни кода

推送淘布斯逻辑修改

kevin пре 1 година
родитељ
комит
c41a6ba6a0
2 измењених фајлова са 5 додато и 11 уклоњено
  1. 1 2
      common/helpers/Logistics.php
  2. 4 9
      frontendApi/modules/v1/controllers/ShopController.php

+ 1 - 2
common/helpers/Logistics.php

@@ -153,7 +153,6 @@ class Logistics
                 'total_price' => number_format(100, 2, '.', ''),    // 订单总金额,Decimal 方便通关,固定100马币
                 'total_price' => number_format(100, 2, '.', ''),    // 订单总金额,Decimal 方便通关,固定100马币
                 'currency_code' => 'MYR',  // 产品的货币代码. 如USD(美元),MYR(马来西亚林吉特),SGD(新加坡元),CNY(人民币)
                 'currency_code' => 'MYR',  // 产品的货币代码. 如USD(美元),MYR(马来西亚林吉特),SGD(新加坡元),CNY(人民币)
                 'supplier' => 'MRT',    // 品牌
                 'supplier' => 'MRT',    // 品牌
-//                'remark' => '300ML', // 备注:规格
                 'remark' => $item['CONTENT'], // 备注:规格
                 'remark' => $item['CONTENT'], // 备注:规格
             ];
             ];
         }
         }
@@ -161,7 +160,7 @@ class Logistics
 
 
         LoggerTool::debug($request);
         LoggerTool::debug($request);
 
 
-//        return $this->curl(self::createOrderUrl, $request);
+        return $this->curl(self::createOrderUrl, $request);
     }
     }
 
 
     // 3.获取产品/包裹的重量和状态.
     // 3.获取产品/包裹的重量和状态.

+ 4 - 9
frontendApi/modules/v1/controllers/ShopController.php

@@ -708,22 +708,17 @@ class ShopController extends BaseController {
     {
     {
         $createdAtEnd = strtotime(date('Y-m-d')) - 1;
         $createdAtEnd = strtotime(date('Y-m-d')) - 1;
         // 早0点推送,前一天0-24点的订单
         // 早0点推送,前一天0-24点的订单
-        $query = Order::find()
+        $orderList = Order::find()
             ->where(
             ->where(
-                "(CREATED_AT <= :CREATED_AT_END) AND STATUS=:STATUS AND SEND_AT=:SEND_AT AND (PAY_TYPE='wechat' OR PAY_TYPE='alipay') AND IS_DELETE = 0",
+                "(CREATED_AT <= :CREATED_AT_END) AND STATUS=:STATUS AND SEND_AT=:SEND_AT AND (PAY_TYPE='wechat' OR PAY_TYPE='alipay') AND IS_DELETE = 0 AND SN=:SN",
                 [
                 [
                     ':CREATED_AT_END' => $createdAtEnd,
                     ':CREATED_AT_END' => $createdAtEnd,
                     ':STATUS' => \Yii::$app->params['orderStatus']['paid']['value'],
                     ':STATUS' => \Yii::$app->params['orderStatus']['paid']['value'],
                     ':SEND_AT' => 0,
                     ':SEND_AT' => 0,
-//                    ':PAY_TYPE' => 'online',
                 ]
                 ]
             )
             )
-            ->asArray();
-//            ->all();
-
-        $commandQuery = clone $query;
-        LoggerTool::debug($commandQuery->createCommand()->getRawSql());
-        $orderList = $query->all();
+            ->asArray()
+            ->all();
 
 
         if (!$orderList) {
         if (!$orderList) {
             // 发送预警通知
             // 发送预警通知