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

refactor(PayNotifyLogic): 移除会员金额计算逻辑

Browse Source
This commit is contained in:
mkm 2024-07-10 10:17:18 +08:00
parent a269e4c0dd
commit 4c43c58f4e
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/api/lists/product/ProductLists.php
View File

@ -81,8 +81,14 @@ class ProductLists extends BaseApiDataLists implements ListsSearchInterface, Lis
}
$fields = 'id,product_id,cate_id,store_name,cost,store_id,vip_price,purchase,price,bar_code,image,sales,store_info,delete_time,unit,batch,top_cate_id,two_cate_id,stock';
$off_activity = Config::where('name', 'off_activity')->value('value');
if ($this->userId > 0) {
$user_ship = User::where('id', $this->userId)->value('user_ship');
$uid=0;
if($this->request->get('uid',0)>0){
$uid=$this->request->get('uid',0);
}elseif( $this->userId > 0){
$uid=$this->userId;
}
if ($uid>0) {
$user_ship = User::where('id', $uid)->value('user_ship');
if (in_array($user_ship, [4, 5, 6, 7])) {
$off_activity = 1;
}

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

@ -603,9 +603,9 @@ class PayNotifyLogic extends BaseLogic
}
//如果是会员需要返回会员金额
if ($user_ship>0 && $order['pay_type'] != PayEnum::CASH_PAY && $off_activity !=1) {
$order['dealVipAmount']= self::dealVipAmount($order, $order['pay_type']);
}
// if ($user_ship>0 && $order['pay_type'] != PayEnum::CASH_PAY && $off_activity !=1) {
// $order['dealVipAmount']= self::dealVipAmount($order, $order['pay_type']);
// }
if ($order['spread_uid'] > 0 || $user_ship > 0) {
if ($order['spread_uid'] > 0 && $user_ship == 0) {
$user_ship = User::where('id', $order['spread_uid'])->value('user_ship');