|
@@ -159,7 +159,7 @@ class OrderRepository
|
|
|
{
|
|
|
$res1 = StoreOrder::gainUserIntegral($order);
|
|
|
$res2 = User::backOrderBrokerage($order);
|
|
|
- $res3 = User::backStoreBrokerage($order) && User::backMStoreBrokerage($order);
|
|
|
+ $res3 = User::backStoreBrokerage($order);
|
|
|
StoreOrder::orderTakeAfter($order);
|
|
|
|
|
|
WechatUser::userTakeOrderGiveCoupon($uid, $order['pay_price']);
|
|
@@ -175,7 +175,7 @@ class OrderRepository
|
|
|
{
|
|
|
$res1 = AdminStoreOrder::gainUserIntegral($order);
|
|
|
$res2 = User::backOrderBrokerage($order);
|
|
|
- $res3 = User::backStoreBrokerage($order) && User::backMStoreBrokerage($order);
|
|
|
+ $res3 = User::backStoreBrokerage($order);
|
|
|
AdminStoreOrder::orderTakeAfter($order);
|
|
|
|
|
|
WechatUser::userTakeOrderGiveCoupon($order['uid'], $order['pay_price']);
|
|
@@ -192,7 +192,7 @@ class OrderRepository
|
|
|
{
|
|
|
$res1 = AdminStoreOrder::gainUserIntegral($order, false);
|
|
|
$res2 = User::backOrderBrokerage($order, false);
|
|
|
- $res3 = User::backStoreBrokerage($order) && User::backMStoreBrokerage($order);
|
|
|
+ $res3 = User::backStoreBrokerage($order);
|
|
|
AdminStoreOrder::orderTakeAfter($order);
|
|
|
UserBill::where('uid', $order['uid'])->where('link_id', $order['id'])->where('type', 'pay_money')->update(['take' => 1]);
|
|
|
if (!($res1 && $res2 && $res3)) exception('收货失败!');
|