diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php index 0e3b281d6..e033c3815 100644 --- a/app/api/logic/order/OrderLogic.php +++ b/app/api/logic/order/OrderLogic.php @@ -435,9 +435,8 @@ class OrderLogic extends BaseLogic // $capitalFlowLogic->storeIncome('store_order_income', 'order', $data['id'], $financeFlow['number']); // } $order=StoreOrder::where('id',$data['id'])->find(); - PayNotifyLogic::afterPay($order); + // PayNotifyLogic::afterPay($order); PayNotifyLogic::descStock($order['id']); - if($order['uid'] && $order['total_price'] >= 500){ $user_number = bcmul($order['pay_price'], '0.10', 2); User::where('id', $order['uid'])->inc('integral', $user_number)->update(); diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php index 8918320b1..efa099861 100644 --- a/app/common/logic/PayNotifyLogic.php +++ b/app/common/logic/PayNotifyLogic.php @@ -88,14 +88,14 @@ class PayNotifyLogic extends BaseLogic $order['pay_price'] = $oldUser; } } - self::addUserSing($order); + // self::addUserSing($order); $capitalFlowDao = new CapitalFlowLogic($user); $capitalFlowDao->userExpense('user_order_balance_pay', 'order', $order['id'], $order['pay_price'], '', 0, $order['store_id']); self::dealProductLog($order); if ($order['shipping_type'] == 3) { self::descStock($order['id']); } - // self::afterPay($order); + self::afterPay($order); // Redis::send('push-platform-print', ['id' => $order['id']], 60); // PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']); } @@ -185,7 +185,7 @@ class PayNotifyLogic extends BaseLogic // if ($user['user_ship'] == 1) { // self::dealVipAmount($order, PayEnum::PURCHASE_FUNDS); // } - self::addUserSing($order); + // self::addUserSing($order); if ($extra && $extra['store_id']) { $params = [ 'verify_code' => $order['verify_code'], @@ -199,7 +199,7 @@ class PayNotifyLogic extends BaseLogic // self::descStock($order['id']); // } - // self::afterPay($order); + self::afterPay($order); // Redis::send('push-platform-print', ['id' => $order['id']], 60); // PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']); } @@ -232,14 +232,14 @@ class PayNotifyLogic extends BaseLogic $user = User::where('id', $order['uid'])->find(); if ($order->pay_type == OrderEnum::CASHIER_ORDER_PAY || $order->pay_type == OrderEnum::CASHIER_ORDER_ALI_PAY) { //收银台支付 $order->status = 2; -// self::afterPay($order, $extra['transaction_id']); } else { $capitalFlowDao = new CapitalFlowLogic($user); //微信支付和用户余额无关 $capitalFlowDao->userExpense('user_order_pay', 'order', $order['id'], $order->pay_price, '', 1, $order['store_id']); } $order->save(); - self::addUserSing($order); + self::afterPay($order, $extra['transaction_id']); + // self::addUserSing($order); self::dealProductLog($order); if ($order['shipping_type'] == 3) { self::descStock($order['id']);