Skip to content

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

edit

上级 ceb79d04
显示空白字符变更
内嵌 并排
正在显示 包含 70 行增加 和 109 行删除
app/Console/Commands/SynJdOrderApi.php
浏览文件 @ 16cf9ec1
......@@ -12,14 +12,14 @@ class SynJdOrderApi extends Command
*
* @var string
*/
protected $signature = 'getOrder';
protected $signature = 'SynJdOrderApi';
/**
* The console command description.
*
* @var string
*/
protected $description = 'Command getJdOrder';
protected $description = 'Command SynJdOrderApi';
/**
* Create a new command instance.
......
app/Http/Controllers/Api/SynJdPopDataController.php
浏览文件 @ 16cf9ec1
......@@ -31,22 +31,15 @@ class SynJdPopDataController extends BaseController
* @date 2022/4/27
*/
public function addOrderData (){
/* $str = "AAQLAodRrJ360+b6qYevz+HgyXHUehSiWki+A9YqUJVvonqI1G8rNALcCZYF9eo5A5M=";
$data['accessToken'] = 'e0a1c90e617f4b3a9865ed059f99c5f42ztb';
$data['appKey'] = '41D9668E8CB81C9890A065BEC300FD84';
$data['appSecret'] = '93bff142bf5c4422ae7bec9eb992e751';
return $this->decrypt($data,$str);
exit;*/
$url = "http://116.196.75.172/index.php/GetOrder/index";
$url_ex = "http://116.196.75.172/index.php/GetOrder/syncExpress";//出库
$time_start = date("Y-m-d H:i:s",strtotime(" -10 minute".date("Y-m-d")));
$time_start = date("Y-m-d H:i:s",strtotime(" -720 minute".date("Y-m-d H:i:s")));
$time_end = date("Y-m-d H:i:s");
$goods = DB::table('pj_goods')->select('pg_id','brand_name','pg_series','version','goods_pic_path','national_version')->get()->toarray();
$goods = CommonService::jointArrayKey($goods, 'pg_id');
$token = DB::table('jdpop_token')->where('status',1)->where('type',1)->select('app_key','app_secret','access_token','pt_id')->get()->toarray();
$token = DB::table('jdpop_token')->where('status',1)->where('type',1)->select('app_key','app_secret','access_token','pt_id','appName')->get()->toarray();
foreach ($token as $k =>$v){
// CommonService::addLog('token', json_encode($v['app_key']), $v['pt_id'],'jd_token');
......@@ -67,20 +60,46 @@ exit;*/
$res = $this->request_post($url,$res_ult[$k]);
$ip = $_SERVER["REMOTE_ADDR"];
CommonService::addLog('token1--'.$v['pt_id'], $res, $v['pt_id'],'JDPOP-all');
CommonService::addLog('token1--'.$v['pt_id'], $res, $v['pt_id'],'SynJdPopData-getOrder');
$data = json_decode($res,true);
if($data['jingdong_pop_order_enSearch_responce']['code']==0){
$order_data = $data['jingdong_pop_order_enSearch_responce']['searchorderinfo_result']['orderInfoList'];
//CommonService::addLog('token2', json_encode($order_data), $v['pt_id'],'jd_token');
// CommonService::addLog('原数据--'.$v['pt_id'], json_encode($order_data), 111,'JDPOP-原数据');
// dump($order_data);
if(!empty($order_data)){
$arr_goods = [];
$arr = [];
$num = 0;
foreach($order_data as $ksa => $vsa){
if(!empty($vsa['consigneeInfo']['oaid'])) {
$orderInfos[$num]['orderId'] = $vsa['orderId'];
$orderInfos[$num]['oaid'] = $vsa['consigneeInfo']['oaid'];
$num++;
}
}
if(!empty($orderInfos)){
$poss['appKey'] = $v['app_key'];
$poss['accessToken'] = $v['access_token'];
$poss['appSecret'] = $v['app_secret'];
$poss['orderType'] = 'POP';
$poss['appName'] = $v['appName'];
$poss['orderInfos'] = json_encode($orderInfos);
$user_data=$this->https_request('http://zptzchat.bluearp.com/m/index.php/GetUserDataApi/getOaidDecrypt',$poss);
$user_data = json_decode($user_data,true);
if($user_data['jingdong_jos_order_oaid_decrypt_responce']['returnType']['code']==200){
$user_data = $user_data['jingdong_jos_order_oaid_decrypt_responce']['returnType']['data'];
$user_datas = [];
foreach($user_data as $ks => $vs){
$user_datas[$vs['orderId']] = $vs;
}
if(!empty($user_datas)){
foreach($order_data as $ka => $va){
$order_data[$ka]['user_data_dou'] = isset($user_datas[$va['orderId']])?$user_datas[$va['orderId']]:'';
}
}
}
}
// CommonService::addLog('token3', json_encode($order_data), $v['pt_id'],'jd_token');
foreach ($order_data as $kk=>$vv) {
$order_info = OrderService::getOrderBy('order_num', $vv['orderId'],['id','order_status','lock_type','sys_num','order_num','p_id','ser_id','create_time','new_customer_id','lock_type','company_id']);
......@@ -135,7 +154,11 @@ exit;*/
}
//解密
if(isset($vv['user_data_dou'])){
$str = $vv['user_data_dou']['customerName'];
}else {
$str = $vv['consigneeInfo']['fullname'];
}
$datafullname['accessToken'] = $v['access_token'];//'e0a1c90e617f4b3a9865ed059f99c5f42ztb';
$datafullname['appKey'] = $v['app_key'];;//'41D9668E8CB81C9890A065BEC300FD84';
$datafullname['appSecret'] = $v['app_secret'];//'93bff142bf5c4422ae7bec9eb992e751';
......@@ -154,8 +177,12 @@ exit;*/
}
$fullname = $fullname??$vv['consigneeInfo']['fullname'];
$fullAddress = $this->decrypt($datafullname,$vv['consigneeInfo']['fullAddress'],$vv['orderId']);
if(isset($vv['user_data_dou'])){
$Address = $vv['user_data_dou']['address'];
}else {
$Address = $vv['consigneeInfo']['fullAddress'];
}
$fullAddress = $this->decrypt($datafullname,$Address,$vv['orderId']);
if(strpos($fullAddress,'<body>' )!==false){
//存另一数据库中
......@@ -253,8 +280,10 @@ exit;*/
// dump($return);
CommonService::addLog('添加定单', json_encode($return), $vv['orderId'],'jd_addOrder');
// $return['ErrorCode'] = 2;
if($return['ErrorCode']==1 && $v['pt_id']!=33){
if($return['ErrorCode']==1){
//调用京东出库
$res_ex = [];
$res_ex['appKey'] = $v['app_key']; //appkey
$res_ex['appSecret'] = $v['app_secret'];//secret
......@@ -267,8 +296,6 @@ exit;*/
$filename = 'pop_ex'.date('Ym');
CommonService::addLog('出库', json_encode($res_ex), $vv['orderId'],$filename);
// $result['code'] = 200;
$reta = json_decode($result,true);
if($reta['jingdong_pop_order_shipment_responce']['sopjosshipment_result']['success']==true){
CommonService::addLog('添单成功出库', $result, $vv['orderId'],$filename);
......@@ -284,7 +311,6 @@ exit;*/
if (!$newOrderId || $flag=='2'){
//echo '添加订单信息失败';
if(!$rea){
// $sqll .= "('".$vv['orderId']."','系统录入',".$v['pt_id'].",'".$vv['payType']."','".$vv['orderSellerPrice']."',".$vv['freightPrice'].",'WAIT_SELLER_STOCK_OUT','不需要开具发票','','".$vv['orderStartTime']."','".$vv['consigneeInfo']['fullname']."','".$tel."','".$vv['consigneeInfo']['mobile']."','".$vv['consigneeInfo']['province']."','".$vv['consigneeInfo']['city']."','".$vv['consigneeInfo']['county']."','".$vv['consigneeInfo']['fullAddress']."','".$vv['orderPayment']."','1','".$vv['parentOrderId']."'),";
if(in_array($vv['orderId'], array_column($arr, 'order_id'))){
unset($arr[$kk]);
}
......@@ -314,7 +340,6 @@ exit;*/
}else{
$reas = DB::table('jd_proprietary')->where("order_id",$vv['orderId'])->value('id');
if(!$reas){
// $sqll .= "('".$vv['orderId']."','系统录入',".$v['pt_id'].",'".$vv['payType']."','".$vv['orderSellerPrice']."',".$vv['freightPrice'].",'WAIT_SELLER_STOCK_OUT','不需要开具发票','','".$vv['orderStartTime']."','".$vv['consigneeInfo']['fullname']."','".$tel."','".$vv['consigneeInfo']['mobile']."','".$vv['consigneeInfo']['province']."','".$vv['consigneeInfo']['city']."','".$vv['consigneeInfo']['county']."','".$vv['consigneeInfo']['fullAddress']."','".$vv['orderPayment']."','2','".$vv['parentOrderId']."'),";
if(in_array($vv['orderId'], array_column($arr, 'order_id'))){
unset($arr[$kk]);
}
......@@ -344,27 +369,10 @@ exit;*/
}
}
}
/* if($sqll!='' && $sql_dgoods!=''){
$sqls = $sqlls.$sqll;//储存订单基本信息
$sqld = $sql1s.$sql_dgoods;//储存订单中的商品详情
$sqld = trim($sqld,",").";";
$sqls = trim($sqls,",").";";
DB::insert($sqls);
DB::insert($sqld);
}*/
/* if(!empty($arr_goods)){
DB::table('jdgoods')->insert($arr_goods);
}
if(!empty($arr)){
DB::table('jd_proprietary')->insert($arr);
}*/
echo '添加成功---';
}
}
echo '操作成功--****';
//return ['Data' => [], 'ErrorMessage' => '添加成功', 'ErrorCode' => ErrorInc::MYSQL_FAILED];
}
}
......@@ -376,14 +384,14 @@ exit;*/
* @date 2023/12/12
* @Time: 10:51
*/
public function changeTelphone($data){
public function changeTelphone($data){
// $result = $this->request_post($url,$data);
$url = 'jx.bluearp.com/m/index.php/Automatic/TzPopOrderGetPhone';
$ret = $this->request_post($url, $data);
$result = json_decode($ret,true);
CommonService::addLog('手机号', $result['jingdong_pop_order_getmobilelist_responce']["result"]["data"][$data['order_id']]['consMobilePhone'].'----'.$ret.'---'.json_encode($data).'---'.$url, $data['order_id'],'jd_mobile');
return $result['jingdong_pop_order_getmobilelist_responce']["result"]["data"][$data['order_id']]['consMobilePhone'];
}
}
/**
* @name 出库
......@@ -449,13 +457,6 @@ public function changeTelphone($data){
* @Time: 10:14
*/
public function decOrder(){
/* $str = "AAQLAodRrJ360+b6qYevz+HgyXHUehSiWki+A9YqUJVvonqI1G8rNALcCZYF9eo5A5M=";
$data['accessToken'] = 'e0a1c90e617f4b3a9865ed059f99c5f42ztb';
$data['appKey'] = '41D9668E8CB81C9890A065BEC300FD84';
$data['appSecret'] = '93bff142bf5c4422ae7bec9eb992e751';
return $this->decrypt($data,$str);
exit;*/
$token = DB::table('jdpop_token')->where('status',1)->select('app_key','app_secret','access_token','pt_id')->get()->toarray();
foreach ($token as $k =>$v) {
......@@ -471,30 +472,26 @@ public function changeTelphone($data){
if($list){
foreach ($list as $item) {
$user_id = Orders::where('order_num',$item['order_id'])->value('new_customer_id');
if(empty($user_id)){
DB::table('jdpop_encode')->where('order_id',$item['order_id'])->update(['is_enj'=>2]);
}else {
//解密
$fullname = $this->decrypt($res_ult[$k], $item['name_code'], $item['order_id']);
$fullname = $this->decrypt($res_ult[$k],$item['name_code'],$item['order_id']);
// echo $fullname;
if (strpos($fullname, '<body>') !== false) {
if(strpos($fullname,'<body>' )!==false){
} else {
}else{
//修改用户表
$res = User::where('id', $user_id)->update(['shr_name' => $fullname]);
$res = User::where('id',$user_id)->update(['shr_name'=>$fullname]);
}
$address = $this->decrypt($res_ult[$k], $item['address_code'], $item['order_id']);
if (strpos($address, '<body>') !== false) {
} else {
$address = $this->decrypt($res_ult[$k], $item['address_code'],$item['order_id']);
if(strpos($address,'<body>' )!==false){
}else{
//修改用户表
$ret = User::where('id', $user_id)->update(['shr_adress' => $address]);
$ret = User::where('id',$user_id)->update(['shr_adress'=>$address]);
}
if ($res && $ret) {
DB::table('jdpop_encode')->where('order_id', $item['order_id'])->update(['is_enj' => 2]);
if($res && $ret){
DB::table('jdpop_encode')->where('order_id',$item['order_id'])->update(['is_enj'=>2]);
}
CommonService::addLog('JD', $fullname . '--' . $address, $item['order_id'], 'JDPOP-dec');
}
CommonService::addLog('JD', $fullname.'--'.$address, $item['order_id'],'JDPOP-dec');
}
}
......@@ -521,46 +518,6 @@ public function changeTelphone($data){
$res = (string)$this->https_request($url);
CommonService::addLog('URL', $order_num.'---'.$url.'----'.$res, 111,'url');
return $res;
/* // 判断是否需要解密 ReceiverAddress ReceiverMobile ReceiverName
if ($pop_ptdata['is_decrypt'] == 2) {
$jmdecrypt_num = 0;
if (mb_strlen($data['ReceiverName']) > 50) {
$decrypt_data = [];
$decrypt_data['dp'] = $pop_ptdata['pt_name'];
$decrypt_data['jmstr'] = str_replace('+', '%2B', $data['ReceiverName']);
$decrypt_data = json_encode($decrypt_data);
$url = "http://jm.bluearp.com/jd/test?str=" . $decrypt_data;
$data['ReceiverName'] = (string)$this->https_request($url);
$jmdecrypt_num++;
}
if (mb_strlen($data['ReceiverMobile']) > 30) {
$decrypt_data = [];
$decrypt_data['dp'] = $pop_ptdata['pt_name'];
$decrypt_data['jmstr'] = str_replace('+', '%2B', $data['ReceiverMobile']);
$decrypt_data = json_encode($decrypt_data);
$url = "http://jm.bluearp.com/jd/test?str=" . $decrypt_data;
$data['ReceiverMobile'] = (string)$this->https_request($url);
$jmdecrypt_num++;
}
if (strpos($data['ReceiverMobile'], "*") !== false) {
$phone = $this->PopOrderGetPhone($pop_ptdata['appKey'], $pop_ptdata['appSecret'], $pop_ptdata['accessToken'], $data['TidStr']);
if ($phone != '') {
$data['ReceiverMobile'] = $phone;
}
}
if ($jmdecrypt_num > 0) {
$decrypt_data = [];
$decrypt_data['dp'] = $pop_ptdata['pt_name'];
$decrypt_data['jmstr'] = str_replace('+', '%2B', $data['ReceiverAddress']);
$decrypt_data = json_encode($decrypt_data);
$url = "http://jm.bluearp.com/jd/test?str=" . $decrypt_data;
$data['ReceiverAddress'] = (string)$this->https_request($url);
}
}*/
}
......
app/Http/Controllers/Common/GoodsBrandController.php
浏览文件 @ 16cf9ec1
......@@ -211,7 +211,9 @@ class GoodsBrandController extends BaseController
if(RedisService::redisGet('gbList')){
//echo 1;
$gbList = RedisService::redisGet('gbList');
$gbList = CommonService::arrayFilterFieldValue($gbList,[['company_id'=>$session['company_id']]]);
if($session['admin_groupnew'] !=7) {
$gbList = CommonService::arrayFilterFieldValue($gbList, [['company_id' => $session['company_id']]]);
}
return $this->success('获取成功',$gbList);
//return $cdList;
}else{
......@@ -219,7 +221,9 @@ class GoodsBrandController extends BaseController
$gbLists = PjBrandsService::gbList();
$gbList = json_encode($gbLists);
RedisService::redisSet('gbList',$gbList);
$gbLists = CommonService::arrayFilterFieldValue($gbLists,[['company_id'=>$session['company_id']]]);
if($session['admin_groupnew'] !=7) {
$gbLists = CommonService::arrayFilterFieldValue($gbLists, [['company_id' => $session['company_id']]]);
}
return $this->success('获取成功',$gbLists);
}
// if(RedisService::redisGet('gbList')){
......
app/Services/OrderListService.php
浏览文件 @ 16cf9ec1
......@@ -467,9 +467,9 @@ class OrderListService extends Service
$where['stauas_searchin'] = [10,20];
}elseif ($input['state'] == 3){ //安装中
$where['stauas'] = 30;
$search['day_time_searchlt'] = $time;
$search['day_time_isnull'] = null;
$where['day_time_searchor'] = $search;
// $search['day_time_searchlt'] = $time;
// $search['day_time_isnull'] = null;
// $where['day_time_searchor'] = $search;
}elseif ($input['state'] == 4){ //延期订单
$where['stauas'] = 30;
$where['day_time_searchgt'] = $time;
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论