From 04776f7b80976bb50a5dfb6c75010ffcbcd9d523 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Sun, 16 Jun 2024 20:52:11 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E9=80=9A=E7=9F=A5=E9=80=BB=E8=BE=91=EF=BC=8C=E5=BC=95=E5=85=A5?= =?UTF-8?q?UserSign=E6=A8=A1=E5=9E=8B=EF=BC=8C=E8=B0=83=E6=95=B4=E6=9D=91?= =?UTF-8?q?=E9=95=BF=E5=92=8C=E9=98=9F=E9=95=BF=E8=AE=A2=E5=8D=95=E8=8E=B7?= =?UTF-8?q?=E5=BE=97=E5=85=91=E6=8D=A2=E5=88=B8=E9=80=BB=E8=BE=91=EF=BC=8C?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BA=93=E5=AD=98=E5=8F=91=E9=80=81=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=AD=97=E6=AE=B5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/logic/PayNotifyLogic.php | 46 +++++++++++++++++-------- app/common/model/user_sign/UserSign.php | 22 ++++++++++++ app/queue/redis/StoreStorageSend.php | 1 + 3 files changed, 55 insertions(+), 14 deletions(-) create mode 100644 app/common/model/user_sign/UserSign.php diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php index c666b591..e51603b1 100644 --- a/app/common/logic/PayNotifyLogic.php +++ b/app/common/logic/PayNotifyLogic.php @@ -15,6 +15,7 @@ use app\common\model\user\User; use app\common\model\user\UserAddress; use app\common\model\user\UserRecharge; use app\common\model\user\UserShip; +use app\common\model\user_sign\UserSign; use app\common\service\PushService; use support\Log; use think\facade\Db; @@ -78,7 +79,7 @@ class PayNotifyLogic extends BaseLogic $capitalFlowDao = new CapitalFlowLogic($user); $capitalFlowDao->userExpense('user_order_pay', 'order', $order['id'], $order['pay_price']); - 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' => '您有一笔新的订单']); } @@ -112,7 +113,7 @@ class PayNotifyLogic extends BaseLogic $capitalFlowDao = new CapitalFlowLogic($user); $capitalFlowDao->userExpense('user_order_purchase_pay', 'order', $order['id'], $order['pay_price']); - 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' => '您有一笔新的订单']); } @@ -142,12 +143,12 @@ 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); } - self::afterPay($order, $extra['transaction_id']); if ($order->pay_type == 9) { @@ -239,6 +240,7 @@ class PayNotifyLogic extends BaseLogic $order->paid = 1; $order->pay_time = time(); $order->status = 2; + self::afterPay($order); if (!$order->save()) { throw new \Exception('订单保存出错'); } @@ -272,8 +274,9 @@ class PayNotifyLogic extends BaseLogic } if ($order->pay_type == 9) { $order->status = 2; + self::afterPay($order); + } - self::afterPay($order); if ($order->pay_type == 9) { $extra['create_time'] = $order['create_time']; @@ -363,18 +366,33 @@ class PayNotifyLogic extends BaseLogic } if ($fees > 0) { //村长获得 - if ($village_uid > 0) { - $financeLogic->other_arr['vip_uid'] = $village_uid; - } + $sing=[]; + $user_sing=new UserSign(); - $financeLogic->in($transaction_id, $fees, OrderEnum::VILLAGE_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']); - $financeLogic->out($transaction_id, $fees, OrderEnum::VILLAGE_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); + $sing[]=[ + 'uid'=>$village_uid, + 'title'=>'村长订单获得兑换券', + 'store_id'=>$order['store_id'], + 'number'=>$fees, + ]; + $sing[]=[ + 'uid'=>$brigade_uid, + 'title'=>'队长订单获得兑换券', + 'store_id'=>$order['store_id'], + 'number'=>$fees, + ]; + // if ($village_uid > 0) { + // $financeLogic->other_arr['vip_uid'] = $village_uid; + // } + // $financeLogic->in($transaction_id, $fees, OrderEnum::VILLAGE_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']); + // $financeLogic->out($transaction_id, $fees, OrderEnum::VILLAGE_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); //队长获得 - if ($brigade_uid > 0) { - $financeLogic->other_arr['vip_uid'] = $brigade_uid; - } - $financeLogic->in($transaction_id, $fees, OrderEnum::BRIGADE_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']); - $financeLogic->out($transaction_id, $fees, OrderEnum::BRIGADE_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); + // if ($brigade_uid > 0) { + // $financeLogic->other_arr['vip_uid'] = $brigade_uid; + // } + // $financeLogic->in($transaction_id, $fees, OrderEnum::BRIGADE_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']); + // $financeLogic->out($transaction_id, $fees, OrderEnum::BRIGADE_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); + $user_sing->saveAll($sing); //其他获得 $financeLogic->other_arr['vip_uid'] = 0; $financeLogic->in($transaction_id, $fees, OrderEnum::OTHER_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']); diff --git a/app/common/model/user_sign/UserSign.php b/app/common/model/user_sign/UserSign.php new file mode 100644 index 00000000..db0ade17 --- /dev/null +++ b/app/common/model/user_sign/UserSign.php @@ -0,0 +1,22 @@ + $find['purchase'], 'vip_price' => $find['vip_price'], 'unit' => $find['unit'], + 'batch' => $find['batch'], 'store_id' => $store_id, 'sales' => 0, 'stock' => 0,