提交 e73e0638 authored 作者: 窦斌's avatar 窦斌

edit

上级 e4cd17f6
...@@ -1287,7 +1287,7 @@ class MyTestController extends BaseController ...@@ -1287,7 +1287,7 @@ class MyTestController extends BaseController
$cxtk['reo_state'] = 1; $cxtk['reo_state'] = 1;
$cxtk['reo_create_time'] = date("Y-m-d H:i:s"); $cxtk['reo_create_time'] = date("Y-m-d H:i:s");
$cxtk['reo_pay_time'] = date("Y-m-d H:i:s"); $cxtk['reo_pay_time'] = date("Y-m-d H:i:s");
$cxtk['reo_pay_way'] = 4; $cxtk['reo_pay_way'] = 6;
$cxtk['reo_paid_money'] = $cxt; $cxtk['reo_paid_money'] = $cxt;
$cxtk['reo_pay_check'] = 1; $cxtk['reo_pay_check'] = 1;
$cxtk['reo_type'] = 1; $cxtk['reo_type'] = 1;
......
...@@ -2116,8 +2116,8 @@ class OrderListController extends BaseController ...@@ -2116,8 +2116,8 @@ class OrderListController extends BaseController
return $this->error('请选择订单商品类型', ErrorInc::INVALID_PARAM);exit; return $this->error('请选择订单商品类型', ErrorInc::INVALID_PARAM);exit;
} }
$db = new OrderList(); $db = new OrderList();
$params = ['stauas'=>34,'delay_status'=>1,'is_delete'=>1,'category'=>$request->input('category')]; $params = ['stauas'=>34,'delay_status'=>1,'is_delete'=>1,'category'=>$request->input('category'),'company_id'=>$request->get('session_token')['company_id']];
$orderBy = ['orli_type'=>'DESC']; $orderBy = ['feeds_time'=>'DESC','orli_type'=>'DESC'];
$select = ['id']; $select = ['id'];
$ids = CommonService::getMysqlData($db, $params,$select,$orderBy); $ids = CommonService::getMysqlData($db, $params,$select,$orderBy);
$flag = 1; $flag = 1;
......
...@@ -120,7 +120,11 @@ class PayController extends BaseController ...@@ -120,7 +120,11 @@ class PayController extends BaseController
}elseif($v['reo_pay_way'] == 3){ }elseif($v['reo_pay_way'] == 3){
$list[$k]['reo_pay_way_name'] = "线下打款"; $list[$k]['reo_pay_way_name'] = "线下打款";
} else { } else {
if(empty($v['reo_remaek'])) {
$list[$k]['reo_pay_way_name'] = "--"; $list[$k]['reo_pay_way_name'] = "--";
}else{
$list[$k]['reo_pay_way_name'] = $v['reo_remaek'];
}
} }
}elseif($v['reo_type'] == 2){ }elseif($v['reo_type'] == 2){
$list[$k]['reo_type_name'] = "扣费"; $list[$k]['reo_type_name'] = "扣费";
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论