0730-2125-h01

app/command/ExpressOrder.php

@@ -23,7 +23,7 @@ class ExpressOrder extends Command
             $nextPage = 1;
             while (is_numeric($nextPage)) {
                 $resp = (new SaasOrderExpress)->where(["status" => 0])->with(['orders' => function ($query) {
-                    $query->with(['poi']);
+                    $query->field("*")->with(['poi']);
                 }])->page($nextPage,10)->select();
                 if ($resp->isEmpty()) {
                     $output->writeln("没有任务啦==".getDateFull());
@@ -37,8 +37,9 @@ class ExpressOrder extends Command
                     }
                     $startTime = $item['orders']['poi']['order_start']??'09:00';
                     $endTime = $item['orders']['poi']['order_end']??'22:30';
-                    $startTimeStamp = strtotime("Y-m-d {$startTime}:00");
-                    $endTimeStamp = strtotime("Y-m-d {$endTime}:00");
+                    $startTimeStamp = strtotime(date("Y-m-d {$startTime}:00"));
+                    $endTimeStamp = strtotime(date("Y-m-d {$endTime}:00"));
+                    echo "开始时间：{$startTimeStamp}；结束时间：{$endTimeStamp}\n";
                     if (time() > $startTimeStamp && time() < $endTimeStamp) {
                         [$state,$expressData] = $this->getExpressData($item['express_sn'],$item['mobile']);
                         if ($state && $item['orders']['is_error'] == 0) {

app/controller/admin/Order.php

@@ -43,6 +43,8 @@ class Order extends Base
                 $query->field("openid,nickname,avatar");
             },'poi' => function($query){
                 $query->field("poi_id,poi_name,poi_address,nick_name");
+            },"star" => function($query){
+                $query->field("uid,nick_name,avatar_url");
             }],true,['end_time','refund_num'],["end_time" => function ($resp,$next) {
                 return timeDiff(strtotime("+30 minutes",strtotime($next['create_at'])),time());
             },'refund_num' => function($resp,$next){

app/controller/api/Auth.php

@@ -43,14 +43,13 @@ class Auth extends Base
             ],$request->method());
             if (!is_array($param)) return error($param);
             $sessionKey = (new Crypt)->config($this->getDyConfig())->getSessionKey($param['login']);
-            if (empty($sessionKey)) return error("授权登录失败");
+            if (empty($sessionKey)) return error("授权登录失败-m");
             if (!empty($param['code'])) {
                 $mobileStr = (new Crypt)->config($this->getDyConfig())->token()->getMobile($param['code']);
             } else {
                 $data = $this->decrypt($param['encryptedData'],$sessionKey['session_key'],$param['iv']);
                 $mobileStr = $data['purePhoneNumber'];
             }
-            print_r($mobileStr);
             if (empty($mobileStr)) return error("授权信息获取失败");
             return $this->encode("success",['mobile' => $mobileStr,'openid' => $sessionKey['openid']]);
         } catch (\Throwable $throwable) {
@@ -83,7 +82,7 @@ class Auth extends Base
                     $mobile = $this->decrypt2code(sConf('wechat.min_private_key'), $mobileData['mobile']);
                 }
             }
-            if (empty($mobile)) return error("授权登录失败");
+            if (empty($mobile)) return error("授权登录失败-u");
             $userInfo = [
                 "openid"    => $mobileData['openid'],
                 "nickname"  => $param['nickname']?removeEmoji2($param['nickname']):'',

app/controller/merchant/Order.php

@@ -52,6 +52,8 @@ class Order extends Base
                 }]);
             },'user' => function($query){
                 $query->field("openid,nickname,avatar");
+            },"star" => function($query){
+                $query->field("uid,nick_name,avatar_url");
             }],true,['end_time','refund_num'],["end_time" => function ($resp,$next) {
                 return timeDiff(strtotime("+30 minutes",strtotime($next['create_at'])),time());
             },'refund_num' => function($resp,$next){

app/model/saas/SaasOrder.php

@@ -82,4 +82,9 @@ class SaasOrder extends Model
         return $this->hasOne(SaasOrderExpress::class,"order_sn","order_sn");
     }
 
+    public function star(): HasOne
+    {
+        return $this->hasOne(SaasStar::class,"uid","douyin_uid");
+    }
+
 }