diff --git a/app/common/dao/store/consumption/CommissionDao.php b/app/common/dao/store/consumption/CommissionDao.php index a243c3f8..18e6f776 100755 --- a/app/common/dao/store/consumption/CommissionDao.php +++ b/app/common/dao/store/consumption/CommissionDao.php @@ -164,7 +164,7 @@ class CommissionDao } // 退佣金和红包、保证金 $financeRecord = FinancialRecord::where('order_id', $refundOrder->order['order_id']) - ->whereIn('financial_type', ['commission_to_store', 'commission_to_courier', 'commission_to_promoter', 'auto_margin']) + ->whereIn('financial_type', ['commission_to_store', 'commission_to_courier', 'commission_to_promoter']) ->field('user_id uid,user_info nickname,number,mer_id,financial_type')->select()->toArray(); if (empty($financeRecord)) { return; diff --git a/app/common/dao/store/order/StoreOrderOtherDao.php b/app/common/dao/store/order/StoreOrderOtherDao.php index 4193c429..2fe9f8b7 100755 --- a/app/common/dao/store/order/StoreOrderOtherDao.php +++ b/app/common/dao/store/order/StoreOrderOtherDao.php @@ -836,15 +836,16 @@ class StoreOrderOtherDao extends BaseDao $financeDao->order->order_id = $model->refund_order_id; $financeDao->platformIn($refundTotal, 'supply_chain_refund', $model->mer_id); - if ($refundOrder->order->status == -1){ - $margin = FinancialRecord::where('order_id', $refundOrder['order_id']) - ->where('mer_id', $model->mer_id) - ->where('financial_type', 'auto_margin') - ->value('number'); - if ($margin) { - $financeDao->platformOut($margin, 'auto_margin_refund', $model->mer_id); - } - } + // TODO 暂时不退保证金 +// if ($refundOrder->order->status == -1){ +// $margin = FinancialRecord::where('order_id', $refundOrder['order_id']) +// ->where('mer_id', $model->mer_id) +// ->where('financial_type', 'auto_margin') +// ->value('number'); +// if ($margin) { +// $financeDao->platformOut($margin, 'auto_margin_refund', $model->mer_id); +// } +// } $financeDao->save(); app()->make(MerchantRepository::class)->subLockMoney($model->mer_id, 'order', $refundOrder['order_id'], $refundTotal);