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-28 16:59:56 +08:00
commit ea8ed066e4
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -90,7 +90,7 @@ class UserLogic extends BaseLogic
'password' => $password, 'password' => $password,
'mobile' => $params['mobile'], 'mobile' => $params['mobile'],
'label_id' => $params['label_id']??0, 'label_id' => $params['label_id']??0,
'store_id' => $params['store_id']??0,
]; ];
$res=User::create($data); $res=User::create($data);
UserCreateLog::create([ UserCreateLog::create([

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

@ -775,7 +775,7 @@ class PayNotifyLogic extends BaseLogic
$financeLogic->in($transaction_id, $order['pay_price'], OrderEnum::SUPPLIER_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']); $financeLogic->in($transaction_id, $order['pay_price'], OrderEnum::SUPPLIER_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']);
$financeLogic->out($transaction_id, $order['pay_price'], OrderEnum::SUPPLIER_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); $financeLogic->out($transaction_id, $order['pay_price'], OrderEnum::SUPPLIER_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']);
$financeLogic->save(); $financeLogic->save();
if ($order['uid'] > 0 && $order['total_price'] >= 500) { if ($order['uid'] > 0 && $order['total_price'] >= 500 && $order['pay_type'] !=PayEnum::PURCHASE_FUNDS) {
$user_number = bcmul($order['pay_price'], '0.10', 2); $user_number = bcmul($order['pay_price'], '0.10', 2);
$sing = [ $sing = [
'uid' => $order['uid'], 'uid' => $order['uid'],
@ -801,7 +801,7 @@ class PayNotifyLogic extends BaseLogic
$order['pay_price'] = bcsub($order['pay_price'], $vipFrozenAmount, 2); $order['pay_price'] = bcsub($order['pay_price'], $vipFrozenAmount, 2);
self::dealVipAmount($order, $order['pay_type']); self::dealVipAmount($order, $order['pay_type']);
} }
if ($order['total_price'] >= 500) { if($order['total_price'] >= 500 && $order['pay_type'] !=PayEnum::PURCHASE_FUNDS){
$user_number = bcmul($order['pay_price'], '0.10', 2); $user_number = bcmul($order['pay_price'], '0.10', 2);
$sing = [ $sing = [
'uid' => $order['uid'], 'uid' => $order['uid'],

2
app/store/lists/user/UserLists.php
View File

@ -22,7 +22,7 @@ class UserLists extends BaseAdminDataLists implements ListsSearchInterface
public function setSearch(): array public function setSearch(): array
{ {
return [ return [
'=' => ['id','user_ship'], '=' => ['id','user_ship','store_id'],
'%like%' => ['mobile'], '%like%' => ['mobile'],
]; ];
} }