diff --git a/app/api/controller/order/OrderController.php b/app/api/controller/order/OrderController.php index 5f9ed4ed5..15211d3d2 100644 --- a/app/api/controller/order/OrderController.php +++ b/app/api/controller/order/OrderController.php @@ -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) { diff --git a/app/common/logic/StoreFinanceFlowLogic.php b/app/common/logic/StoreFinanceFlowLogic.php index 854ba05ac..9320689ae 100644 --- a/app/common/logic/StoreFinanceFlowLogic.php +++ b/app/common/logic/StoreFinanceFlowLogic.php @@ -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(); } }