edit

application/index/controller/Finance.php

@@ -1468,13 +1468,13 @@ class Finance extends Basic
                     if (empty($partial_data['confirm_date'])) {
                         $update_arr[$i]['confirm_date']   = date("Y-m-d H:i:s", time());
                         $update_arr[$i]['confirm_status'] = 1;
+                    }
 
-                        if (empty($user_id) && $this->params['report_id']) {
-                            $user_id = $m_report->getFieldValue('user_id',['id'=>$this->params['report_id']]);
-                            if ($user_id) {
-                                $service = new ConvertCouponService();
-                                $service->convertCoupon($user_id, $this->params['report_id'], $this->params['bargain_id'], $this->params['order_id']);  //核销红包
-                            }
+                    if (empty($user_id) && $this->params['report_id']) {
+                        $user_id = $m_report->getFieldValue('user_id',['id'=>$this->params['report_id']]);
+                        if ($user_id) {
+                            $service = new ConvertCouponService();
+                             echo $service->convertCoupon($user_id, $this->params['report_id'], $this->params['bargain_id'], $this->params['order_id']);die;  //核销红包
                         }
                     }
                 }

public/resource/js/reportList.js

@@ -1440,6 +1440,8 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'css!style/home.css', '
 						}
 					}else{
 						var _dataTemp = {
+							'order_id': bargain.order_id,
+							'report_id': bargain.report_id_liu,
 						    'bargain_id': _$v.attr('data-id'),//成交报告id
 							'last_commission_id': _$v.attr('lastid')?_$v.attr('lastid'):0,//最后一个提交的记录id
 							'is_account_commission': type//0是保存，1是确认分佣