|
@@ -13,15 +13,21 @@ class Order extends Base
|
|
|
|
|
|
public function CheckOrder(){
|
|
|
$order_sn = input('param.order_sn');
|
|
|
+
|
|
|
//商网接口
|
|
|
- $result = request_post(self::base_url . '/deliver' , ['order_code' => $order_sn]);
|
|
|
+ $result = request_post(self::base_url . '/check' , ['orderCode' => $order_sn]);
|
|
|
if($result == false){
|
|
|
json_error(3000);
|
|
|
}
|
|
|
- if($result['code'] != 0){
|
|
|
- json_return($result['code'] , $result['data'] , $result['message']);
|
|
|
+
|
|
|
+ $result = json_decode($result,true);
|
|
|
+ if(!empty($result) && $result['code'] == 0) {
|
|
|
+ $existed = $result['data']['isEffective'] != 0;
|
|
|
+ json_success(['order_sn' => $order_sn,'existed' => $existed]);
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ json_return($result['code'],[],$result['msg']);
|
|
|
}
|
|
|
- json_success($result['data']);
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -43,6 +49,7 @@ class Order extends Base
|
|
|
json_success();
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
public function CheckFcode(){
|
|
|
$code = input('param.code');
|
|
|
$OrderModel = new OrderModel();
|
|
@@ -111,7 +118,8 @@ class Order extends Base
|
|
|
/**
|
|
|
* 生成订单并绑定箱子
|
|
|
*/
|
|
|
- private function CreateOrderBindBox($order_sn , $box_number , $cabinet){
|
|
|
+ private function CreateOrderBindBox($order_sn , $box_number , $cabinet)
|
|
|
+ {
|
|
|
$code = $this->createRandCode();
|
|
|
$data['order_sn'] = $order_sn;
|
|
|
$data['cabinet_number'] = $cabinet;
|