|
|
@@ -597,9 +597,10 @@ class OrderService extends BaseService
|
|
|
|
|
|
// 订单信息
|
|
|
$info = $this->model->where(['id' => $orderId, 'mark' => 1])
|
|
|
- ->select(['id', 'order_no', 'pay_total', 'status'])
|
|
|
+ ->select(['id', 'order_no','coupon_id', 'pay_total', 'status'])
|
|
|
->first();
|
|
|
$orderNo = isset($info['order_no']) ? $info['order_no'] : '';
|
|
|
+ $couponId = isset($info['coupon_id']) ? $info['coupon_id'] : 0;
|
|
|
$status = isset($info['status']) ? $info['status'] : 0;
|
|
|
if (empty($info) || empty($orderNo)) {
|
|
|
$this->error = '订单信息不存在';
|
|
|
@@ -636,6 +637,10 @@ class OrderService extends BaseService
|
|
|
OrderGoodsModel::where(['order_no' => $orderNo, 'mark' => 0])->where('update_time', '<=', time() - 300)->delete();
|
|
|
$this->model->where(['id' => $orderId])->update(['mark' => 0, 'update_time' => time()]);
|
|
|
OrderGoodsModel::where(['order_no' => $orderNo])->update(['mark' => 0, 'update_time' => time()]);
|
|
|
+ // 优惠券返还
|
|
|
+ if($couponId){
|
|
|
+ MemberCouponModel::where(['coupon_id'=>$couponId,'user_id'=>$userId])->update(['status'=>1,'remark'=>'取消订单返还','update_time'=>time()]);
|
|
|
+ }
|
|
|
DB::commit();
|
|
|
return ['id' => $orderId];
|
|
|
}
|