|
|
@@ -1011,10 +1011,11 @@ class OrderService extends BaseService
|
|
|
$refundType = isset($params['refund_type']) ? $params['refund_type'] : 0;
|
|
|
$refundRemark = isset($params['remark']) ? $params['remark'] : '';
|
|
|
$info = $this->model->where(['id' => $id, 'mark' => 1])
|
|
|
- ->select(['id','order_no','user_id','merch_id','pay_money','coupon_id','pay_status','status','refund_status','pay_time'])
|
|
|
+ ->select(['id','order_no','out_order_no','user_id','merch_id','pay_money','coupon_id','pay_status','status','refund_status','pay_time'])
|
|
|
->first();
|
|
|
$status = isset($info['status']) ? $info['status'] : 0;
|
|
|
$orderNo = isset($info['order_no']) ? $info['order_no'] : '';
|
|
|
+ $outOrderNo = isset($info['out_order_no']) ? $info['out_order_no'] : '';
|
|
|
$orderUserId = isset($info['user_id']) ? $info['user_id'] : 0;
|
|
|
$payStatus = isset($info['pay_status']) ? $info['pay_status'] : 0;
|
|
|
$refundStatus = isset($info['refund_status']) ? $info['refund_status'] : 0;
|
|
|
@@ -1048,8 +1049,9 @@ class OrderService extends BaseService
|
|
|
}*/
|
|
|
|
|
|
// 站外售后验证
|
|
|
- $result = SupplyService::make()->getApiData('getAfterCan',['plat_order_no'=> $orderNo]);
|
|
|
+ $result = SupplyService::make()->getApiData('getAfterCan',['plat_order_no'=> $outOrderNo]);
|
|
|
$orderGoods = isset($result['order_goods'])? $result['order_goods'] : [];
|
|
|
+ var_dump($orderGoods);
|
|
|
if(empty($orderGoods)){
|
|
|
$this->error = 2918;
|
|
|
return false;
|
