Skip to content

Z
zptz-sass-kelaidian
提交 625b75eb authored 作者: 李大见's avatar 李大见
浏览文件
操作

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

上级 8d5cc885 a4bf38a3
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 288 行增加 和 73 行删除
app/Console/Commands/SynCancelAuditList.php 0 → 100644
浏览文件 @ 625b75eb
<?php
namespace App\Console\Commands;
use App\Http\Controllers\Api\JdOrderApiController;
use Illuminate\Console\Command;
class SynCancelAuditList extends Command
{
/**
* The name and signature of the console command.
*
* @var string
*/
protected $signature = 'SynCancelAuditList';
/**
* The console command description.
*
* @var string
*/
protected $description = 'Command SynCancelAuditList';
/**
* Create a new command instance.
*
* @return void
*/
public function __construct()
{
parent::__construct();
}
/**
* Execute the console command.
*
* @return mixed
*/
public function handle()
{
//
$getOrder = new JdOrderApiController();
$ret = $getOrder->getOrderCancelAuditList();
print_r($ret);
}
}
app/Console/Commands/SynJdOrderApi.php 0 → 100644
浏览文件 @ 625b75eb
<?php
namespace App\Console\Commands;
use App\Http\Controllers\Api\JdOrderApiController;
use Illuminate\Console\Command;
class SynJdOrderApi extends Command
{
/**
* The name and signature of the console command.
*
* @var string
*/
protected $signature = 'getOrder';
/**
* The console command description.
*
* @var string
*/
protected $description = 'Command getJdOrder';
/**
* Create a new command instance.
*
* @return void
*/
public function __construct()
{
parent::__construct();
}
/**
* Execute the console command.
*
* @return mixed
*/
public function handle()
{
//
$getOrder = new JdOrderApiController();
$ret = $getOrder->getOrderByJd();
print_r($ret);
}
}
app/Console/Kernel.php
浏览文件 @ 625b75eb
......@@ -18,7 +18,9 @@ class Kernel extends ConsoleKernel
Commands\GetJdSelfOrder::class,
Commands\GetJdSelfRefund::class,
Commands\GetJdSelfShhOrder::class,
Commands\DeductionFee::class
Commands\DeductionFee::class,
Commands\SynJdOrderApi::class,
Commands\SynCancelAuditList::class
];
/**
......@@ -33,10 +35,12 @@ class Kernel extends ConsoleKernel
// ->hourly();
$schedule->command('getOrder')->everyFiveMinutes();//每五分钟执行一次
$schedule->command('decJdOrder')->everyFiveMinutes();//每五分钟执行一次
$schedule->command('getJdSelfOrder')->everyFiveMinutes();//每五分钟执行一次
// $schedule->command('getJdSelfOrder')->everyFiveMinutes();//每五分钟执行一次
// $schedule->command('getJdSelfRefund')->everyFiveMinutes();//每五分钟执行一次
$schedule->command('GetJdSelfShhOrder')->everyFiveMinutes();//每五分钟执行一次
// $schedule->command('GetJdSelfShhOrder')->everyFiveMinutes();//每五分钟执行一次
$schedule->command('DeductionFee')->everyFiveMinutes();//每三十分钟执行一次 everyThirtyMinutes
$schedule->command('SynJdOrderApi')->everyFiveMinutes();// 抓取京东社会化门店订单 //每五分钟执行一次
$schedule->command('SynCancelAuditList')->everyFiveMinutes();// 抓取京东社会化门店退款单 //每五分钟执行一次
}
/**
......
app/ExcelTemp/ExcelTemp.php
浏览文件 @ 625b75eb
......@@ -42,6 +42,7 @@ trait ExcelTemp
['action_name' => '账目中心发票导出', 'action_value' => 'InvoiceExcel'],//2022-3-15
['action_name' => '缴费扣费记录', 'action_value' => 'PayOverList'],//2024-10-09
['action_name' => '服务商绩效明细', 'action_value' => 'SerStatisticsDetail'],//2024-10-31
];
......@@ -61,7 +62,6 @@ trait ExcelTemp
['field_name' => '剩余金额', 'field_value' => 'residue_money'],//
],
//2022-3-4
'F6StoreOrder' => [
['field_name' => '编号', 'field_value' => 'id'],
......@@ -89,7 +89,6 @@ trait ExcelTemp
//['field_name' => '申请备注', 'field_value' => 'note'],///
],
//2022-2-8
'SettlementThree' => [
['field_name' => '编号', 'field_value' => 'id'],
......@@ -159,6 +158,7 @@ trait ExcelTemp
['field_name' => '账号状态', 'field_value' => 'enable'],
],*/
'StatementsList' => [
['field_name' => '编号', 'field_value' => 'stl_id'],
......@@ -182,7 +182,6 @@ trait ExcelTemp
['field_name' => '用友编码', 'field_value' => 'ser_yycode'],
],
'SettlementMouth' => [
['field_name' => '系统单号', 'field_value' => 'sys_num'],//1
......@@ -262,29 +261,31 @@ trait ExcelTemp
['field_name' => '服务商', 'field_value' => 'company_name'],//39
['field_name' => '第三方价格', 'field_value' => 'p_price'],//40
['field_name' => '服务技师', 'field_value' => 'intall_person'],//40
['field_name' => '第三方价格', 'field_value' => 'p_price'],//41
['field_name' => '第三方结算单号', 'field_value' => 'wat_three'],//41
['field_name' => '第三方结算单号', 'field_value' => 'wat_three'],//42
['field_name' => '第三方申请结算时间', 'field_value' => 'three_apply_for_time'],//42
['field_name' => '第三方申请结算时间', 'field_value' => 'three_apply_for_time'],//43
['field_name' => ' 第三方付款时间', 'field_value' => 'three_apply_pay_time'],//43
['field_name' => ' 第三方付款时间', 'field_value' => 'three_apply_pay_time'],//44
['field_name' => ' 用友编号', 'field_value' => 'ser_yycode'],//44
['field_name' => ' 用友编号', 'field_value' => 'ser_yycode'],//45
['field_name' => '扣除补货货款', 'field_value' => '249_titleid'],//45
['field_name' => '扣除补货货款', 'field_value' => '249_titleid'],//46
['field_name' => '姓名', 'field_value' => 'shr_name'],//46
['field_name' => '姓名', 'field_value' => 'shr_name'],//47
['field_name' => ' 省份', 'field_value' => 'shr_sheng'],//47
['field_name' => ' 省份', 'field_value' => 'shr_sheng'],//48
['field_name' => ' 城市', 'field_value' => 'shr_shi'],//48
['field_name' => ' 城市', 'field_value' => 'shr_shi'],//49
['field_name' => ' 区县', 'field_value' => 'shr_xian'],//49
['field_name' => ' 区县', 'field_value' => 'shr_xian'],//50
['field_name' => ' 详细地址', 'field_value' => 'shr_adress'],//50
['field_name' => ' 详细地址', 'field_value' => 'shr_adress'],//51
['field_name' => ' 结款类型', 'field_value' => 'mouth_pay'],//51 2022-05-05 dou
['field_name' => ' 结款类型', 'field_value' => 'mouth_pay'],//52 2022-05-05 dou
//['field_name' => '商品名称', 'field_value' => 'goods_name'],//4
......@@ -306,7 +307,6 @@ trait ExcelTemp
// ['field_name' => '姓名', 'field_value' => 'shr_name'],['field_name' => '订单金额 ', 'field_value' => 'all_price'],
],
'aftercust' => [
['field_name' => '编号', 'field_value' => 'afc_id'],
......@@ -477,7 +477,6 @@ trait ExcelTemp
['field_name' => '服务商属性', 'field_value' => 'brand_service'], // 2022-6-22 new add dou
],
'OrdersMsg' => [
//2022-5-12
['field_name' => '编号', 'field_value' => 'id'],
......@@ -509,10 +508,6 @@ trait ExcelTemp
['field_name' => '日', 'field_value' => 'creact_day'],
],
'ptthree' => [
['field_name' => '编号', 'field_value' => 'id'],
......@@ -621,7 +616,8 @@ trait ExcelTemp
],
/* 'SerInfor' => [
/* 'SerInfor' => [
['field_name' => '平台名称', 'field_value' => 'pt_name'],
......@@ -645,10 +641,6 @@ trait ExcelTemp
],*/
'SendGoods' => [
['field_name' => '序号', 'field_value' => 'id'],
......@@ -684,8 +676,6 @@ trait ExcelTemp
],
'WxBinding' => [
['field_name' => '服务器名称', 'field_value' => 'ser'],
......@@ -930,6 +920,22 @@ trait ExcelTemp
['field_name' => '公司名称', 'field_value' => 'com_name'],//
['field_name' => '支付状态', 'field_value' => 'reo_pay_state'],
],
'SerStatisticsDetail'=>[
['field_name' => '公司名称', 'field_value' => 'company_name', 'field_with' => 45],
['field_name' => '单号', 'field_value' => 'order_num', 'field_with' => 40],
['field_name' => '订单状态', 'field_value' => 'stauas', 'field_with' => 20],
['field_name' => '派单时间', 'field_value' => 'create_time', 'field_with' => 30],
['field_name' => '接单时间', 'field_value' => 'get_time', 'field_with' => 30],
['field_name' => '反馈时间', 'field_value' => 'feeds_time', 'field_with' => 30],
['field_name' => '接单时效', 'field_value' => 'jdAgeing', 'field_with' => 20],
['field_name' => '5分钟接单达标', 'field_value' => 'fiveStandard', 'field_with' => 20],
['field_name' => '10分钟接单达标', 'field_value' => 'tenStandard', 'field_with' => 20],
['field_name' => '施工时效', 'field_value' => 'sgAgeing', 'field_with' => 20],
['field_name' => '12小时履约达标', 'field_value' => 'Standard12Hours', 'field_with' => 20],
['field_name' => '24小时履约达标', 'field_value' => 'Standard24Hours', 'field_with' => 20],
['field_name' => '是否计入时效考核', 'field_value' => 'takeEffect', 'field_with' => 20],
]
];
......
app/Exports/BasicExport.php 0 → 100644
浏览文件 @ 625b75eb
差异被折叠。
app/Http/Controllers/Common/CommonController.php
浏览文件 @ 625b75eb
......@@ -185,6 +185,7 @@ class CommonController extends BaseController
$brand = CommonService::arrayFilterFieldValue($brand,[['id'=>explode(',',$brand_id)]]);
}
if($brand){
$brand = CommonService::resetListKey($brand);
return $this->success('操作成功', $brand);
}else{
return $this->error('无数据', ErrorInc::DATA_EMPTY, []);
......@@ -359,6 +360,9 @@ class CommonController extends BaseController
}else{
$pt[$k]['usermodeltype'] = 2;
}
if($request->get('session_token')['admin_groupnew'] == 7){
$pt[$k]['pt_name'] = $v['pt_name']."(".$v['company_id'].")";
}
}
return $this->success('操作成功', $pt);
}else{
......@@ -965,7 +969,7 @@ class CommonController extends BaseController
* @author du
* @date 2021/8/26
*/
public function getExcelOut($pri_id,$sqls,$session,$limit = 500){
public function getExcelOut($pri_id,$sqls,$session,$limit = 500,$action_name = ''){
$exceout = new ExceloutService();
if(!$sqls){
return $this->error('暂无数据或请检查SQL日志是否打开', ErrorInc::MYSQL_FAILED);
......@@ -973,12 +977,16 @@ class CommonController extends BaseController
$list = $exceout->getSqls($sqls)['list'];
if($list){
$sql = $exceout->getSqls($sqls)['sqls'];
$avtion = FunctionsService::getFunctionsBy('function_id', $pri_id, ['function_name','function_model']);
if($action_name=='') {
$avtion = FunctionsService::getFunctionsBy('function_id', $pri_id, ['function_name', 'function_model']);
}else{
$avtion = $action_name;
}
$con_name = $avtion['function_name'];//控制器名称
$action = $avtion['function_model'];//控制器
$field_data = $exceout->gainFields($session['id'],$action);
if (empty($field_data)) {
return $this->error('您暂时无导出权限', ErrorInc::MYSQL_FAILED);
return $this->error('您暂时无导出权限', ErrorInc::MYSQL_FAILED,$action);
}
return $exceout->createPlan($list,$sql,$limit,$action,$con_name,$session['id'],$session['admin_acc'],$session['company_id']);
}else{
......
app/Http/Controllers/DatasBase/DataStatisticsController.php 0 → 100644
浏览文件 @ 625b75eb
<?php
/**
* 文件名称（数据统计）
* 文件简单描述（用于进行数据统计分析）
* @author DouBin
* @Date: 2024/10/15
* @Time: 17:34
* @Email: db@sudianwang.com
* @version 1.0
* @copyright BlueCity
*/
namespace App\Http\Controllers\DatasBase;
use App\Http\Controllers\BaseController;
use App\Services\CommonService;
use App\Services\DataStatisticsService;
use BlueCity\Core\Inc\ErrorInc;
use Illuminate\Http\Request;
use DB;
use Excel;
/**
* @name 自动派单绑定服务商
* Class BservissController
* @package App\Http\Controllers\Admin
*/
class DataStatisticsController extends BaseController
{
/**|---------------------------------------------------------------------------------
* @name 数据首页
* @param string
* @retrun \Illuminate\Http\JsonResponse
* @author dou 2024/10/15 17:37
* |---------------------------------------------------------------------------------
*/
public function index ( Request $request ){
$session = $request->get("session_token");
$input = $request->all();
$checkKey = CommonService::checkKey(['method','time_start','search_type'],$input);
if($checkKey['code']!=1){
return $this->error('参数'.$checkKey['data'].'未填写,或值为空', ErrorInc::INVALID_PARAM, []);
}
if(!in_array($input['search_type'],['week','month'])){
return $this->error('查询类型错误',ErrorInc::INVALID_PARAM,$input);
}
$api=['getSerStatistics','getSerStatisticsDetail'];
if(!in_array($input['method'],$api)){
return $this->error('接口不参数异常',ErrorInc::INVALID_PARAM,$input);
}else {
$api = (string)$input['method'];
$data = DataStatisticsService::$api($session,$input);
return $data;
// if($data){
// return $this->success('获取成功', $data); exit;
// }else{
// return $this->error('暂无数据', ErrorInc::DATA_EMPTY,$data);exit;
// }
}
}
}
app/Http/Controllers/DatasBase/TipsController.php
浏览文件 @ 625b75eb
......@@ -25,8 +25,12 @@ class TipsController extends BaseController
*/
public function index(Request $request){
$list = array();
if($request->get('session_token')['admin_groupnew'] == 2 || $request->get('session_token')['admin_groupnew'] == 3){
$orderList = OrderList::where('stauas',20)->where('ser_id',$request->get('session_token')['id'])->get();
if($request->get('session_token')['admin_groupnew'] == 2 || $request->get('session_token')['admin_groupnew'] == 3 || $request->get('session_token')['admin_groupnew'] == 4){
if($request->get('session_token')['admin_groupnew'] == 2) {
$orderList = OrderList::where('stauas', 20)->where('ser_id', $request->get('session_token')['id'])->get();
}else{
$orderList = OrderList::where('stauas', 20)->where('agency_id', $request->get('session_token')['company_id'])->get();
}
if(count($orderList)>0) {
$list[0]['msg'] = "您有新工单未领取";
$list[0]['count'] = count($orderList);
......
app/Http/Controllers/ExcelInfo/ExceloutController.php
浏览文件 @ 625b75eb
......@@ -59,7 +59,7 @@ class ExceloutController extends BaseController
$res = DB::table("excel_list")
->where('el_id',$id)
->where('el_state','1')
->select("el_action","el_id","el_sql","el_path","el_item","el_adminid")
->select("el_action","el_id","el_sql","el_path","el_item","el_adminid","company_id")
->orderBy('el_id','ASC')->first();
if($res){
......
app/Http/Controllers/Financial/SettlementController.php
浏览文件 @ 625b75eb
......@@ -201,6 +201,7 @@ class SettlementController extends BaseController{
$list_service_type55['list_service_type'] = 55;
$where['list_service_type_searchor']['list_service_type40_next_level'] = $list_service_type40;
$where['list_service_type_searchor']['list_service_type55_next_level'] = $list_service_type55;
$where['company_id'] = $session['company_id'];
$res = SettlementService::getSettlementList($where);
if ($res){
$input['source'] = 2;
......
app/Http/Controllers/Financial/StatementsListController.php
浏览文件 @ 625b75eb
......@@ -130,7 +130,7 @@ class StatementsListController extends BaseController{
$wats = rtrim($wats,',');*/
if ($session['admin_groupnew'] != 7){//管理员可以看全部
$sqlnew = "select gone_settlement_list.*,d.p_price,d.wat_num as wat_three from gone_settlement_list left join gone_statements_list on gone_settlement_list.wat_num = gone_statements_list.stl_wat LEFT JOIN gone_settlement_three as d on gone_settlement_list.list_id=d.list_id where company_id='". $session['company_id']."' gone_statements_list.stl_endtime Between '". $stl_startime."'and '". $stl_endtime."'";
$sqlnew = "select gone_settlement_list.*,d.p_price,d.wat_num as wat_three from gone_settlement_list left join gone_statements_list on gone_settlement_list.wat_num = gone_statements_list.stl_wat LEFT JOIN gone_settlement_three as d on gone_settlement_list.list_id=d.list_id where gone_settlement_list.company_id='". $session['company_id']."' and gone_statements_list.stl_endtime Between '". $stl_startime."'and '". $stl_endtime."'";
}else{
$sqlnew = "select gone_settlement_list.*,d.p_price,d.wat_num as wat_three from gone_settlement_list left join gone_statements_list on gone_settlement_list.wat_num = gone_statements_list.stl_wat LEFT JOIN gone_settlement_three as d on gone_settlement_list.list_id=d.list_id where gone_statements_list.stl_endtime Between '". $stl_startime."'and '". $stl_endtime."'";
}
......@@ -273,6 +273,7 @@ class StatementsListController extends BaseController{
$list_service_type55['list_service_type'] = 55;
$where['list_service_type_searchor']['list_service_type40_next_level'] = $list_service_type40;
$where['list_service_type_searchor']['list_service_type55_next_level'] = $list_service_type55;
$where['company_id'] = $session['company_id'];
$res = SettlementService::getSettlementList($where,['id','all_price','subsidy_money','list_service_type','wat_judge','order_num','p_id','msg_id']);
/*-----------------------------------------------拼接条件获取满足的结算单数据结束-----------------------------------*/
if ($res){
......
app/Http/Controllers/Orders/AotuorderController.php
浏览文件 @ 625b75eb
......@@ -143,19 +143,20 @@ class AotuorderController extends BaseController
$data['code']='2';
if($data['code']=='1'){
}else{
if($sheng == '江苏' || $sheng == '江苏省'){
if($sheng == '江苏' || $sheng == '江苏省' || $sheng == '上海' || $sheng == '上海市'){
$where = ' and (admin_groupnew=3 or (admin_groupnew=2 and company_type=2))';
}else{
$where = ' and admin_groupnew=2 and company_type=1 and company_id='.$order['company_id'];
if($order['company_id']==14){
$where = $where." or admin.id in (91)";
$where = ' and ((admin_groupnew=2 and company_type=1 and company_id='.$order['company_id'].') or id in (91))';
}else{
$where = ' and admin_groupnew=2 and company_type=1 and company_id='.$order['company_id'];
}
}
if(empty($or_ser_id)) {
if ($xian == 1) {
CommonService::startmysql();
$ser = Bserviss::leftJoin('admin','admin.id','=','bservisnew.bs_serid')->whereRaw("find_in_set('" . $dress['are_id'] . "',bs_areid) and bs_branid='" . $goodid . "' and bs_status='1' and enable=1".$where)->select('bservisnew.*','admin_groupnew')->get()->toArray();
CommonService::addLog('自动拒单', CommonService::showmysql(), '','AotuorderController');
CommonService::addLog('自动派单', CommonService::showmysql(), $sys_num,'AotuorderController');
if (!$ser) {
$ser = Bserviss::leftJoin('admin','admin.id','=','bservisnew.bs_serid')->whereRaw("bs_sid='" . $dress['are_sid'] . "' and bs_branid='" . $goodid . "' and bs_status='1' and enable=1".$where)->select('bservisnew.*','admin_groupnew')->get()->toArray();
$xian = 2;
......@@ -163,7 +164,7 @@ class AotuorderController extends BaseController
} else {
CommonService::startmysql();
$ser = Bserviss::leftJoin('admin','admin.id','=','bservisnew.bs_serid')->whereRaw("bs_sid='" . $dress['are_sid'] . "' and bs_branid='" . $goodid . "' and bs_status='1' and enable=1".$where)->select('bservisnew.*','admin_groupnew')->get()->toArray();
CommonService::addLog('自动拒单', CommonService::showmysql(), '','AotuorderController');
CommonService::addLog('自动派单', CommonService::showmysql(), $sys_num,'AotuorderController');
}
}else{
if ($xian == 1) {
......@@ -582,7 +583,7 @@ class AotuorderController extends BaseController
/***************半径推送******************************/
$get['company_id'] = $orderinfo['company_id'];//支付方式
if($ser_data['admin_groupnew']==3){
if($ser_data['admin_groupnew']==3 && !in_array($orderinfo['company_id'],[14])){
$get['ol_distype'] = 4;//系统派单类型
}else{
$get['ol_distype'] = 2;//系统派单类型
......
app/Http/Controllers/Orders/OrderListController.php
浏览文件 @ 625b75eb
......@@ -144,7 +144,7 @@ class OrderListController extends BaseController
$session_token = $request->get('session_token');
if (!in_array($session_token['admin_groupnew'], [2,3,7,8])){//管理员可以看全部
if (!in_array($session_token['admin_groupnew'], [2,3,4,7,8])){//管理员可以看全部
$where.=" and company_id='".$session_token['company_id']."'";
}
if (in_array($session_token['admin_groupnew'], [2,3,8])){//管理员可以看全部
......
app/Http/Controllers/User/AdminsController.php
浏览文件 @ 625b75eb
......@@ -180,6 +180,7 @@ class AdminsController extends BaseController
$find_data = DB::table('admin')
->where('company_id', $admins['company_id'])
->where('admin_groupnew', "!=" ,2)
->count();
if ($find_data >= 5) {
return $this->error('添加数量超出限制', ErrorInc::MYSQL_FAILED, []);
......
app/Services/Api/MobileWeb/LoginService.php
浏览文件 @ 625b75eb
......@@ -43,7 +43,7 @@ class LoginService
->leftJoin('admin_infor as adin', 'adin.admin_id', '=', 'adm.id')
->where('admin_acc', $request['account'])
->where('company_id', $company_id)
->whereIn('admin_groupnew', [2,3])
->whereIn('admin_groupnew', [2,3,4])
->where('admin_password', $password)
->select('adm.id', 'admin_acc as check_code', 'admin_name as install_name', 'phone as install_phone', 'enable as install_is_type', 'adm.id as admin_id','admin_groupnew','company_id')
->first();
......
app/Services/Api/MobileWeb/OrderListService.php
浏览文件 @ 625b75eb
......@@ -151,10 +151,10 @@ class OrderListService extends Model
$list_items[$key]['button'][] = ['action'=>'copyInfo','name'=>'复制信息'];
}else {
if($session['user_type']==3 && $value['ser_id']==$session['admin_id']){
$list_items[$key]['button'][] = ['action'=>'sendAgain','name'=>'指派门店'];
}
if ($request['stauas'] == 2) {
if($session['user_type']==3 && $value['ser_id']==$session['admin_id']){
$list_items[$key]['button'][] = ['action'=>'sendAgain','name'=>'指派门店'];
}
if ($session['user_type'] != 1) {
$list_items[$key]['button'][] = ['action' => 'transferOfOrder', 'name' => '改派'];
}
......@@ -862,6 +862,10 @@ class OrderListService extends Model
$data['button'][] = ['action' => 'contact', 'name' => '预约时间'];
}
}
if($session['user_type']==3 && $orderListArr['ser_id']==$session['admin_id']){
$data['button'][] = ['action'=>'sendAgain','name'=>'指派门店'];
}
}
if ($request['stauas'] == 3) {
if (isset($installLine)) {
......@@ -891,9 +895,6 @@ class OrderListService extends Model
$data['button'][] = ['action' => 'contact', 'name' => '预约时间'];
}
}
if($session['user_type']==3 && $orderListArr['ser_id']==$session['admin_id']){
$data['button'][] = ['action'=>'sendAgain','name'=>'指派门店'];
}
$data['button'][] = ['action' => 'copyInfo', 'name' => '复制信息'];
}
}elseif($orderListArr['stauas'] == 34 || $orderListArr['stauas'] == 40){
......@@ -1051,7 +1052,7 @@ class OrderListService extends Model
$arr['feedback_pic'] = $streamFilename;
$arr['install_time'] = date("Y-m-d H:i:s");
$arr['type_name'] = self::getPicName($request['type']);//'1';
$res = Feedback::where('type',$request['type'])->update($arr);
$res = Feedback::where('type',$request['type'])->where('gl_id',$orderListArr['id'])->update($arr);
$typename = '编辑';
}else {
$resu = Admin::where("id", $orderListArr['ser_id'])->first();
......@@ -1405,7 +1406,7 @@ class OrderListService extends Model
$input['shi'] = $request['shi'];
$input['xian'] = $request['xian'];
$input['address'] = $request['address'];
$data = OrderService::getService($input,$session);
$data = OrderService::getService($input);
return $data;
}else {
$list = Admin::whereIn('admin_groupnew', [2, 3])
......
app/Services/Api/MobileWeb/StatementsListService.php
浏览文件 @ 625b75eb
......@@ -60,7 +60,7 @@ class StatementsListService extends Model
}
$list_data = $list_data->where('list_service_type', 40)
->whereIn('sett_status', [1,60,63])
->select('s.id','s.sys_num', 's.create_time', 'all_price', 'list_id', 'om.goods_name', 'om.goods_num', 'o.id as wor_id', 'o.stauas as wor_state')
->select('s.id','s.order_num as sys_num', 's.create_time', 'all_price', 'list_id', 'om.goods_name', 'om.goods_num', 'o.id as wor_id', 'o.stauas as wor_state')
->paginate($show_count);
$page['count'] = 0;
$page['page'] = 0;
......@@ -102,7 +102,7 @@ class StatementsListService extends Model
$list_data = DB::table('statements_list as sl')
->leftJoin('company as c', 'c.com_id', '=', 'sl.company_id')
->where('stl_serid', $session['admin_id'])
// ->where('stl_type', '!=', 4)
->where('stl_type', '!=', 4)
->select('stl_wat', 'stl_type', 'com_name', 'stl_startime', 'stl_endtime', 'stl_money', 'stl_id')
->orderByRaw("stl_type asc,stl_endtime desc")
->paginate($show_count);
......@@ -201,7 +201,7 @@ class StatementsListService extends Model
->leftJoin('order_msg as om', 'om.id', '=', 'o.order_goods_id')
->where('s.ser_id', $session['admin_id'])
->where('wat_num', $data['stl_wat'])
->select('s.id','s.sys_num', 's.create_time', 'all_price', 'list_id', 'om.goods_name', 'om.goods_num')
->select('s.id','s.sys_num', 's.create_time', 'all_price', 's.order_num as list_id', 'om.goods_name', 'om.goods_num')
->get();
$data['info_data'] = $info_data;
return ['ErrorCode' => 1, 'ErrorMessage' => '成功', 'Data' => $data];
......
app/Services/DataStatisticsService.php 0 → 100644
浏览文件 @ 625b75eb
差异被折叠。
app/Services/OrderDeductionFeeService.php
浏览文件 @ 625b75eb
......@@ -52,7 +52,7 @@ class OrderDeductionFeeService extends Service
public static function deductFee($data) {
$find_recharge_order = DB::table('recharge_order')
->where('reo_order_number', $data['order_number'])
->where('reo_pay_state', 1)
->where('reo_pay_state', 2)
->first();
if (!empty($find_recharge_order)) {
return ['code'=>200, 'msg'=>'操作成功'];
......
app/Services/OrderListService.php
浏览文件 @ 625b75eb
......@@ -568,7 +568,7 @@ class OrderListService extends Service
}
// }
if (!in_array($session['admin_groupnew'], [2,3,7,8])){//管理员可以看全部
if (!in_array($session['admin_groupnew'], [2,3,4,7,8])){//管理员可以看全部
$where['gone_order_list.company_id'] = $session['company_id'];
}
if (in_array($session['admin_groupnew'], [8])){//管理员可以看全部
......@@ -593,6 +593,7 @@ class OrderListService extends Service
->orderBy('create_time','ASC')->paginate($page_size);
//print_r(DB::getQueryLog());
//导出所需语句
$data['where'] = $where;
$data['sqls'] = DB::getQueryLog()[1];
$data['show_Menu'] = [
['show_name'=>"全部",'status'=>'1','show_num'=>'--'],
......@@ -600,8 +601,8 @@ class OrderListService extends Service
['show_name'=>"安装中",'status'=>'3','show_num'=>'--'],
//['show_name'=>"延期订单",'status'=>'4','show_num'=>'--'],
['show_name'=>"待完成",'status'=>'5','show_num'=>'--'],
['show_name'=>"延期审图",'status'=>'9','show_num'=>"--"],
['show_name'=>"延期结算",'status'=>'10','show_num'=>"--"],
// ['show_name'=>"延期审图",'status'=>'9','show_num'=>"--"],
// ['show_name'=>"延期结算",'status'=>'10','show_num'=>"--"],
['show_name'=>"已完成",'status'=>'6','show_num'=>'--'],
//['show_name'=>"未预约",'status'=>'7','show_num'=>"--"],
//['show_name'=>"超时",'status'=>'8','show_num'=>"--"],
......
app/Services/OrderService.php
浏览文件 @ 625b75eb
......@@ -1646,9 +1646,22 @@ class OrderService extends Service
}
if ($session && $session['admin_groupnew'] != 7) {//管理员可以看全部
$where['company_id'] = $session['company_id']; //2022-11-3 获取服务商可不用分公司
$where['company_type'] = 1;
$where['admin_groupnew'] = 2;
// $where['company_id'] = $session['company_id']; //2022-11-3 获取服务商可不用分公司
// $where['company_type'] = 1;
// $where['admin_groupnew'] = 2;
if($session['company_id']==14){
$wherecompany1['company_id'] = $session['company_id'];
$wherecompany1['company_type'] = 1;
$wherecompany1['admin_groupnew'] = 2;
$wherecompany2['id_searchin'] = [91,101];
$where['wherecompany_searchor']['wherecompany1_next_level'] = $wherecompany1;
$where['wherecompany_searchor']['wherecompany2_next_level'] = $wherecompany2;
}else {
$where['company_id'] = $session['company_id'];
$where['company_type'] = 1;
$where['admin_groupnew'] = 2;
}
}
$list = AdminsService::getAdmins($where,['id','company_name','is_lidao','owner','children_id','ad_brand','ad_project','brand_service'],['is_sord'=>'DESC']);
......@@ -1798,9 +1811,18 @@ class OrderService extends Service
}
if ($session && $session['admin_groupnew'] != 7) {//管理员可以看全部
$where['company_id'] = $session['company_id'];
$where['company_type'] = 1;
$where['admin_groupnew'] = 2;
if($session['company_id']==14){
$wherecompany1['company_id'] = $session['company_id'];
$wherecompany1['company_type'] = 1;
$wherecompany1['admin_groupnew'] = 2;
$wherecompany2['id_searchin'] = [91,101];
$where['wherecompany_searchor']['wherecompany1_next_level'] = $wherecompany1;
$where['wherecompany_searchor']['wherecompany2_next_level'] = $wherecompany2;
}else {
$where['company_id'] = $session['company_id'];
$where['company_type'] = 1;
$where['admin_groupnew'] = 2;
}
}
CommonService::startmysql();
$list = AdminsService::getAdmins($where,['id','company_name','is_lidao','owner','children_id','ad_brand','ad_project','brand_service'],['is_sord'=>'DESC']);
......
app/Services/OrderaddService.php
浏览文件 @ 625b75eb
......@@ -132,8 +132,8 @@ class OrderaddService extends Service{
$num = $num + 1;
}
}else{
$orderMsgData['goods_price'] = $new_money;//实收/商品单价
$orderMsgData['goods_paid'] = $new_money;//应收
$orderMsgData['goods_price'] = $value['goods_price']*$value['goods_num'];//实收/商品单价
$orderMsgData['goods_paid'] = $value['goods_price']*$value['goods_num'];//应收
$orderMsgData['goods_num'] = $value['goods_num'];
$newOrderId = OrderMsg::insert($orderMsgData);
if(!$newOrderId){
......
composer.json
浏览文件 @ 625b75eb
......@@ -14,6 +14,7 @@
"laravel/framework": "5.5.*",
"laravel/tinker": "~1.0",
"maatwebsite/excel": "~2.1.0",
"phpoffice/phpspreadsheet": "^1.25",
"predis/predis": "^1.1"
},
"require-dev": {
......@@ -64,7 +65,11 @@
"preferred-install": "dist",
"sort-packages": true,
"optimize-autoloader": true,
"secure-http": false
"secure-http": false,
"allow-plugins": {
"kylekatarnls/update-helper": true,
"symfony/thanks": true
}
},
"minimum-stability": "dev",
"prefer-stable": true,
......
routes/api.php
浏览文件 @ 625b75eb
......@@ -989,7 +989,10 @@ Route::group(
Route::post('uploadExcelImport','PtPhistoryController@uploadExcelImport');//回传平台账单数据
});
//2024-10-17
Route::group(['prefix'=>'DataStatistics','middleware'=>'requestpc'],function(){
Route::post('index','DataStatisticsController@index');//列表
});
});
Route::group(
['namespace' => 'Financial'],function(){
......@@ -1143,7 +1146,7 @@ Route::group(
});
#平台服务 >> 京东自营订单
Route::group(['prefix'=>'SynJdSelfDataNew'], function (){
Route::get('addOrderData', 'SynJdSelfDataNewController@addOrderData');//添加京东
Route::get('addOrderData', 'SynJdSelfDataNewController@addOrderData');//添加京东
Route::get('decOrder', 'SynJdSelfDataNewController@decOrder');//定时解密
Route::get('getSelfRefund', 'SynJdSelfDataNewController@getSelfRefund');//定时解密
});
......@@ -1157,7 +1160,12 @@ Route::group(
});
#系统任务 >> 电话通知
Route::group(['prefix'=>'getCallByTtsCost'], function (){
Route::get('getCallByTtsCost', 'SysCallByTtsCostController@getCallByTtsCost');//电话通知扣费
Route::get('getCallByTtsCost', 'SysCallByTtsCostController@getCallByTtsCost');//电弧通知扣费
});
//京东定单同步状态
Route::group(['prefix'=>'jdOrderApi'], function (){
Route::get('getOrderByJd', 'JdOrderApiController@getOrderByJd');//获取京东社会化门店订单
Route::get('getOrderCancelAuditList', 'JdOrderApiController@getOrderCancelAuditList');//获取社会化门店获取退款单
});
#天猫服务单
/* Route::group(['prefix'=>'tmOrder'], function (){
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论