mkm/multi-store
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 修改支付通知逻辑，引入UserSign模型，调整村长和队长订单获得兑换券逻辑，优化库存发送数据字段。

Browse Source
This commit is contained in:
mkm 2024-06-16 20:52:11 +08:00
parent 87227e38fa
commit 04776f7b80
3 changed files with 55 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
app/common/logic/PayNotifyLogic.php
View File

@ -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,9 +274,10 @@ class PayNotifyLogic extends BaseLogic
}
if ($order->pay_type == 9) {
$order->status = 2;
}
self::afterPay($order);
}
if ($order->pay_type == 9) {
$extra['create_time'] = $order['create_time'];
PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'cash_register', 'msg' => '您有一笔订单已支付', 'data' => $extra]);
@ -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']);

22
app/common/model/user_sign/UserSign.php Normal file
View File

@ -0,0 +1,22 @@
<?php
namespace app\common\model\user_sign;
use app\common\model\BaseModel;
use think\model\concern\SoftDelete;
/**
* 计量单位
* Class UserSign
* @package app\common\model\user_sign
*/
class UserSign extends BaseModel
{
use SoftDelete;
protected $name = 'user_sign';
protected $deleteTime = 'delete_time';
}

1
app/queue/redis/StoreStorageSend.php
View File

@ -59,6 +59,7 @@ class StoreStorageSend implements Consumer
'cost' => $find['purchase'],
'vip_price' => $find['vip_price'],
'unit' => $find['unit'],
'batch' => $find['batch'],
'store_id' => $store_id,
'sales' => 0,
'stock' => 0,