feat: 修改了CommissionLogic, StoreFinanceFlowLogic, StoreOrderLogic 和 Task 文件中的代码逻辑

This commit is contained in:
mkm 2024-07-22 15:30:46 +08:00
parent bdd0784d3e
commit 2e267e2f6a
4 changed files with 59 additions and 31 deletions

View File

@ -169,29 +169,29 @@ class CommissionLogic extends BaseLogic
$fees = bcmul($pay_price, $userRate, 2); $fees = bcmul($pay_price, $userRate, 2);
if ($fees > 0) { if ($fees > 0) {
//记录用户余额收入 //记录用户余额收入
if ($uid) { // if ($uid) {
if(in_array($enum,[14,15])&&$userRate==0.05){ // if(in_array($enum,[14,15])&&$userRate==0.05){
$purchase_funds=User::where('id', $uid)->value('purchase_funds'); // $purchase_funds=User::where('id', $uid)->value('purchase_funds');
if($purchase_funds>0){ // if($purchase_funds>0){
$fees_two = bcmul($purchase_funds, $userRate, 2); // $fees_two = bcmul($purchase_funds, $userRate, 2);
if($fees_two<$fees){ // if($fees_two<$fees){
$fees=$fees_two; // $fees=$fees_two;
} // }
} // }
} // }
if($enum==12&&$userRate==0.07){ // if($enum==12&&$userRate==0.07){
$purchase_funds=User::where('id', $uid)->value('purchase_funds'); // $purchase_funds=User::where('id', $uid)->value('purchase_funds');
if($purchase_funds>0){ // if($purchase_funds>0){
$fees_two = bcmul($purchase_funds, $userRate, 2); // $fees_two = bcmul($purchase_funds, $userRate, 2);
if($fees_two<$fees){ // if($fees_two<$fees){
$fees=$fees_two; // $fees=$fees_two;
} // }
} // }
} // }
$GiveUser = User::where('id', $order['uid'])->find(); // $GiveUser = User::where('id', $order['uid'])->find();
$capitalFlowDao = new CapitalFlowLogic($GiveUser); // $capitalFlowDao = new CapitalFlowLogic($GiveUser);
$capitalFlowDao->userIncome('system_balance_add', 'order', $order['id'], $fees); // $capitalFlowDao->userIncome('system_balance_add', 'order', $order['id'], $fees);
} // }
$financeLogic->user['uid'] = $order['uid']; $financeLogic->user['uid'] = $order['uid'];
$financeLogic->other_arr['vip_uid'] = $uid; $financeLogic->other_arr['vip_uid'] = $uid;
$financeLogic->order = $order; $financeLogic->order = $order;

View File

@ -134,7 +134,8 @@ class StoreFinanceFlowLogic extends BaseLogic
*/ */
public function updateStatusUser($id, $uid, $money, $order_id) public function updateStatusUser($id, $uid, $money, $order_id)
{ {
StoreFinanceFlow::where('id', $id)->update(['status' => 1]); $flow=StoreFinanceFlow::where('id', $id)->find();
StoreFinanceFlow::where('order_id',$order_id)->where('financial_type',$flow['financial_type'])->update(['status'=>1]);
$find = User::where('id', $uid)->find(); $find = User::where('id', $uid)->find();
$capitalFlowDao = new CapitalFlowLogic($find); $capitalFlowDao = new CapitalFlowLogic($find);
$capitalFlowDao->userIncome('system_balance_add', 'order', $order_id, $money); $capitalFlowDao->userIncome('system_balance_add', 'order', $order_id, $money);

View File

@ -12,6 +12,7 @@ use app\common\model\order\Cart;
use app\common\model\store_branch_product\StoreBranchProduct; use app\common\model\store_branch_product\StoreBranchProduct;
use app\common\model\store_order\StoreOrder; use app\common\model\store_order\StoreOrder;
use app\common\model\store_order_cart_info\StoreOrderCartInfo; use app\common\model\store_order_cart_info\StoreOrderCartInfo;
use app\common\model\store_product\StoreProduct;
use app\common\model\store_product_unit\StoreProductUnit; use app\common\model\store_product_unit\StoreProductUnit;
use app\common\model\user\User; use app\common\model\user\User;
use app\common\service\pay\PayService; use app\common\service\pay\PayService;
@ -207,10 +208,15 @@ class StoreOrderLogic extends BaseLogic
'stock' => $stock-$v['cart_num'], 'stock' => $stock-$v['cart_num'],
'sales' => ['inc', $v['cart_num']] 'sales' => ['inc', $v['cart_num']]
]; ];
$updateDataTwo[] = [
'id' => $v['product_id'],
'sales' => ['inc', $v['cart_num']]
];
} }
(new StoreOrderCartInfo())->saveAll($goods_list); (new StoreOrderCartInfo())->saveAll($goods_list);
$where = ['is_pay' => 0]; $where = ['is_pay' => 0];
(new StoreBranchProduct())->saveAll($updateData); (new StoreBranchProduct())->saveAll($updateData);
(new StoreProduct())->saveAll($updateDataTwo);
Cart::whereIn('id', $cartId)->where($where)->update(['is_pay' => 1]); Cart::whereIn('id', $cartId)->where($where)->update(['is_pay' => 1]);
Db::commit(); Db::commit();
return $order; return $order;

View File

@ -1,7 +1,11 @@
<?php <?php
namespace process; namespace process;
use app\common\model\store_branch_product\StoreBranchProduct;
use app\common\model\store_order\StoreOrder; use app\common\model\store_order\StoreOrder;
use app\common\model\store_order_cart_info\StoreOrderCartInfo;
use app\common\model\store_product\StoreProduct;
use Workerman\Crontab\Crontab; use Workerman\Crontab\Crontab;
class Task class Task
@ -14,9 +18,26 @@ class Task
$where = ['paid' => 0]; $where = ['paid' => 0];
$where[] = ['create_time', '<', time() - 600]; // 10分钟前创建的订单 $where[] = ['create_time', '<', time() - 600]; // 10分钟前创建的订单
// 删除10分钟未支付的订单 // 删除10分钟未支付的订单
StoreOrder::where($where)->update(['delete_time'=>time()]); // 删除时间设置为当前时间,即删除 $oid = StoreOrder::where($where)->column('id'); // 删除时间设置为当前时间,即删除
if($oid){
StoreOrder::where('id', 'in', $oid)->update(['delete_time' => time()]);
$arr = StoreOrderCartInfo::where('oid', 'in', $oid)->field('store_id,product_id,cart_num')->select();
$updateData = [];
$updateDataTwo = [];
foreach ($arr as $v) {
$updateData[] = [
'id' => $v['branch_product_id'],
'sales' => ['dec', $v['cart_num']]
];
$updateDataTwo[] = [
'id' => $v['product_id'],
'sales' => ['dec', $v['cart_num']]
];
}
(new StoreBranchProduct())->saveAll($updateData);
(new StoreProduct())->saveAll($updateDataTwo);
}
}); });
} }
} }