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

Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev

Browse Source
This commit is contained in:
luofei 2024-01-21 14:20:23 +08:00
commit 7e19e6ee1b
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/common/repositories/store/order/StoreOrderCreateRepository.php
View File

@ -504,9 +504,6 @@ class StoreOrderCreateRepository extends StoreOrderRepository
$item['describe']='仅限平台指定商家商品可使用'; $item['describe']='仅限平台指定商家商品可使用';
return $item; return $item;
}); });
// if(count($platformConsumption)>1){
// $consumption=$platformConsumption[0];
// }
} }
// } // }
@ -583,13 +580,13 @@ class StoreOrderCreateRepository extends StoreOrderRepository
} }
} }
if($this->store_consumption_user['type']==1){ if($this->store_consumption_user['type']==1){
if($pay_price>$this->store_consumption_user['balance']){ if($pay_price > $this->store_consumption_user['balance']){
$pay_price = bcsub($pay_price, $this->store_consumption_user['balance'], 2); $pay_price = bcsub($pay_price, $this->store_consumption_user['balance'], 2);
$this->consumption_money=$this->store_consumption_user['balance']; $this->consumption_money=$this->store_consumption_user['balance'];
$a=$this->store_consumption_user['balance']; $a=$this->store_consumption_user['balance'];
}else{ }else{
$pay_price=0; $pay_price=0;
$this->consumption_money=bcsub($this->store_consumption_user['balance'],$pay_price, 2); $this->consumption_money=$pay_price;
$a=$this->consumption_money; $a=$this->consumption_money;
} }
} }
@ -636,7 +633,7 @@ class StoreOrderCreateRepository extends StoreOrderRepository
$status = ($address || $order_model || $allow_no_address) ? ($noDeliver ? 'noDeliver' : 'finish') : 'noAddress'; $status = ($address || $order_model || $allow_no_address) ? ($noDeliver ? 'noDeliver' : 'finish') : 'noAddress';
$order = $merchantCartList; $order = $merchantCartList;
$consumption_money = $this->consumption_money; $consumption_money = $this->consumption_money;
$total_price = $order_total_price; $total_price = bcsub($order_total_price,$consumption_money,2);
$openIntegral = $merIntegralFlag && !$order_type && $sysIntegralConfig['integral_status'] && $sysIntegralConfig['integral_money'] > 0; $openIntegral = $merIntegralFlag && !$order_type && $sysIntegralConfig['integral_status'] && $sysIntegralConfig['integral_money'] > 0;
$total_coupon = bcadd($order_svip_discount, bcadd(bcadd($total_platform_coupon_price, $order_coupon_price, 2), $order_total_integral_price, 2), 2); $total_coupon = bcadd($order_svip_discount, bcadd(bcadd($total_platform_coupon_price, $order_coupon_price, 2), $order_total_integral_price, 2), 2);
$is_self_pickup=true; $is_self_pickup=true;
@ -962,6 +959,7 @@ class StoreOrderCreateRepository extends StoreOrderRepository
$balance=['balance'=>0,'status'=>1]; $balance=['balance'=>0,'status'=>1];
Db::name('store_consumption_user')->where('coupon_user_id',$groupOrder['coupon_user_id'])->update(); Db::name('store_consumption_user')->where('coupon_user_id',$groupOrder['coupon_user_id'])->update();
} }
}
} }
app()->make(UserBillRepository::class)->decBill($user['uid'], 'consumption', 'deduction', [ app()->make(UserBillRepository::class)->decBill($user['uid'], 'consumption', 'deduction', [