Commit 5d112cfc authored by hujun's avatar hujun

report_id

parent 29c5412a
...@@ -402,7 +402,7 @@ class Finance extends Basic ...@@ -402,7 +402,7 @@ class Finance extends Basic
$data['code'] = 101; $data['code'] = 101;
$data['msg'] = 'Id is null.'; $data['msg'] = 'Id is null.';
} else { } else {
$fields = 'a.id,a.create_time,b.user_phone,b.user_name,d.internal_title,d.internal_address,a.is_open,a.order_id,'; $fields = 'a.id,a.create_time,b.user_phone,b.user_name,d.internal_title,d.internal_address,a.is_open,a.order_id,a.report_id,';
$fields .= 'a.trade_type,a.house_number,a.commission,a.content,d.shop_type,a.industry_type,a.price,a.estimated_receipt_date,'; $fields .= 'a.trade_type,a.house_number,a.commission,a.content,d.shop_type,a.industry_type,a.price,a.estimated_receipt_date,';
$fields .= 'b.user_id,d.id as house_id'; $fields .= 'b.user_id,d.id as house_id';
$where['a.id'] = $this->params['id']; $where['a.id'] = $this->params['id'];
...@@ -1469,8 +1469,8 @@ class Finance extends Basic ...@@ -1469,8 +1469,8 @@ class Finance extends Basic
$update_arr[$i]['confirm_date'] = date("Y-m-d H:i:s", time()); $update_arr[$i]['confirm_date'] = date("Y-m-d H:i:s", time());
$update_arr[$i]['confirm_status'] = 1; $update_arr[$i]['confirm_status'] = 1;
if (empty($user_id) && $item['report_id']) { if (empty($user_id) && $this->params['report_id']) {
$user_id = $m_report->getFieldValue('user_id',['id'=>$item['report_id']]); $user_id = $m_report->getFieldValue('user_id',['id'=>$this->params['report_id']]);
if ($user_id) { if ($user_id) {
$service = new ConvertCouponService(); $service = new ConvertCouponService();
$service->convertCoupon($user_id); //核销红包 $service->convertCoupon($user_id); //核销红包
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment