Skip to content

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

edit

上级 96b931de
显示空白字符变更
内嵌 并排
正在显示 包含 232 行增加 和 24 行删除
app/Http/Controllers/Api/SynOrderRejectedController.php
浏览文件 @ 1c6cea96
......@@ -73,7 +73,8 @@ class SynOrderRejectedController extends BaseController
$weixin['order_num'] = $orderListArr['order_num'];
$weixin['goods_name'] = '超时未接单';//$v['goods_name'];
$weixin['serial_number'] = $orderListArr['serial_number'];
CommonService::requestPost('http://zptzchat.bluearp.com/m/index.php/BindingAccount/push_order_rejected', $weixin);
// CommonService::requestPost('http://zptzchat.bluearp.com/m/index.php/BindingAccount/push_order_rejected', $weixin);
CommonService::push_order_rejected($weixin);
$info = $Autom->Distrib($v['sys_num'], '127.0.0.1');
$num++;
} else {
......
app/Http/Controllers/BaseController.php
浏览文件 @ 1c6cea96
......@@ -312,7 +312,7 @@ class BaseController extends Controller
$pt_id_arr = PlatformService::getPtIdByPtType();
// if($pt_id == '453')
if(in_array($pt_id, $pt_id_arr)){
return 'http://zptzchat.bluearp.com/';
return 'http://jdh.bluearp.com/';
}else {
if ($type == 3) {
return 'http://jx.bluearp.com/o/';
......
app/Http/Controllers/Common/CommonController.php
浏览文件 @ 1c6cea96
......@@ -391,9 +391,9 @@ class CommonController extends BaseController
// 重置数组键名
$com_parent_id = array_values($com_parent_id);
}
$parameter['company_id_searchin'] = $com_parent_id;
$company_id_type1['company_id_searchin'] = $com_parent_id;
}else{
$parameter['company_id'] = $session['company_id'];
$company_id_type1['company_id'] = $session['company_id'];
}
}
$Pri_id = $parameter['Pri_id'];
......@@ -405,20 +405,26 @@ class CommonController extends BaseController
switch ( $type )
{
case 1:
foreach($company_id_type1 as $k => $v){
$parameter[$k] = $v;
}
$parameter['admin_groupnew_noteq'] = 2;
$list = AdminsService::getAdmins($parameter,['id','admin_acc']);//,['ptid'=>'desc','admin_groupnew'=>'asc']
break;
case 2:
if($parameter['company_name_like']!='统一价格') {
$parameter['admin_groupnew_searchin'] = [2,3];
$list = AdminsService::getAdmins($parameter, ['id', 'company_name'], []);
if($Pri_id !=86) {
$company_id_type1['admin_groupnew'] = 2;
$company_id_type2['admin_groupnew'] = 3;
$parameter['company_id_type_searchor']['company_id_type1_next_level'] = $company_id_type1;
$parameter['company_id_type_searchor']['company_id_type2_next_level'] = $company_id_type2;
$list = AdminsService::getAdmins($parameter, ['id', 'company_name'], ['admin_groupnew'=>'DESC','id'=>'ASC']);
if(!in_array($Pri_id, [86,136])) {
$lists[0]['id'] = '0';
$lists[0]['company_name'] = '统一价格';
$list = array_merge($list, $lists);
}
}else{
if($Pri_id ==86) {
if(in_array($Pri_id, [86,136])) {
$list = [];
}else {
$list[0]['id'] = '0';
......
app/Http/Controllers/Financial/SettlementController.php
浏览文件 @ 1c6cea96
......@@ -12,6 +12,7 @@
namespace App\Http\Controllers\Financial;
use App\Http\Controllers\BaseController;
use App\Models\Admin;
use App\Models\OrderList;
use App\Models\OrderMsg;
use App\Models\Orders;
......@@ -174,8 +175,33 @@ class SettlementController extends BaseController{
if($input['start_time']>$input['end_time']){
return $this->error('开始时间不能大于结束时间', ErrorInc::FAILED_PARAM);
}
$res = SettlementService::getSettlementList(['ser_id'=>$input['stl_serid'],'sett_status'=>63,'category'=>$input['category']]);
$admin = Admin::where('id',$input['stl_serid'])->select('admin_groupnew','company_id')->first();
if($admin['admin_groupnew']==3){
$stl_serid = Admin::where('company_id',$admin['company_id'])->whereIn('admin_groupnew',[2,3])->select('id')->get();
$stl_serid = CommonService::dataToArray($stl_serid);
$stl_serid = array_column($stl_serid, 'id');//
$where['ser_id_searchin'] = $stl_serid;
}else {
$where['ser_id'] = $input['stl_serid'];
}
if($input['category'] == 1){
$where['category_searchin'] = [1,2];
}else {
$where['category'] = $input['category'];
}
$where['sett_status'] = 63;
$wat_num['wat_num'] = "";
$wat_num['wat_num_isnull'] = "";
$where['wat_num_searchor'] = $wat_num;
// $list_service_type40['setfeeds_time_searcheqlt'] = $input['end_time']." 23:59:59";
$list_service_type40['list_service_type'] = 40;
$list_service_type40['locksel_type'] = 1;
$list_service_type40['locked'] = 1;
// $list_service_type55['create_time_searcheqlt'] = $input['end_time']." 23:59:59";
$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;
$res = SettlementService::getSettlementList($where);
if ($res){
$input['source'] = 2;
$return = StatementsListService::creactSettle($res, $request->ip(), $session, $input);
......
app/Http/Controllers/Financial/StatementsListController.php
浏览文件 @ 1c6cea96
......@@ -246,7 +246,15 @@ class StatementsListController extends BaseController{
return $this->error('该时间段已存在'.$company_name.'的订单', ErrorInc::REPEAT_SUBMIT);exit;
}
/*-----------------------------------------------拼接条件获取满足的结算单数据开始-----------------------------------*/
$admin = Admin::where('id',$input['stl_serid'])->select('admin_groupnew','company_id')->first();
if($admin['admin_groupnew']==3){
$stl_serid = Admin::where('company_id',$admin['company_id'])->whereIn('admin_groupnew',[2,3])->select('id')->get();
$stl_serid = CommonService::dataToArray($stl_serid);
$stl_serid = array_column($stl_serid, 'id');//
$where['ser_id_searchin'] = $stl_serid;
}else {
$where['ser_id'] = $input['stl_serid'];
}
if($input['category'] == 1){
$where['category_searchin'] = [1,2];
}else {
......@@ -257,7 +265,6 @@ class StatementsListController extends BaseController{
$wat_num['wat_num_isnull'] = "";
$where['wat_num_searchor'] = $wat_num;
$where['sett_status'] = 1;
if($input['stl_serid']!='1695'){
$list_service_type40['setfeeds_time_searcheqlt'] = $input['end_time']." 23:59:59";
$list_service_type40['list_service_type'] = 40;
$list_service_type40['locksel_type'] = 1;
......@@ -266,10 +273,6 @@ 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;
}else{
$where['create_time_searcheqlt'] = $input['end_time']." 23:59:59";
$where['list_service_type_searcheqlt'] = 40;
}
$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
浏览文件 @ 1c6cea96
......@@ -592,9 +592,9 @@ class AotuorderController extends BaseController
$weixin['goods_name'] = '安装服务';//$v['goods_name'];
$weixin['serial_number'] = $number;
$weixin['dress'] = $shr_phone['shr_sheng'].$shr_phone['shr_shi'].$shr_phone['shr_xian'].$shr_phone['shr_adress'];
CommonService::requestPost('http://zptzchat.bluearp.com/m/index.php/BindingAccount/push_order', $weixin);
// CommonService::requestPost('http://zptzchat.bluearp.com/m/index.php/BindingAccount/push_order', $weixin);
//$ordestatu=M()->execute("update gone_order_status set st_one=st_one+1 where st_serid='".$ser_id."'");
CommonService::push_order($weixin);
$relation['sys_num'] = $sys_num;//系统单号
$relation['order_num'] = $orderinfo['order_num'];//平台单号
$relation['serial_number'] = $number;//派工单号
......
app/Http/Middleware/RequestPcMiddleware.php
浏览文件 @ 1c6cea96
......@@ -30,8 +30,8 @@ class RequestPcMiddleware
}catch(\Exception $e){
return response()->json(['Data'=>'','ErrorCode'=>1001,'ErrorMessage'=>'token缺少必要授权参数，请联系管理员']);
}
if (!$request->filled('Pri_id') || !$request->filled('Login_id') || !$request->filled('token')){
return response()->json(['Data'=>'','ErrorCode'=>1001,'ErrorMessage'=>'缺少必要参数1，请联系管理员']);
if ((!$request->filled('Pri_id') && $controller != 'api/tips') || !$request->filled('Login_id') || !$request->filled('token')){
return response()->json(['Data'=>'','ErrorCode'=>1001,'ErrorMessage'=>'缺少必要参数1，请联系管理员'.$controller]);
}
//验证系统占用字段
if ($request->has('session_token')){
......
app/Services/Api/MobileWeb/AftersaleOrderService.php
浏览文件 @ 1c6cea96
......@@ -619,7 +619,8 @@ class AftersaleOrderService extends Model
$weixin['goods_name'] = '安装服务';//$v['goods_name'];
$weixin['serial_number'] = $orderListArr['serial_number'];
$weixin['install_type'] = 2;
CommonService::requestPost('http://zptzchat.bluearp.com/m/index.php/BindingAccount/push_order', $weixin);
// CommonService::requestPost('http://zptzchat.bluearp.com/m/index.php/BindingAccount/push_order', $weixin);
CommonService::push_order($weixin);
//begin Dong
$company_name = Admin::where('id',$orderListArr['ser_id'])->select("admin_acc","company_name","reward")->first();//服务中心名称
$douId = SettlementList::where('list_id',$orderListArr['serial_number'])->value('id');
......
app/Services/Api/MobileWeb/OrderListService.php
浏览文件 @ 1c6cea96
......@@ -484,7 +484,8 @@ class OrderListService extends Model
$weixin['goods_name'] = '安装服务';//$v['goods_name'];
$weixin['serial_number'] = $orderListArr['serial_number'];
$weixin['install_type'] = 2;
CommonService::requestPost('http://zptzchat.bluearp.com/m/index.php/BindingAccount/push_order', $weixin);
// CommonService::requestPost('http://zptzchat.bluearp.com/m/index.php/BindingAccount/push_order', $weixin);
CommonService::push_order($weixin);
//begin Dong
$company_name = Admin::where('id',$orderListArr['ser_id'])->select("admin_acc","company_name","reward")->first();//服务中心名称
$douId = SettlementList::where('list_id',$orderListArr['serial_number'])->value('id');
......
app/Services/CommonService.php
浏览文件 @ 1c6cea96
......@@ -1560,4 +1560,169 @@ class CommonService extends Service{
return 2;
}
}
/**|---------------------------------------------------------------------------------
* @name 推送微信通知
* @param string ju_ordernum 订单单号
* @retrun \Illuminate\Http\JsonResponse /multitype:array
* @author dou 2024/9/22 17:09
* |---------------------------------------------------------------------------------
*/
public static function push_order ( $input ){
$ser_id=$input['ser_id'];
$good=$input['goods_name'];
$serial_number=$input['serial_number'];
if(isset($input['install_type']) && $input['install_type']==2){
$master = DB::table("ser_master")
->where('ser_id',$ser_id)
->where('type',2)
->where('is_delet',1)
->select('wechat_number')
->get();
}else {
$master = DB::table("ser_master")
->where('ser_id',$ser_id)
->where('type',1)
->where('is_delet',1)
->select('wechat_number')
->get();
}
if($master){
$master = CommonService::dataToArray($master);
$access_token= RedisService::redisGet('access_token_saas');
if($access_token){
$obj['access_token']=$access_token;
}else {
$url = 'https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=wxf457f42f874c3545&secret=62c5530f13e8b88204818c8b98d3a5b6';//生产环境
$arrContextOptions=array(
"ssl"=>array(
"verify_peer"=>false,
"verify_peer_name"=>false,
),
);
$output = file_get_contents($url, false, stream_context_create($arrContextOptions));//运行curl
$obj = json_decode($output, true);
if($obj['access_token']){
RedisService::redisSet('access_token_saas', $obj['access_token'],'6480');
}
}
//dump($obj);
if($obj['access_token']){
$url="https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=".$obj['access_token'];
$poss['template_id']="e4p_3KYl6xU25pxonkkSzfCklrg9K1QV5-bkdSu8JiM";
if(isset($input['install_type']) && $input['install_type']==2){
$poss['url'] = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxf457f42f874c3545&redirect_uri=http://jdh.bluearp.com/mobileWeb&response_type=code&scope=snsapi_base&state=InstallOrder&connect_redirect=1#wechat_redirect";
}else {
$poss['url'] = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxf457f42f874c3545&redirect_uri=http://jdh.bluearp.com/mobileWeb&response_type=code&scope=snsapi_base&state=OrderTaking&connect_redirect=1#wechat_redirect";
}
$data['character_string10']['value']=$input['order_num'];
$data['thing5']['value']=$input['goods_name'];
$data['time13']['value']=date("Y-m-d H:i:s");
//$data['thing19']['value']=$input['dress'];
//$data['const11']['value']='新订单';
$poss['data']=$data;
foreach( $master as $k => $v )
{
$poss['touser']=$v['wechat_number'];
$res = CommonService::requestPost($url, json_encode($poss));
$insert['wps_number']=$serial_number;
$insert['wps_ordernum']=$input['order_num'];
$insert['wps_serid']=$ser_id;
$insert['wps_goodsname']=$good;
$insert['wps_openid']=$v['wechat_number'];
$insert['wps_weixindata']=$res;
$insert['wps_creactime']=date("Y-m-d H:i:s");
DB::table("weixin_push")->insert($insert);
}
return true;
}else{
$data['wps_number']=$serial_number;
$data['wps_ordernum']=$input['order_num'];
$data['wps_serid']=$ser_id;
$data['wps_goodsname']=$good;
$data['wps_weixindata']='获取授权失败：'.json_encode($obj);
$data['wps_creactime']=date("Y-m-d H:i:s");
DB::table("weixin_push")->insert($data);
return false;
}
}else{
$data['wps_number']=$serial_number;
$data['wps_ordernum']=$input['order_num'];
$data['wps_serid']=$ser_id;
$data['wps_goodsname']=$good;
$data['wps_weixindata']='无绑定微信';
$data['wps_creactime']=date("Y-m-d H:i:s");
DB::table("weixin_push")->insert($data);
return true;
}
}
//发送取消订单通知
public static function push_order_rejected ( $input ){
$ser_id=$input['ser_id'];
$good=$input['goods_name'];
$serial_number=$input['serial_number'];
$master = DB::table("ser_master")
->where('ser_id',$ser_id)
->where('type',1)
->where('is_delet',1)
->select('wechat_number')
->get();
if($master){
$master = CommonService::dataToArray($master);
$access_token= RedisService::redisGet('access_token_saas');
if($access_token && $_GET['type']=='1'){
$obj['access_token']=$access_token;
}else {
$url = 'https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=wxf457f42f874c3545&secret=62c5530f13e8b88204818c8b98d3a5b6';//生产环境
$arrContextOptions=array(
"ssl"=>array(
"verify_peer"=>false,
"verify_peer_name"=>false,
),
);
$output = file_get_contents($url, false, stream_context_create($arrContextOptions));//运行curl
$obj = json_decode($output, true);
if($obj['access_token']){
RedisService::redisSet('access_token_saas', $obj['access_token'],'6480');
}
}
//dump($obj);
if($obj['access_token']){
$url="https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=".$obj['access_token'];
$poss['template_id']="dI9VEYuMBzkKBBUXy7-8ygArrnnnGk-NoFyCGsRyehg";
$data['character_string1']['value']=$input['order_num'];
$data['const2']['value']=$input['goods_name'];
$data['time3']['value']=date("Y-m-d H:i:s");
//$data['const11']['value']='新订单';
$poss['data']=$data;
foreach( $master as $k => $v )
{
$poss['touser']=$v['wechat_number'];
$res=CommonService::requestPost($url, json_encode($poss));
$data['wps_number']=$serial_number;
$data['wps_ordernum']=$input['order_num'];
$data['wps_serid']=$ser_id;
$data['wps_goodsname']=$good;
$data['wps_openid']=$v['wechat_number'];
$data['wps_weixindata']=$res;
$data['wps_creactime']=date("Y-m-d H:i:s");
DB::table("weixin_push")->insert($data);
return true;
}
}else{
return false;
}
}else{
$data['wps_number']=$serial_number;
$data['wps_ordernum']=$input['order_num'];
$data['wps_serid']=$ser_id;
$data['wps_goodsname']=$good;
$data['wps_weixindata']='无绑定微信';
$data['wps_creactime']=date("Y-m-d H:i:s");
DB::table("weixin_push")->insert($data);
return true;
}
}
}
app/Services/OrderService.php
浏览文件 @ 1c6cea96
......@@ -1229,7 +1229,8 @@ class OrderService extends Service
$weixin['serial_number'] = $number;
$weixin['dress'] = $shr_phone['shr_sheng'].$shr_phone['shr_shi'].$shr_phone['shr_xian'].$shr_phone['shr_adress'];
CommonService::requestPost('http://zptzchat.bluearp.com/m/index.php/BindingAccount/push_order', $weixin);
// CommonService::requestPost('http://zptzchat.bluearp.com/m/index.php/BindingAccount/push_order', $weixin);
CommonService::push_order($weixin);
/*--------------------------添加订单执行统计记录开始------------------------------------*/
$relation['sys_num'] = $input['sys_num'];//系统单号
......
app/Services/RedisService.php
浏览文件 @ 1c6cea96
......@@ -43,13 +43,17 @@ class RedisService extends Service
* @return \Illuminate\Http\JsonResponse
* |--------------------------------------------------------------------
*/
public static function redisSet ( $key , $value )
public static function redisSet ( $key , $value , $seconds ='' )
{
try{
if(is_array($value)){
$value = json_encode($value);
}
return Redis::set($key,$value);
if($seconds) {
return Redis::set($key, $value, 'EX', $seconds);
}else {
return Redis::set($key, $value, '6480');
}
}catch(\Exception $e){
return false;
}
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论