天气查询方法修改

app/FxOrder.php

@@ -42,6 +42,9 @@ class FxOrder extends Model
         $weather = RedisModel::get($redisKey.'_'.$city);
         if($weather) {
             $sellerMemo = self::where('id', $order_id)->pluck('sellerMemo');
+            if(strstr($sellerMemo, $city.'天气状况:'.$weather)) {
+                return true;
+            }
             $sellerMemo = $sellerMemo.'  '.$city.'天气状况:'.$weather;
             self::where('id', $order_id)->update(['sellerMemo'=>$sellerMemo]);
         } else {
@@ -67,11 +70,17 @@ class FxOrder extends Model
                 $expire = $endTime - time();
                 RedisModel::expire($redisKey.'_'.$city, $expire);
                 $sellerMemo = self::where('id', $order_id)->pluck('sellerMemo');
+                if(strstr($sellerMemo, $city.'天气状况:'.$weather)) {
+                    return true;
+                }
                 $sellerMemo = $sellerMemo.'  '.$city.'天气状况:'.$weather;
                 self::where('id', $order_id)->update(['sellerMemo'=>$sellerMemo]);
             } else if($result['error_code'] == '10012'){
                 //超过100次/天上限 更换APPKey
                 RedisModel::set('seafood_order_city_weather_key', '1');
+                $endTime = strtotime(date('Y-m-d 00:00:00',strtotime('+1 days'))) -1;
+                $expire = $endTime - time();
+                RedisModel::expire('seafood_order_city_weather_key', $expire);
                 self::updateWeather($order_id);
             }
         }

app/Order.php

@@ -322,6 +322,9 @@ class Order extends Model
         $weather = RedisModel::get($redisKey.'_'.$city);
         if($weather) {
             $sellerMemo = self::where('id', $order_id)->pluck('sellerMemo');
+            if(strstr($sellerMemo, $city.'天气状况:'.$weather)) {
+                return true;
+            }
             $sellerMemo = $sellerMemo.'  '.$city.'天气状况:'.$weather;
             self::where('id', $order_id)->update(['sellerMemo'=>$sellerMemo]);
         } else {
@@ -347,11 +350,17 @@ class Order extends Model
                 $expire = $endTime - time();
                 RedisModel::expire($redisKey.'_'.$city, $expire);
                 $sellerMemo = self::where('id', $order_id)->pluck('sellerMemo');
+                if(strstr($sellerMemo, $city.'天气状况:'.$weather)) {
+                    return true;
+                }
                 $sellerMemo = $sellerMemo.'  '.$city.'天气状况:'.$weather;
                 self::where('id', $order_id)->update(['sellerMemo'=>$sellerMemo]);
             } else if($result['error_code'] == '10012'){
                 //超过100次/天上限 更换APPKey
                 RedisModel::set('seafood_order_city_weather_key', '1');
+                $endTime = strtotime(date('Y-m-d 00:00:00',strtotime('+1 days'))) -1;
+                $expire = $endTime - time();
+                RedisModel::expire('seafood_order_city_weather_key', $expire);
                 self::updateWeather($order_id);
             }
         }