diff --git a/api/controllers/wxapp/licheb/Cusorderdata.php b/api/controllers/wxapp/licheb/Cusorderdata.php index 73dcfc19..adc295f3 100644 --- a/api/controllers/wxapp/licheb/Cusorderdata.php +++ b/api/controllers/wxapp/licheb/Cusorderdata.php @@ -59,12 +59,6 @@ class Cusorderdata extends Wxapp 'img' => build_qiniu_image_url($row_data['delivery_ck_img']) ]; } - if ($row_data['contract_img']) { - $contract_img = [ - 'value' => $row_data['contract_img'], - 'img' => build_qiniu_image_url($row_data['contract_img']) - ]; - } if ($row_data['pay_img']) { $pay_img = [ 'value' => $row_data['pay_img'], @@ -89,6 +83,15 @@ class Cusorderdata extends Wxapp 'img' => build_qiniu_image_url($row_data['bill_img']) ]; } + if ($row_data['contract_img']) { + $contract_img_arr = explode(',', $row_data['contract_img']); + foreach ($contract_img_arr as $value) { + $contract_img[] = [ + 'value' => $value, + 'img' => build_qiniu_image_url($value) + ]; + } + } $imgs = [ 'cardida' => [], 'cardidb' => [], @@ -136,17 +139,6 @@ class Cusorderdata extends Wxapp $data['imgs']['cardida'] = $cardida; $data['imgs']['cardidb'] = $cardidb; } - if ($row_data['ins_img']) { - $ins_img = json_decode($row_data['ins_img'], true); - $imgs = []; - foreach ($ins_img as $item) { - $imgs[] = [ - 'value' => $item, - 'img' => build_qiniu_image_url($item) - ]; - } - $data['imgs']['ins_img'] = $imgs; - } return $data; } diff --git a/api/controllers/wxapp/licheb/Sign.php b/api/controllers/wxapp/licheb/Sign.php index 2ae70a5d..65c258ab 100644 --- a/api/controllers/wxapp/licheb/Sign.php +++ b/api/controllers/wxapp/licheb/Sign.php @@ -23,6 +23,7 @@ class Sign extends Wxapp $this->load->model('app/app_model'); $this->load->library('receiver/customers_entity'); $this->load->helper('search'); + $this->load->helper("order"); } //商家签到页配置信息 @@ -127,6 +128,7 @@ class Sign extends Wxapp if (!$cache_key || !$lat || !$lng) throw new Exception('参数错误', ERR_PARAMS_ERROR); if (!isValidLatLng($lat, $lng)) throw new Exception('未获取到定位', ERR_PARAMS_ERROR); $sign_data = [ + 'sid' => create_customer_no(), 'status' => 0, 'uid' => $this->session['id'], 'lat' => $lat, @@ -145,6 +147,8 @@ class Sign extends Wxapp $biz_user = $this->app_user_model->get(['id' => $biz_uid]); //计算距离 $distance = get_distance($lat, $lng, $biz['lat'], $biz['lng']); + $biz['lat'] && $sign_data['biz_lat'] = $biz['lat']; + $biz['lng'] && $sign_data['biz_lng'] = $biz['lng']; $sign_data['distance'] = $distance; if ($distance > 500) { $sign_data['descrip'] = '不在门店范围'; diff --git a/common/libraries/receiver/Orders_entity.php b/common/libraries/receiver/Orders_entity.php index 387dd412..7a01bbcf 100644 --- a/common/libraries/receiver/Orders_entity.php +++ b/common/libraries/receiver/Orders_entity.php @@ -11,10 +11,11 @@ class Orders_entity { $this->ci = &get_instance(); $this->ci->load->model('receiver/receiver_customers_model', 'customers_model'); - $this->ci->load->model('receiver/order/receiver_orders_model', 'orders_model'); $this->ci->load->model('receiver/order/receiver_order_datas_model'); $this->ci->load->model('auto/auto_cars_model'); + $this->ci->load->model('receiver/receiver_customer_sign_model', 'sign_model'); + $this->ci->load->model('receiver/receiver_clues_cfrom_model', 'clues_cfrom_model'); $this->ci->load->library('carHome'); } @@ -29,9 +30,12 @@ class Orders_entity $customer_row = $this->ci->customers_model->get(['id' => $order_row['customer_id']]); $car_row = $this->ci->auto_cars_model->get(['id' => $order_row['car_id']]); $order_data = $this->ci->receiver_order_datas_model->get(['o_id' => $order_row['id']]); + $sign_row = $this->ci->sign_model->get(['customer_id' => $order_row['customer_id']]); if (!$order_row) { return ['code' => 0, 'msg' => '订单不存在']; } + $map_cfrom2 = $this->clues_cfrom_model->get(array('id' => $customer_row['of2_id'])); + $map_cfrom = $this->clues_cfrom_model->get(array('id' => $map_cfrom2['pid'])); $money_json = json_decode($order_row['money_json'], true); $post_data = [ 'buyerType' => $order_row['main_type'] ? 2 : 1, @@ -69,13 +73,30 @@ class Orders_entity $money_json['discount_amount'] && $post_data['discountAmount'] = $money_json['discount_amount']; // $data['isLocalInvoice'] = 0; $post_data['idCardNo'] = $order_row['card_id']; - $order_data['car_img'] && $data['carDocumentImg'] = build_qiniu_image_url($order_data['car_img']); + $order_data['car_img'] && $post_data['carDocumentImg'] = build_qiniu_image_url($order_data['car_img']); $insuranceImg = []; //保险图片 $order_data['insurance_img'] && $insuranceImg[] = build_qiniu_image_url($order_data['insurance_img']); $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']); + $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']); //线索时间 + $customer_row['province_id'] && $post_data['leadProvinceCode'] = $customer_row['province_id']; //线索所在省份 + $customer_row['city_id'] && $post_data['leadCityCode'] = $customer_row['city_id']; //线索所在城市 + $customer_row['county_id'] && $post_data['leadDistrictCode'] = $customer_row['county_id']; //线索所在区县 + $sign_data = []; //签到数据 + if ($sign_row) { + $sign_data['signinId'] = $sign_row['sid']; + $sign_data['signinTime'] = date('Y-m-d H:i:s', $sign_row['c_time']); + $sign_data['signinGdLongitude'] = $sign_row['lng']; + $sign_data['signinGdLatitude'] = $sign_row['lat']; + $sign_data['storeGdLongitude'] = $sign_row['biz_lng']; + $sign_data['storeGdLatitude'] = $sign_row['biz_lng']; + $sign_data['storeLinearDistance'] = $sign_row['distance']; + } + $sign_data && $post_data['signinList'] = [$sign_data]; $req = $this->ci->carhome->saveOrder($post_data, $order_row['id']); if ($req['code']) { $auto_order_id = $req['data']['autohomeOrderId'];