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

feat: 修改订单退款逻辑和财务流水逻辑

Browse Source
This commit is contained in:
mkm 2024-08-20 10:31:18 +08:00
parent 16ab967419
commit 9f01fe60f3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/api/controller/order/OrderController.php
View File

@ -487,7 +487,7 @@ class OrderController extends BaseApiController
$uid = $this->userId;
//拆单逻辑
$res = OrderLogic::dealRefund($uid, $params);
$detail = StoreOrder::where('id', $params['id'])->where('refund_type', 1)->find();
$detail = StoreOrder::where('id', $params['id'])->where('refund_status', 1)->find();
if ($detail && $res != 2) {
$res = StoreOrderLogic::refund($detail, ['order_id' => $detail['order_id']]);
if ($res != false) {

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

@ -155,14 +155,14 @@ class StoreFinanceFlowLogic extends BaseLogic
SystemStore::where('id', $store_id)->inc('store_money', $money)->update();
}
if ($deposit > 0) {
$capitalFlowDao->storeIncome('store_paid_deposit_add', 'order', $order_id, $money);
$capitalFlowDao->storeIncome('store_paid_deposit_add', 'order', $order_id, $deposit);
SystemStore::where('id', $store_id)->inc('paid_deposit', $deposit)->update();
}
$find = StoreFinanceFlow::where(['order_id' => $order_id, 'financial_pm' => 1, 'financial_type' => 16, 'status' => 0])->find();
StoreFinanceFlow::where(['order_id' => $order_id, 'financial_type' => 16])->update(['status' => 1]);
if ($find) {
if ($find['number'] > 0) {
$capitalFlowDao->storeIncome('store_attrition_add', 'order', $order_id, $money);
$capitalFlowDao->storeIncome('store_attrition_add', 'order', $order_id, $find['number']);
SystemStore::where('id', $store_id)->inc('attrition', $find['number'])->update();
}
}