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

修改收银台下单后的返还金逻辑

Browse Source
This commit is contained in:
liu 2024-06-21 11:46:44 +08:00
parent 7dc73909ba
commit 36ff55caf1
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/api/logic/user/UserLogic.php
View File

@ -72,7 +72,7 @@ class UserLogic extends BaseLogic
{
$data = User::with(['userShip'])->where('id',$uid)
->field('id,avatar,real_name,nickname,account,mobile,sex,login_ip,now_money,total_recharge_amount,user_ship
,purchase_funds,integral')
,purchase_funds,integral,pay_password')
->find();
//判断是不是员工
if($data){

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

@ -127,9 +127,9 @@ class PayNotifyLogic extends BaseLogic
$capitalFlowDao = new CapitalFlowLogic($user);
$capitalFlowDao->userExpense('user_order_purchase_pay', 'order', $order['id'], $order['pay_price'],'',1,$order['store_id']);
if ($user['user_ship'] == 1) {
self::dealVipAmount($order, PayEnum::PURCHASE_FUNDS);
}
// if ($user['user_ship'] == 1) {
// self::dealVipAmount($order, PayEnum::PURCHASE_FUNDS);
// }
if($extra && $extra['store_id']){
$params = [
@ -140,9 +140,9 @@ class PayNotifyLogic extends BaseLogic
OrderLogic::writeOff($params);
}
self::dealProductLog($order);
if($order['shipping_type'] == 3){
self::descStock($order['id']);
}
// if($order['shipping_type'] == 3){
// self::descStock($order['id']);
// }
// self::afterPay($order);
// Redis::send('push-platform-print', ['id' => $order['id']], 60);