作者 郭文星

123

@@ -191,7 +191,7 @@ class Car extends Backend @@ -191,7 +191,7 @@ class Car extends Backend
191 ]; 191 ];
192 $url_data="?start_address={$route["start_address"]}&route_id={$route["id"]}&driver_id={$driver["id"]}&license_plate={$car["license_plate"]}&name={$driver["name"]}&end_address{$route["end_address"]}&price{$route["price"]}"; 192 $url_data="?start_address={$route["start_address"]}&route_id={$route["id"]}&driver_id={$driver["id"]}&license_plate={$car["license_plate"]}&name={$driver["name"]}&end_address{$route["end_address"]}&price{$route["price"]}";
193 $place_image=$this->getQRCode($url_data); 193 $place_image=$this->getQRCode($url_data);
194 - $result = Db::name('driver')->where('id','=',$driver["id"])->update(['place_image'=>$place_image['fileurl']]); 194 + $result = Db::name('driver')->where('id','=',$driver["id"])->update(['place_image'=>$place_image]);
195 } 195 }
196 196
197 $result = $row->allowField(true)->save($params); 197 $result = $row->allowField(true)->save($params);
@@ -234,7 +234,7 @@ class Car extends Backend @@ -234,7 +234,7 @@ class Car extends Backend
234 $ret = file_put_contents($filename, $result, true); 234 $ret = file_put_contents($filename, $result, true);
235 $task=new Task(); 235 $task=new Task();
236 $res=$task->fileUpload($code_name); 236 $res=$task->fileUpload($code_name);
237 - return $res['fileurl']; 237 + return $res;
238 } 238 }
239 //把请求发送到微信服务器换取二维码 239 //把请求发送到微信服务器换取二维码
240 public function httpRequest($url,$data='',$method='GET'){ 240 public function httpRequest($url,$data='',$method='GET'){
@@ -261,11 +261,12 @@ class Car extends Backend @@ -261,11 +261,12 @@ class Car extends Backend
261 curl_close($curl); 261 curl_close($curl);
262 return $result; 262 return $result;
263 } 263 }
264 - public function getQRCode($url_data){ 264 + public function getQRCode(){
265 $accessToken = $this->getAccessToken(); 265 $accessToken = $this->getAccessToken();
266 if ($accessToken) { 266 if ($accessToken) {
267 - $path = 'pages/module/intercityOrder'.$url_data; // 小程序内的页面路径 267 + $path = 'pages/module/intercityOrder'; // 小程序内的页面路径
268 $qrCodeData = $this->createMiniProgramQRCode($accessToken, $path); 268 $qrCodeData = $this->createMiniProgramQRCode($accessToken, $path);
  269 + print_r($qrCodeData);return;
269 return $qrCodeData; 270 return $qrCodeData;
270 } 271 }
271 } 272 }
@@ -704,6 +704,7 @@ class Car extends Base @@ -704,6 +704,7 @@ class Car extends Base
704 $seat = Db::name("seat")->where("id", $car['seat_id'])->find(); 704 $seat = Db::name("seat")->where("id", $car['seat_id'])->find();
705 $seat['seat'] = json_decode($seat['seat'], true); 705 $seat['seat'] = json_decode($seat['seat'], true);
706 //查询当日订单 706 //查询当日订单
  707 +
707 $statr_time = strtotime(date("Y-m-d", time())); 708 $statr_time = strtotime(date("Y-m-d", time()));
708 $end_time = $statr_time + 86400; 709 $end_time = $statr_time + 86400;
709 $order = Db::name("order") 710 $order = Db::name("order")
@@ -713,6 +714,7 @@ class Car extends Base @@ -713,6 +714,7 @@ class Car extends Base
713 ->where('car_id', $car_id) 714 ->where('car_id', $car_id)
714 ->field("seat_no") 715 ->field("seat_no")
715 ->select(); 716 ->select();
  717 +
716 if ($order) { 718 if ($order) {
717 foreach ($order as $k => $v) { 719 foreach ($order as $k => $v) {
718 $seat_no[$k] = $order[$k]["seat_no"]; 720 $seat_no[$k] = $order[$k]["seat_no"];
@@ -1502,10 +1504,14 @@ class Car extends Base @@ -1502,10 +1504,14 @@ class Car extends Base
1502 $car = Db::name("car")->where("id", $order['car_id'])->find(); 1504 $car = Db::name("car")->where("id", $order['car_id'])->find();
1503 $seat = Db::name("seat")->where("id", $car['seat_id'])->find(); 1505 $seat = Db::name("seat")->where("id", $car['seat_id'])->find();
1504 $seat_data = json_decode($seat['seat'], true); 1506 $seat_data = json_decode($seat['seat'], true);
  1507 + if($seat_data){
1505 $seat_no = array_filter($seat_data, function ($value) { 1508 $seat_no = array_filter($seat_data, function ($value) {
1506 return !empty($value); 1509 return !empty($value);
1507 }); 1510 });
  1511 + }
  1512 + if($order["seat_no"]){
1508 $orderseat_no = explode(",", $order["seat_no"]); 1513 $orderseat_no = explode(",", $order["seat_no"]);
  1514 + }
1509 if ($seat_data) { 1515 if ($seat_data) {
1510 if ($order['seat_no']) { 1516 if ($order['seat_no']) {
1511 foreach ($seat_data as $k => $v) { 1517 foreach ($seat_data as $k => $v) {