Browse Source

天气查询方法修改

shensong 5 years ago
parent
commit
7626c981b3
2 changed files with 18 additions and 0 deletions
  1. 9 0
      app/FxOrder.php
  2. 9 0
      app/Order.php

+ 9 - 0
app/FxOrder.php

42
         $weather = RedisModel::get($redisKey.'_'.$city);
42
         $weather = RedisModel::get($redisKey.'_'.$city);
43
         if($weather) {
43
         if($weather) {
44
             $sellerMemo = self::where('id', $order_id)->pluck('sellerMemo');
44
             $sellerMemo = self::where('id', $order_id)->pluck('sellerMemo');
45
+            if(strstr($sellerMemo, $city.'天气状况:'.$weather)) {
46
+                return true;
47
+            }
45
             $sellerMemo = $sellerMemo.'  '.$city.'天气状况:'.$weather;
48
             $sellerMemo = $sellerMemo.'  '.$city.'天气状况:'.$weather;
46
             self::where('id', $order_id)->update(['sellerMemo'=>$sellerMemo]);
49
             self::where('id', $order_id)->update(['sellerMemo'=>$sellerMemo]);
47
         } else {
50
         } else {
67
                 $expire = $endTime - time();
70
                 $expire = $endTime - time();
68
                 RedisModel::expire($redisKey.'_'.$city, $expire);
71
                 RedisModel::expire($redisKey.'_'.$city, $expire);
69
                 $sellerMemo = self::where('id', $order_id)->pluck('sellerMemo');
72
                 $sellerMemo = self::where('id', $order_id)->pluck('sellerMemo');
73
+                if(strstr($sellerMemo, $city.'天气状况:'.$weather)) {
74
+                    return true;
75
+                }
70
                 $sellerMemo = $sellerMemo.'  '.$city.'天气状况:'.$weather;
76
                 $sellerMemo = $sellerMemo.'  '.$city.'天气状况:'.$weather;
71
                 self::where('id', $order_id)->update(['sellerMemo'=>$sellerMemo]);
77
                 self::where('id', $order_id)->update(['sellerMemo'=>$sellerMemo]);
72
             } else if($result['error_code'] == '10012'){
78
             } else if($result['error_code'] == '10012'){
73
                 //超过100次/天上限 更换APPKey
79
                 //超过100次/天上限 更换APPKey
74
                 RedisModel::set('seafood_order_city_weather_key', '1');
80
                 RedisModel::set('seafood_order_city_weather_key', '1');
81
+                $endTime = strtotime(date('Y-m-d 00:00:00',strtotime('+1 days'))) -1;
82
+                $expire = $endTime - time();
83
+                RedisModel::expire('seafood_order_city_weather_key', $expire);
75
                 self::updateWeather($order_id);
84
                 self::updateWeather($order_id);
76
             }
85
             }
77
         }
86
         }

+ 9 - 0
app/Order.php

322
         $weather = RedisModel::get($redisKey.'_'.$city);
322
         $weather = RedisModel::get($redisKey.'_'.$city);
323
         if($weather) {
323
         if($weather) {
324
             $sellerMemo = self::where('id', $order_id)->pluck('sellerMemo');
324
             $sellerMemo = self::where('id', $order_id)->pluck('sellerMemo');
325
+            if(strstr($sellerMemo, $city.'天气状况:'.$weather)) {
326
+                return true;
327
+            }
325
             $sellerMemo = $sellerMemo.'  '.$city.'天气状况:'.$weather;
328
             $sellerMemo = $sellerMemo.'  '.$city.'天气状况:'.$weather;
326
             self::where('id', $order_id)->update(['sellerMemo'=>$sellerMemo]);
329
             self::where('id', $order_id)->update(['sellerMemo'=>$sellerMemo]);
327
         } else {
330
         } else {
347
                 $expire = $endTime - time();
350
                 $expire = $endTime - time();
348
                 RedisModel::expire($redisKey.'_'.$city, $expire);
351
                 RedisModel::expire($redisKey.'_'.$city, $expire);
349
                 $sellerMemo = self::where('id', $order_id)->pluck('sellerMemo');
352
                 $sellerMemo = self::where('id', $order_id)->pluck('sellerMemo');
353
+                if(strstr($sellerMemo, $city.'天气状况:'.$weather)) {
354
+                    return true;
355
+                }
350
                 $sellerMemo = $sellerMemo.'  '.$city.'天气状况:'.$weather;
356
                 $sellerMemo = $sellerMemo.'  '.$city.'天气状况:'.$weather;
351
                 self::where('id', $order_id)->update(['sellerMemo'=>$sellerMemo]);
357
                 self::where('id', $order_id)->update(['sellerMemo'=>$sellerMemo]);
352
             } else if($result['error_code'] == '10012'){
358
             } else if($result['error_code'] == '10012'){
353
                 //超过100次/天上限 更换APPKey
359
                 //超过100次/天上限 更换APPKey
354
                 RedisModel::set('seafood_order_city_weather_key', '1');
360
                 RedisModel::set('seafood_order_city_weather_key', '1');
361
+                $endTime = strtotime(date('Y-m-d 00:00:00',strtotime('+1 days'))) -1;
362
+                $expire = $endTime - time();
363
+                RedisModel::expire('seafood_order_city_weather_key', $expire);
355
                 self::updateWeather($order_id);
364
                 self::updateWeather($order_id);
356
             }
365
             }
357
         }
366
         }