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

Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev

Browse Source
This commit is contained in:
mkm 2024-06-21 11:50:53 +08:00
commit 1040f8ca97
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) $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 ->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(); ->find();
//判断是不是员工 //判断是不是员工
if($data){ if($data){

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

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