Skip to content

Z
zptz-sass-kelaidian
提交 d5073132 authored 作者: 窦斌's avatar 窦斌
浏览文件
操作

Merge branch 'master' of http://gitlab.bluearp.com/ldj/zptz-sass-kelaidian

上级 6248feaa 06508a14
显示空白字符变更
内嵌 并排
正在显示 包含 129 行增加 和 5 行删除
app/ExcelTemp/ExcelTemp.php
浏览文件 @ d5073132
...@@ -41,6 +41,7 @@ trait ExcelTemp ...@@ -41,6 +41,7 @@ trait ExcelTemp
// ['action_name' => 'F6订单列表', 'action_value' => 'F6StoreOrder'],//2022-3-4 // ['action_name' => 'F6订单列表', 'action_value' => 'F6StoreOrder'],//2022-3-4
['action_name' => '账目中心发票导出', 'action_value' => 'InvoiceExcel'],//2022-3-15 ['action_name' => '账目中心发票导出', 'action_value' => 'InvoiceExcel'],//2022-3-15
['action_name' => '缴费扣费记录', 'action_value' => 'PayOverList'],//2024-10-09
]; ];
...@@ -915,7 +916,23 @@ trait ExcelTemp ...@@ -915,7 +916,23 @@ trait ExcelTemp
], ],
'PayOverList' => [
['field_name' => '单号', 'field_value' => 'reo_order_number'],//
['field_name' => '类型', 'field_value' => 'reo_type'],//
['field_name' => '充值/扣款 金额', 'field_value' => 'reo_price'],//
['field_name' => '充值/扣款 时间', 'field_value' => 'reo_pay_time'],//
['field_name' => '支付方式', 'field_value' => 'reo_pay_way'],//
['field_name' => '客户分类', 'field_value' => 'reo_client_type'],//
['field_name' => '公司名称', 'field_value' => 'com_name'],//
['field_name' => '支付状态', 'field_value' => 'reo_pay_state'],
]
]; ];
return $filed[$param]; return $filed[$param];
......
app/Http/Controllers/Common/CommonController.php
浏览文件 @ d5073132
...@@ -974,7 +974,6 @@ class CommonController extends BaseController ...@@ -974,7 +974,6 @@ class CommonController extends BaseController
if($list){ if($list){
$sql = $exceout->getSqls($sqls)['sqls']; $sql = $exceout->getSqls($sqls)['sqls'];
$avtion = FunctionsService::getFunctionsBy('function_id', $pri_id, ['function_name','function_model']); $avtion = FunctionsService::getFunctionsBy('function_id', $pri_id, ['function_name','function_model']);
//dump($avtion);
$con_name = $avtion['function_name'];//控制器名称 $con_name = $avtion['function_name'];//控制器名称
$action = $avtion['function_model'];//控制器 $action = $avtion['function_model'];//控制器
$field_data = $exceout->gainFields($session['id'],$action); $field_data = $exceout->gainFields($session['id'],$action);
......
app/Http/Controllers/ExcelInfo/ExceloutController.php
浏览文件 @ d5073132
...@@ -2330,6 +2330,107 @@ public function performBserviStore($res,$con='BserviStore'){ ...@@ -2330,6 +2330,107 @@ public function performBserviStore($res,$con='BserviStore'){
} }
} }
/**
* @name 缴费记录
* @param $res
* @param string $con
* @return mixed
* @author du
* @date 2022/5/12
* @Time: 14:10
*/
public function performPayOverList($res,$con='PayOverList'){
$detail = DB::table("excel_detail")->where("ed_elid",$res['el_id'])->where("ed_state",'1')->first();
if($detail){
$data = $this->excelOut->getDatas($con, $res, $detail);
$db = $data['db'];
$group = $data['group'];
$file = $data['file'];
if($db){
$num1 = count($db);
foreach( $db as $k => $v ){
if ($v['reo_type'] == 1){
$reo_type_name = "充值";
if ($v['reo_pay_way'] == 1){
$reo_pay_way_name = "微信";
}elseif($v['reo_pay_way'] == 2){
$reo_pay_way_name = "支付宝";
}elseif($v['reo_pay_way'] == 3){
$reo_pay_way_name = "线下打款";
} else {
$reo_pay_way_name = "--";
}
}elseif($v['reo_type'] == 2){
$reo_type_name = "扣费";
$reo_pay_way_name = "派单扣费";
} elseif($v['reo_type'] == 3) {
$reo_type_name = "扣费";
$reo_pay_way_name = "月费扣费";
}
if ($v['reo_pay_state'] == 1){
$reo_pay_state_name = "未支付";
}elseif($v['reo_pay_state'] == 2){
$reo_pay_state_name = "已支付";
}
if ($v['reo_client_type'] == 1){
$reo_client_type_name = "服务商";
}elseif($v['reo_client_type'] == 2){
$reo_client_type_name = "经销商";
} else {
$reo_client_type_name = "其他";
}
if ($v['reo_pay_time'] == '0000-00-00 00:00:00') {
$v['reo_pay_time'] = "--";
}
$com_name = DB::table('company')
->where('com_id', $v['reo_company_id'])
->value('com_name');
foreach( $group as $kg => $vg ){
$num = array_search($vg,$group);
if($vg=='reo_order_number'){
$rs[$k][strtolower(chr(65+$num))] = '`' . $v['reo_order_number'];
}elseif ($vg=='reo_type'){
$rs[$k][strtolower(chr(65+$num))] = $reo_type_name;
}elseif ($vg == 'reo_price'){
$rs[$k][strtolower(chr(65+$num))] = $v['reo_price'];
}elseif ($vg == 'reo_pay_time'){
$rs[$k][strtolower(chr(65+$num))] = $v['reo_pay_time'];
}elseif ($vg == 'reo_pay_way'){
$rs[$k][strtolower(chr(65+$num))] = $reo_pay_way_name;
}elseif($vg == 'reo_client_type'){
$rs[$k][strtolower(chr(65+$num))] = $reo_client_type_name;
}elseif($vg == 'com_name'){
$rs[$k][strtolower(chr(65+$num))] = $com_name;
}elseif($vg == 'reo_pay_state'){
$rs[$k][strtolower(chr(65+$num))] = $reo_pay_state_name;
}
// else{
// $rs[$k][strtolower(chr(65+$num))] = "\t".$v[$vg]."\t";
// }
}
$datas = $rs[$k];
$datas = $this->excelOut->replaceData($datas);
$strexport = implode("\t",$datas)."\r";
$strexport = iconv("UTF-8", "gbk//IGNORE", $strexport);
file_put_contents($file, $strexport, FILE_APPEND);
unset($strexport);
unset($db[$k]);
unset($rs[$k]);
}
$el_item = $res['el_item'] + $num1;
DB::table("excel_list")->where('el_id',$res['el_id'])->update(['el_item'=>$el_item]);
DB::table("excel_detail")->where("ed_id",$detail['ed_id'])->update(['ed_state'=>2]);
return $this->success('操作成功1');
}else{
DB::table("excel_detail")->where("ed_id",$detail['ed_id'])->update(['ed_state'=>2]);
return $this->success('操作成功2');
}
}else{
DB::table("excel_list")->where('el_id',$res['el_id'])->update(['el_state'=>2]);
return $this->success('操作成功3');
}
}
} }
......
app/Http/Controllers/ExcelInfo/ExcelpermissController.php
浏览文件 @ d5073132
...@@ -155,6 +155,4 @@ class ExcelpermissController extends BaseController ...@@ -155,6 +155,4 @@ class ExcelpermissController extends BaseController
return $this->success('获取成功',$data);exit; return $this->success('获取成功',$data);exit;
} }
} }
} }
app/Http/Controllers/Service/PayController.php
浏览文件 @ d5073132
...@@ -81,14 +81,23 @@ class PayController extends BaseController ...@@ -81,14 +81,23 @@ class PayController extends BaseController
if($page<1){ if($page<1){
$page = 1; $page = 1;
} }
if ($request->input('is_excel') == 1) {
DB::connection()->enableQueryLog();#开启执行日志
}
// ->select('pg_id','is_delect','brand_name','pg_series','version','general_version','gs_bid','cd_id','gs_id','goods_pic_path','pieces','sort_directory','pg_assurance') // ->select('pg_id','is_delect','brand_name','pg_series','version','general_version','gs_bid','cd_id','gs_id','goods_pic_path','pieces','sort_directory','pg_assurance')
$paginate = $Db->orderBy('reo_id','DESC')->paginate($page_size); $paginate = $Db->orderBy('reo_id','DESC')->paginate($page_size);
$sqls = DB::getQueryLog()[1];
$list = self::dataToArray($paginate->items()); $list = self::dataToArray($paginate->items());
//dump($list);exit; //dump($list);exit;
//导出 start
if ($request->input('is_excel') == 1) {
$excel = new CommonController();
return $excel->getExcelOut($request['Pri_id'], $sqls, $request->get('session_token'));
}
//导出 end //导出 end
$all_button = BmmcService::whereButton($request->input('token'),$request->input('Pri_id')); $all_button = BmmcService::whereButton($request->input('token'),$request->input('Pri_id'));
$topbtn[] = 'export';
$export = BmmcService::getTopButton(implode(',', $topbtn),'',$all_button);
$data['button_top'] = $export['button_top']??[];//顶部按钮 $data['button_top'] = $export['button_top']??[];//顶部按钮
$data['button_search'] = $export['button_search']??[];//搜索栏按钮 $data['button_search'] = $export['button_search']??[];//搜索栏按钮
if($list){ if($list){
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论