From 73a026c8595e8e2a5a47964e35ba50910ccf7c14 Mon Sep 17 00:00:00 2001 From: lcc <1127794702@qq.com> Date: Tue, 16 Jul 2024 10:53:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BE=E7=89=87=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/controllers/receiver/Orders.php | 15 ++++-- admin/views/receiver/order/get/ckinfo.php | 54 ++++++------------- api/controllers/wxapp/licheb/Cusorderdata.php | 29 +++++++--- common/libraries/receiver/Orders_entity.php | 26 +++++---- 4 files changed, 66 insertions(+), 58 deletions(-) diff --git a/admin/controllers/receiver/Orders.php b/admin/controllers/receiver/Orders.php index 7181bc3b..200d7ca3 100644 --- a/admin/controllers/receiver/Orders.php +++ b/admin/controllers/receiver/Orders.php @@ -282,11 +282,18 @@ class Orders extends HD_Controller $contract_img[] = build_qiniu_image_url($value); } } + $equity_ck_img = []; + if ($img_data['equity_ck_img']) { + $img_array = explode(',', $img_data['equity_ck_img']); + foreach ($img_array as $value) { + $equity_ck_img[] = build_qiniu_image_url($value); + } + } + $img_data['equity_ck_img'] = $equity_ck_img; $img_data['contract_img'] = $contract_img; $img_data['car_img'] && $img_data['car_img'] = build_qiniu_image_url($img_data['car_img']); $img_data['car_auth_img'] && $img_data['car_auth_img'] = build_qiniu_image_url($img_data['car_auth_img']); $img_data['delivery_ck_img'] && $img_data['delivery_ck_img'] = build_qiniu_image_url($img_data['delivery_ck_img']); - $img_data['equity_ck_img'] && $img_data['equity_ck_img'] = build_qiniu_image_url($img_data['equity_ck_img']); $img_data['bill_img'] && $img_data['bill_img'] = build_qiniu_image_url($img_data['bill_img']); $img_data['insurance_img'] && $img_data['insurance_img'] = build_qiniu_image_url($img_data['insurance_img']); $img_data['business_img'] && $img_data['business_img'] = build_qiniu_image_url($img_data['business_img']); @@ -460,7 +467,9 @@ class Orders extends HD_Controller } else { $re_data_id = $re_data['id']; } - $field == 'contract_img' && $save_value = $re_data[$field] ? $re_data[$field] . ',' . $value : $value; + if ($field == 'contract_img' || $field == 'equity_ck_img') { + $save_value = $re_data[$field] ? $re_data[$field] . ',' . $value : $value; + } if ($field == 'ins_img') { $val_arr = json_decode($re_data[$field], true); $val_arr[] = $value; @@ -536,7 +545,7 @@ class Orders extends HD_Controller if (!$row) { return $this->show_json(SYS_CODE_FAIL, '参数错误'); } - if ($info['field'] == 'contract_img') { + if ($info['field'] == 'contract_img' || $info['field'] == 'equity_ck_img') { $img_array = explode(',', $row[$info['field']]); $new_imgs = []; foreach ($img_array as $item) { diff --git a/admin/views/receiver/order/get/ckinfo.php b/admin/views/receiver/order/get/ckinfo.php index 7d45dc00..640b37ce 100644 --- a/admin/views/receiver/order/get/ckinfo.php +++ b/admin/views/receiver/order/get/ckinfo.php @@ -57,7 +57,7 @@
身份证正面
- +
  • @@ -81,32 +81,6 @@
  • -

    @@ -166,16 +140,18 @@ 权益确认书:

    - diff --git a/api/controllers/wxapp/licheb/Cusorderdata.php b/api/controllers/wxapp/licheb/Cusorderdata.php index 3e7b60ec..8d2892f2 100644 --- a/api/controllers/wxapp/licheb/Cusorderdata.php +++ b/api/controllers/wxapp/licheb/Cusorderdata.php @@ -71,10 +71,13 @@ class Cusorderdata extends Wxapp ]; } if ($row_data['equity_ck_img']) { - $equity_ck_img = [ - 'value' => $row_data['equity_ck_img'], - 'img' => build_qiniu_image_url($row_data['equity_ck_img']) - ]; + $equity_ck_img_arr = explode(',', $row_data['equity_ck_img']); + foreach ($equity_ck_img_arr as $value) { + $equity_ck_img[] = [ + 'value' => $value, + 'img' => build_qiniu_image_url($value) + ]; + } } if ($row_data['car_auth_img']) { $car_auth_img = [ @@ -99,6 +102,7 @@ class Cusorderdata extends Wxapp } $imgs = [ 'cardida' => [], + 'cardidb' => [], 'business_licence' => [], 'car_img' => $car_img, 'ins_img' => [], @@ -133,8 +137,15 @@ class Cusorderdata extends Wxapp 'value' => $row_data['cardida'], 'img' => build_qiniu_image_url($row_data['cardida']) ]; + $data['imgs']['cardida'] = $cardida; + } + if ($row_data['cardidb']) { + $cardidb = [ + 'value' => $row_data['cardidb'], + 'img' => build_qiniu_image_url($row_data['cardidb']) + ]; + $data['imgs']['cardidb'] = $cardidb; } - $data['imgs']['cardida'] = $cardida; } return $data; } @@ -153,6 +164,7 @@ class Cusorderdata extends Wxapp $this->receiver_order_datas_model->add(['o_id' => $id]); } $cardida = $this->input_param('cardida'); + $cardidb = $this->input_param('cardidb'); $car_img = $this->input_param('car_img'); $business_licence = $this->input_param('business_licence'); @@ -209,12 +221,15 @@ class Cusorderdata extends Wxapp } elseif ($business_img) { $update['business_img'] = $business_img; } else { + if ($cardidb) { + $key = 'cardidb'; + $img = $cardidb; + } if ($car_img) { //图片识别行驶证 $key = 'car_img'; $img = $car_img; $result = $this->tcorc->VehicleLicense(build_qiniu_image_url($car_img)); if (!$result['code']) { -// throw new Exception('行驶证识别失败,请重新上传', ERR_PARAMS_ERROR); $res_data['code'] = API_CODE_ORC_FAIL; $res_data['data'] = [ ['car_img' => false, 'errmsg' => '行驶证识别失败,请重新上传'], @@ -236,7 +251,7 @@ class Cusorderdata extends Wxapp $key = 'pay_img'; $img = $pay_img; } - if ($equity_ck_img) { + if (isset($equity_ck_img)) { $key = 'equity_ck_img'; $img = $equity_ck_img; } diff --git a/common/libraries/receiver/Orders_entity.php b/common/libraries/receiver/Orders_entity.php index b46798bd..6b39df39 100644 --- a/common/libraries/receiver/Orders_entity.php +++ b/common/libraries/receiver/Orders_entity.php @@ -64,14 +64,8 @@ class Orders_entity // $post_data['carryCarDate'] = '2024-06-02'; /*付款时间去订单下定时间*/ $post_data['order_time'] != '0000-00-00 00:00:00' && $post_data['payDate'] = date('Y-m-d', strtotime($post_data['order_time'])); - $contract_imgs = []; - if ($order_data['contract_img']) { //多图 - $img_arr = explode(',', $order_data['contract_img']); - foreach ($img_arr as $item) { - $contract_imgs[] = build_qiniu_image_url($item); - } - } - $contract_imgs && $post_data['contractImg'] = implode(',', $contract_imgs); + $contract_imgs = $this->changeImgs($order_data['contract_img']); + $contract_imgs && $post_data['contractImg'] = $contract_imgs; $order_data['bill_img'] && $post_data['invoiceImg'] = build_qiniu_image_url($order_data['bill_img']); $order_data['pay_img'] && $post_data['payImg'] = build_qiniu_image_url($order_data['pay_img']); $order_row['color'] && $post_data['outColor'] = $order_row['color']; @@ -87,7 +81,8 @@ class Orders_entity $order_data['business_img'] && $insuranceImg[] = build_qiniu_image_url($order_data['business_img']); $insuranceImg && $post_data['insuranceImg'] = implode(',', $insuranceImg); $order_data['delivery_ck_img'] && $post_data['deliveryPhoto'] = build_qiniu_image_url($order_data['delivery_ck_img']); - $order_data['equity_ck_img'] && $post_data['priceRightsConfirmDoc'] = build_qiniu_image_url($order_data['equity_ck_img']); + $equity_ck_img = $this->changeImgs($order_data['equity_ck_img']); + $equity_ck_img && $post_data['priceRightsConfirmDoc'] = $equity_ck_img; $post_data['leadStairSource'] = $map_cfrom['title'] ?: ''; //线索⼀级来源 $post_data['leadSecondSource'] = $map_cfrom2['title'] ?: ''; //线索⼆级来源 $post_data['leadTime'] = date('Y-m-d H:i:s', $customer_row['c_time']); //线索时间 @@ -114,6 +109,19 @@ class Orders_entity return ['code' => 0, 'msg' => $req['msg']]; } } + + // 图片转完整链接 + private function changeImgs($img) + { + $img_arr = $img ? explode(',', $img) : []; + $req = []; + if ($img_arr) { + foreach ($img_arr as $item) { + $req[] = build_qiniu_image_url($item); + } + } + return implode(',', $req); + } } ?>