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-19 09:39:52 +08:00
commit 97a6102b20
2 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,6 +78,12 @@ class PayNotifyLogic extends BaseLogic
$user->now_money = bcsub($user['now_money'], $order['pay_price'], 2);
$user->save();
if ($order['spread_uid'] > 0 && $user['user_ship'] == 1) {
$oldUser = User::where('id',$order['spread_uid'])->value('purchase_funds');
if ($oldUser < $order['pay_price']) {
$order['pay_price'] = $oldUser;
}
}
$capitalFlowDao = new CapitalFlowLogic($user);
$capitalFlowDao->userExpense('user_order_pay', 'order', $order['id'], $order['pay_price'],'',0,$order['store_id']);
// self::afterPay($order);
@ -306,13 +312,24 @@ class PayNotifyLogic extends BaseLogic
if ($order['uid'] > 0) {
// 结算金额 要支付的钱减去冻结得钱去走后面得逻辑 发得兑换券也要去减去
$vipFrozenAmount = self::dealFrozenPrice($order['id']);
$order['pay_price'] = bcsub($order['pay_price'],$vipFrozenAmount,2);
//用户下单该用户等级为1得时候才处理冻结金额
$user = User::where('id', $order['uid'])->find();
if ($user['user_ship'] == 1) {
//纯在分销关系的时候要去判断分销出来的用户的采购款的额度
if ($order['spread_uid'] > 0 && $user['user_ship'] == 1) {
$oldUser = User::where('id',$order['spread_uid'])->value('purchase_funds');
if ($oldUser < $order['pay_price']) {
$order['pay_price'] = $oldUser;
}
}elseif ($user['user_ship'] == 1){
$vipFrozenAmount = self::dealFrozenPrice($order['id']);
//为1的时候要去减活动价
// $final_price = bcsub($order['pay_price'],$order['deduction_price'],2);
// d($final_price,$vipFrozenAmount);
$order['pay_price'] = bcsub($order['pay_price'],$vipFrozenAmount,2);
self::dealVipAmount($order, $order['pay_type']);
}
$user_number = bcmul($order['pay_price'], '0.10', 2);
$sing = [
'uid' => $order['uid'],
@ -325,6 +342,7 @@ class PayNotifyLogic extends BaseLogic
User::where('id', $order['uid'])->inc('integral', $user_number)->update();
}
$financeLogic->order = $order;
$financeLogic->user = ['uid' => $order['uid']];
// if ($order->pay_type != 9 || $order->pay_type != 10) {

7
app/common/logic/store_order/StoreOrderLogic.php
View File

@ -110,8 +110,11 @@ class StoreOrderLogic extends BaseLogic
self::$store_price = bcadd(self::$store_price, $cart_select[$k]['store_price'], 2);//门店零售价格
// self::$profit = bcadd(self::$profit, $cart_select[$k]['profit'], 2);
}
$pay_price =bcsub(self::$pay_price, self::$activity_price, 2); //减去活动优惠金额
if ($user && $user['user_ship'] == 1) {
$pay_price = self::$pay_price;
}else{
$pay_price =bcsub(self::$pay_price, self::$activity_price, 2); //减去活动优惠金额
}
$vipPrice = 0;
//成本价 收益