|
|
@@ -199,7 +199,6 @@ class ThirdOrderLogic extends BaseLogic
|
|
|
]);
|
|
|
|
|
|
//判断是否是一口价预支付订单,支付成功后生成尾款订单
|
|
|
- $order_goods = OrderGoods::where('sn',$order->sn)->findOrEmpty();
|
|
|
if(!$goods->isEmpty() and $goods->goods_payment_type == 3 and bcsub($goods->base_service_fee,$goods->service_fee,2)>=0){
|
|
|
//新增待支付尾款
|
|
|
$order_weikuan_data = [
|
|
|
@@ -218,7 +217,7 @@ class ThirdOrderLogic extends BaseLogic
|
|
|
$thirdOrders->work_id = $service_work->id;
|
|
|
$thirdOrders->save();
|
|
|
|
|
|
- self::bookresultcallback($message['orderId'],2);
|
|
|
+ self::bookresultcallback($order['opBizCode'],$message['orderId'],2);
|
|
|
Db::commit();
|
|
|
} catch (\Exception $e) {
|
|
|
Db::rollback();
|
|
|
@@ -378,13 +377,14 @@ class ThirdOrderLogic extends BaseLogic
|
|
|
* @param $bookStatus
|
|
|
* @return string
|
|
|
*/
|
|
|
- public static function bookresultcallback($orderId,$bookStatus=2)
|
|
|
+ public static function bookresultcallback($opBizCode,$orderId,$bookStatus=2)
|
|
|
{
|
|
|
//预订结果,2-预订成功,3-预订失败
|
|
|
$url = 'https://api-open-cater.meituan.com/ddzh/yuding/bookresultcallback';
|
|
|
+ $accessToken = $opBizCode == 'AE7MKOJAV67338LIC3UD0K5TGIO' ? self::shop_token2['accessToken'] : self::shop_token1['accessToken'];
|
|
|
$data = [
|
|
|
'timestamp'=>time(),
|
|
|
- 'appAuthToken'=>self::shop_token2['accessToken'],
|
|
|
+ 'appAuthToken'=>$accessToken,
|
|
|
'charset'=>'utf-8',
|
|
|
'version'=>'2',
|
|
|
'developerId'=>self::developerId,
|
|
|
@@ -463,4 +463,33 @@ class ThirdOrderLogic extends BaseLogic
|
|
|
return http_request($url,http_build_query($data));
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 商家改约
|
|
|
+ * @param $offset
|
|
|
+ * @return string
|
|
|
+ */
|
|
|
+ public static function merchantmodify($data)
|
|
|
+ {
|
|
|
+ $url = 'https://api-open-cater.meituan.com/ddzh/yuding/lifereserve/merchantmodify';
|
|
|
+ $data = [
|
|
|
+ 'timestamp'=>time(),
|
|
|
+ 'appAuthToken'=>self::shop_token2['accessToken'],
|
|
|
+ 'charset'=>'utf-8',
|
|
|
+ 'version'=>'2',
|
|
|
+ 'developerId'=>self::developerId,
|
|
|
+ 'businessId'=>58,
|
|
|
+ 'biz'=>json_encode([
|
|
|
+ 'reserveOrderId'=>$data['reserveOrderId'],
|
|
|
+ 'reserveUserName'=>$data['reserveUserName'],
|
|
|
+ "reservePhone"=>$data['reservePhone'],
|
|
|
+ "reserveAddress"=>$data['reserveAddress'],
|
|
|
+ "bookStartTime"=>$data['bookStartTime']*1000,
|
|
|
+ "bookEndTime"=>$data['bookEndTime']*1000,
|
|
|
+ ],JSON_UNESCAPED_UNICODE)
|
|
|
+ ];
|
|
|
+ $sign_data = self::get_sign(self::assessKey, $data);
|
|
|
+ $data['sign'] = $sign_data;
|
|
|
+ return http_request($url,http_build_query($data));
|
|
|
+ }
|
|
|
+
|
|
|
}
|