From 6e56814fcd69323c589f2e77592dd1c9c24886f5 Mon Sep 17 00:00:00 2001 From: lccsw <1127794702@qq.com> Date: Tue, 23 Nov 2021 13:49:07 +0800 Subject: [PATCH] edit-admin-export_order --- admin/libraries/OrdersList.php | 8 ++++---- api/controllers/wxapp/licheb/Cusorder.php | 3 ++- common/libraries/receiver/Orders_entity.php | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/admin/libraries/OrdersList.php b/admin/libraries/OrdersList.php index 0df93fef..366755f6 100644 --- a/admin/libraries/OrdersList.php +++ b/admin/libraries/OrdersList.php @@ -1622,11 +1622,11 @@ class OrdersList $agent = $this->ci->order_agents_model->get(['o_id' => $value['o_id']],'jsondata'); if($agent){ $agent_jsondata = $agent['jsondata'] ? json_decode($agent['jsondata'], true) : ''; - if ($agent_jsondata['if_ins_db']) { + if (isset($agent_jsondata['if_ins_db']) && $agent_jsondata['if_ins_db']) { $temp['if_ins_db'] = '是'; - $agent_jsondata['company'] && $temp['company'] = $agent_jsondata['company']; - $agent_jsondata['ins_risk'] && $temp['ins_risk'] = $agent_jsondata['ins_risk']; - $agent_jsondata['business_risk'] && $temp['business_risk'] = $agent_jsondata['business_risk']; + isset($agent_jsondata['company']) && $temp['company'] = $agent_jsondata['company']; + isset($agent_jsondata['ins_risk']) && $temp['ins_risk'] = $agent_jsondata['ins_risk']; + isset($agent_jsondata['business_risk']) && $temp['business_risk'] = $agent_jsondata['business_risk']; }else{ $temp['if_ins_db'] = '否'; } diff --git a/api/controllers/wxapp/licheb/Cusorder.php b/api/controllers/wxapp/licheb/Cusorder.php index ba298235..b1b58641 100644 --- a/api/controllers/wxapp/licheb/Cusorder.php +++ b/api/controllers/wxapp/licheb/Cusorder.php @@ -502,7 +502,8 @@ class Cusorder extends Wxapp{ 'fine_ids' => $row['fine_ids'] ? explode(',',$row['fine_ids']) : [], 'cus_id' => $row['rid'], 'edit_status' => $row['status'] > 2 ? 0 : 1, - 'status' => $row['status'] + 'status' => $row['status'], + 'my_img' => $orders_entity::API_CREATE_PAY_IMG, ]; $inten_money && $data['inten_money'] = $inten_money; return $data; diff --git a/common/libraries/receiver/Orders_entity.php b/common/libraries/receiver/Orders_entity.php index b4ccf74e..307be094 100644 --- a/common/libraries/receiver/Orders_entity.php +++ b/common/libraries/receiver/Orders_entity.php @@ -10,7 +10,7 @@ class Orders_entity{ const PRICE_FINANCE_NZ = 2000; //哪吒金融服务费 const API_ADMIN_IMG = 'https://img.liche.cn/liche/2021/08/7725fc9ab0dc0ba1/f3c84cf3b805bac4.png'; //api 客服二维码 const API_PAY_IMG = 'https://img.liche.cn/liche/1634022931.png'; //api 意向金跳转支付二维码 - const API_CREATE_PAY_IMG = 'https://img.liche.cn/liche/2021/11/65b34b962f5f06b3/62e7d28d77bfe404.png'; //api 创建订单跳转支付二维码 + const API_CREATE_PAY_IMG = 'https://img.liche.cn/liche/2021/11/65b34b962f5f06b3/62e7d28d77bfe404.png'; //api 狸车我的页面 private $ci; private $order_row;