|
@@ -259,8 +259,12 @@ class ROrderController extends AdminController{
|
|
|
$flag = 1;
|
|
|
} else if($status == 2 &&$order->booking_time != $booking_time){
|
|
|
//2 确认申请退款状态变更成已处理 为修改订单 此时修改订单预约时间
|
|
|
- $res = self::feedbackOrder(0,$order->OrderNo,$orderId,0,$order->booking_time);
|
|
|
- $flag = 1;
|
|
|
+ $res = self::feedbackOrder(0,$order->OrderNo,$orderId,0);
|
|
|
+ if($res){
|
|
|
+ $res = self::feedbackOrderRemaker(0,$order->OrderNo,$orderId,0,$order->booking_time);
|
|
|
+ $flag = 1;
|
|
|
+ }
|
|
|
+
|
|
|
} else if($status == 2 &&$order->booking_time == $booking_time){//不退单 没有修改
|
|
|
$res = self::feedbackOrder(0,$order->OrderNo,$orderId,0);
|
|
|
$flag = 1;
|
|
@@ -963,6 +967,46 @@ class ROrderController extends AdminController{
|
|
|
}
|
|
|
|
|
|
}
|
|
|
+ //不退单, 但是需要修改信息
|
|
|
+ public function feedbackOrderRemaker($isCancel,$orderId,$orderNo,$money=0,$remark=null){
|
|
|
+ $key = Yii::app()->params['JingBai'];
|
|
|
+ $data['IsCancel'] = $isCancel;
|
|
|
+ $data['OrderId'] = $orderId;
|
|
|
+ $data['OrderNo'] = $orderNo;
|
|
|
+ $data['Type'] = 'OrderRemark';
|
|
|
+ $data['Remark'] = '修改预约时间'.date('Y-m-d H:i:s',$remark);
|
|
|
+ $data['Sign'] = md5($orderId.$orderNo.$data['Remark'].$key);
|
|
|
+ $dat = '';
|
|
|
+ foreach ($data as $key => $value) {
|
|
|
+ $dat .= $key.'='.urlencode($value).'&';
|
|
|
+ }
|
|
|
+
|
|
|
+ $dat = rtrim(trim($dat),'&');
|
|
|
+ if (ENVIRONMENT == 'product'){
|
|
|
+ $url = 'http://139.196.47.211:9230/ServiceController/HouseKeepingFeedback'; //正式服调用接口的平台服务地址
|
|
|
+ } else {
|
|
|
+ //$url = 'http://123.206.28.63:9030/ServiceController/HouseKeepingFeedback'; //测试服调用接口的平台服务地址
|
|
|
+ $url = 'http://139.196.47.211:9030/ServiceController/HouseKeepingFeedback'; //调用接口的平台服务地址
|
|
|
+ }
|
|
|
+ var_dump($dat);exit;
|
|
|
+
|
|
|
+
|
|
|
+ $ch = curl_init();
|
|
|
+ curl_setopt($ch, CURLOPT_DNS_USE_GLOBAL_CACHE, false);
|
|
|
+ curl_setopt($ch, CURLOPT_URL, $url);
|
|
|
+ curl_setopt($ch, CURLOPT_POST, 1);
|
|
|
+ curl_setopt ( $ch, CURLOPT_RETURNTRANSFER, 1 );
|
|
|
+ curl_setopt($ch, CURLOPT_POSTFIELDS, $dat);
|
|
|
+ $result = curl_exec($ch);
|
|
|
+ curl_close($ch);
|
|
|
+ $res = json_decode($result,true);
|
|
|
+
|
|
|
+ if ($res['ReturnCode'] == '00'){
|
|
|
+ return true;
|
|
|
+ } else {
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ }
|
|
|
//退单反馈信息接口
|
|
|
/**
|
|
|
* @param $isCanel 是否退单 1退单 0 不退单
|
|
@@ -972,19 +1016,15 @@ class ROrderController extends AdminController{
|
|
|
* @param null $remark 退单状态备注包含修改信息,无修改此字段可不传
|
|
|
* @return bool
|
|
|
*/
|
|
|
- public function feedbackOrder($isCancel,$orderId,$orderNo,$money=0,$remark=null)
|
|
|
+ public function feedbackOrder($isCancel,$orderId,$orderNo,$money=0)
|
|
|
{
|
|
|
|
|
|
$key = Yii::app()->params['JingBai'];
|
|
|
$data['IsCancel'] = $isCancel;
|
|
|
$data['OrderId'] = $orderId;
|
|
|
$data['OrderNo'] = $orderNo;
|
|
|
- //不退单, 但是需要修改信息
|
|
|
- if(!$isCancel && !empty($remark)){
|
|
|
- $data['Type'] = 'OrderRemark';
|
|
|
- $data['Remark'] = '修改预约时间'.date('Y-m-d H:i:s',$remark);
|
|
|
- $data['Sign'] = md5($orderId.$orderNo.$data['Remark'].$key);
|
|
|
- }else if(!$isCancel && empty($remark)){//不退单 没有修改信息
|
|
|
+
|
|
|
+ if(!$isCancel){//不退单
|
|
|
$data['Type'] = 'CancleOrder';
|
|
|
$data['Money'] = $money;
|
|
|
$data['Sign'] = md5($isCancel.$orderId.$orderNo.$money.$key);
|
|
@@ -1007,7 +1047,7 @@ class ROrderController extends AdminController{
|
|
|
//$url = 'http://123.206.28.63:9030/ServiceController/HouseKeepingFeedback'; //测试服调用接口的平台服务地址
|
|
|
$url = 'http://139.196.47.211:9030/ServiceController/HouseKeepingFeedback'; //调用接口的平台服务地址
|
|
|
}
|
|
|
-
|
|
|
+ var_dump($dat);exit;
|
|
|
|
|
|
|
|
|
$ch = curl_init();
|