admin/liche
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

edit-admin-order_lists_status

Browse Source
This commit is contained in:
lccsw
2022-05-19 17:59:35 +08:00
parent 430fb9519f
commit 740604a2bd
4 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/controllers/receiver/orderv2/Orders.php
+2 -1
View File
@@ -664,11 +664,12 @@ class Orders extends HD_Controller
$where = [
'o_id' => $params['id'],
'status' => 1,
"id not in (select id from lc_app_liche_orders where type=3 and o_id={$params['id']} and pay_price=0)" => null
"id not in (select id from lc_app_liche_orders where (type=3 and o_id={$params['id']} and pay_price=0) or (o_id={$params['id']} and pid=0))" => null
];
$count = $this->app_liche_orders_model->count($where);
if ($count) {
$rows = $this->app_liche_orders_model->select($where, 'id desc', $page, $size, 'id,total_price,type,pay_time,mch_id,descrip,status,pid,img,admin_id');
echo $this->app_liche_orders_model->db->last_query();
$type_arr = $this->app_liche_orders_model->get_type_arr();
foreach ($rows as $item) {
$company = '';
admin/libraries/Ordersv2List.php
+8 -4
View File
@@ -313,11 +313,15 @@ class Ordersv2List
$fields['price'] = $this->paywayAry[$val['payway']]."<br>".number_format($money_json['price_car'], 2);
$fields['payway_name'] = $this->paywayAry[$val['payway']];
$fields['incor_name'] = isset($attr[$val['incor_id']]) ? $attr[$val['incor_id']][0]['title'] : '';
if (strlen($params['status_pid']) && $params['status_pid'] != 5 && $val['status'] != 2) {
$fields['status_name'] = $this->ci->orders_status_entity->last_status_cn($val['id'], $params['status_pid']);
} else {
$fields['status_name'] = $order_status_cn[$val['status']];
if($val['status']==2 || $val['id']<= Orders_v2_entity::V2_START_ID){
$status_name = $order_status_cn[$val['status']];
}else{
$params['status_pid'] == 6 && $params['status_pid']='';
$status_name = $this->ci->orders_status_entity->last_status_cn($val['id'], $params['status_pid']);
!$status_name && $status_name = '未下定';
}
$fields['status_name'] = $status_name;
$fields['biz_name'] = $bizs[$val['biz_id']];
$fields['c_time'] = date('Y-m-d H:i:s', $val['c_time']);
$of_title = '-';
common/libraries/receiver/Orders_status_entity.php
+6 -2
View File
@@ -85,11 +85,15 @@ class Orders_status_entity{
* @param $pid_status 主状态id
* @return string
*/
public function last_status_cn($oid,$pid_status){
public function last_status_cn($oid,$pid_status=''){
$where=[
'o_id' => $oid,
'pid_status' => $pid_status
];
if(!$pid_status){
$row = $this->ci->receiver_order_status_model->get($where,"id,max(pid_status) as pid_status");
$pid_status = $row['pid_status'];
}
$where['pid_status'] = $pid_status;
$row = $this->ci->receiver_order_status_model->get($where,"id,max(status) as last_status");
$status_arr = $this->ci->receiver_order_status_model->get_status();
if($row['id']){
common/libraries/receiver/Orders_v2_entity.php
+2 -2
View File
@@ -488,8 +488,8 @@ class Orders_v2_entity{
"id in ({$ids_str})" => null
];
$attr = $this->ci->auto_attr_model->map('id','title',$where);
$old_title = "{$brand[$row['s_id']]['b_name']}-{$brand[$row['s_id']]['name']}-{$attr[$row['v_id']]}-{$attr[$row['cor_id']]}";
$new_title = "{$brand[$new_data['s_id']]['b_name']}-{$brand[$new_data['s_id']]['name']}-{$attr[$new_data['v_id']]}-{$attr[$new_data['cor_id']]}";
$old_title = "{$brand[$row['s_id']]['b_name']}-{$brand[$row['s_id']]['name']}-{$attr[$row['v_id']]}-{$attr[$row['cor_id']]}-{$attr[$row['incor_id']]}";
$new_title = "{$brand[$new_data['s_id']]['b_name']}-{$brand[$new_data['s_id']]['name']}-{$attr[$new_data['v_id']]}-{$attr[$new_data['cor_id']]}-{$attr[$row['incor_id']]}";
$content = "车型由 {$old_title} 变更为 {$new_title}";
$this->ci->load->library('receiver/orders_entity');
$this->ci->orders_entity->add_log($row['id'],$user_info['uid'],$user_info['uname'],$content);