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

调试供应链订单退款

Browse Source
This commit is contained in:
luofei 2024-02-03 13:49:30 +08:00
parent 097964d352
commit c355e918fb
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/common/dao/store/consumption/CommissionDao.php
View File

@ -164,7 +164,7 @@ class CommissionDao
} }
// 退佣金和红包、保证金 // 退佣金和红包、保证金
$financeRecord = FinancialRecord::where('order_id', $refundOrder->order['order_id']) $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(); ->field('user_id uid,user_info nickname,number,mer_id,financial_type')->select()->toArray();
if (empty($financeRecord)) { if (empty($financeRecord)) {
return; return;

19
app/common/dao/store/order/StoreOrderOtherDao.php
View File

@ -836,15 +836,16 @@ class StoreOrderOtherDao extends BaseDao
$financeDao->order->order_id = $model->refund_order_id; $financeDao->order->order_id = $model->refund_order_id;
$financeDao->platformIn($refundTotal, 'supply_chain_refund', $model->mer_id); $financeDao->platformIn($refundTotal, 'supply_chain_refund', $model->mer_id);
if ($refundOrder->order->status == -1){ // TODO 暂时不退保证金
$margin = FinancialRecord::where('order_id', $refundOrder['order_id']) // if ($refundOrder->order->status == -1){
->where('mer_id', $model->mer_id) // $margin = FinancialRecord::where('order_id', $refundOrder['order_id'])
->where('financial_type', 'auto_margin') // ->where('mer_id', $model->mer_id)
->value('number'); // ->where('financial_type', 'auto_margin')
if ($margin) { // ->value('number');
$financeDao->platformOut($margin, 'auto_margin_refund', $model->mer_id); // if ($margin) {
} // $financeDao->platformOut($margin, 'auto_margin_refund', $model->mer_id);
} // }
// }
$financeDao->save(); $financeDao->save();
app()->make(MerchantRepository::class)->subLockMoney($model->mer_id, 'order', $refundOrder['order_id'], $refundTotal); app()->make(MerchantRepository::class)->subLockMoney($model->mer_id, 'order', $refundOrder['order_id'], $refundTotal);