|
@@ -106,11 +106,12 @@ class OrderRepository
|
|
|
$res1 = StoreOrder::gainUserIntegral($order);
|
|
|
// $res2 = User::backOrderBrokerage($order);
|
|
|
$res2 = User::sendBackOrderBrokerage($order);
|
|
|
+ $res3 = StoreOrder::treatmentAward($order['id']);
|
|
|
StoreOrder::orderTakeAfter($order);
|
|
|
StoreOrder::where('id', $order['id'])->update(['arrive_time' => time()]);
|
|
|
//满赠优惠券
|
|
|
WechatUser::userTakeOrderGiveCoupon($uid, $order['total_price']);
|
|
|
- if (!($res1 && $res2)) exception('收货失败!');
|
|
|
+ if (!($res1 && $res2 && $res3)) exception('收货失败!');
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -124,9 +125,10 @@ class OrderRepository
|
|
|
$res1 = AdminStoreOrder::gainUserIntegral($order);
|
|
|
// $res2 = User::backOrderBrokerage($order);
|
|
|
$res2 = User::sendBackOrderBrokerage($order);
|
|
|
+ $res3 = StoreOrder::treatmentAward($order['id']);
|
|
|
AdminStoreOrder::orderTakeAfter($order);
|
|
|
StoreOrder::where('id', $order['id'])->update(['arrive_time' => time()]);
|
|
|
- if (!($res1 && $res2)) exception('收货失败!');
|
|
|
+ if (!($res1 && $res2 && $res3)) exception('收货失败!');
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -139,9 +141,10 @@ class OrderRepository
|
|
|
|
|
|
$res1 = AdminStoreOrder::gainUserIntegral($order, false);
|
|
|
$res2 = User::sendBackOrderBrokerage($order);
|
|
|
+ $res3 = StoreOrder::treatmentAward($order['id']);
|
|
|
AdminStoreOrder::orderTakeAfter($order);
|
|
|
StoreOrder::where('id', $order['id'])->update(['arrive_time' => time()]);
|
|
|
- if (!($res1 && $res2)) exception('收货失败!');
|
|
|
+ if (!($res1 && $res2 && $res3)) exception('收货失败!');
|
|
|
}
|
|
|
|
|
|
|