Skip to content

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

edit

上级 77d7e2de
隐藏空白字符变更
内嵌 并排
正在显示 包含 581 行增加 和 15 行删除
app/ExcelTemp/ExcelTemp.php
浏览文件 @ c895c690
...@@ -943,6 +943,10 @@ trait ExcelTemp ...@@ -943,6 +943,10 @@ trait ExcelTemp
['field_name' => '12小时履约达标', 'field_value' => 'Standard12Hours', 'field_with' => 20], ['field_name' => '12小时履约达标', 'field_value' => 'Standard12Hours', 'field_with' => 20],
['field_name' => '24小时履约达标', 'field_value' => 'Standard24Hours', 'field_with' => 20], ['field_name' => '24小时履约达标', 'field_value' => 'Standard24Hours', 'field_with' => 20],
['field_name' => '是否计入时效考核', 'field_value' => 'takeEffect', 'field_with' => 20], ['field_name' => '是否计入时效考核', 'field_value' => 'takeEffect', 'field_with' => 20],
['field_name' => '省份', 'field_value' => 'shr_sheng', 'field_with' => 30],
['field_name' => '城市', 'field_value' => 'shr_shi', 'field_with' => 30],
['field_name' => '区县', 'field_value' => 'shr_xian', 'field_with' => 30],
['field_name' => '详细地址', 'field_value' => 'shr_adress', 'field_with' => 50],
] ]
]; ];
......
app/Exports/BasicExport.php
浏览文件 @ c895c690
...@@ -376,6 +376,10 @@ class BasicExport ...@@ -376,6 +376,10 @@ class BasicExport
}else{ }else{
$return[$k]['takeEffect'] = "否";//是否计入时效考核 $return[$k]['takeEffect'] = "否";//是否计入时效考核
} }
$return[$k]['shr_sheng'] = $v['shr_sheng'];//省份
$return[$k]['shr_shi'] = $v['shr_shi'];//城市
$return[$k]['shr_xian'] = $v['shr_xian'];//区县
$return[$k]['shr_adress'] = $v['shr_adress'];//详细地址
$highestRow++; $highestRow++;
foreach( $group as $kg => $vg ){ foreach( $group as $kg => $vg ){
if($vg == 'order_num'){ if($vg == 'order_num'){
......
app/Http/Controllers/Api/SynJdRapidController.php 0 → 100644
浏览文件 @ c895c690
<?php
/**
* 文件名称（同步京东秒送数据）
* 文件简单描述（同步京东秒送数据）
* @author DouBin
* @Date: 2025/9/1
* @Time: 10:36
* @Email: db@sudianwang.com
* @version 1.0
* @copyright BlueCity
*/
namespace App\Http\Controllers\Api;
use App\Http\Controllers\BaseController;
use App\Models\OrderMsg;
use App\Models\Orders;
use App\Models\Pt;
use App\Models\User;
use App\Services\CommonService;
use App\Services\JdDataService;
use App\Services\OrderaddService;
use App\Services\OrderService;
use App\Services\RefundService;
use Illuminate\Http\Request;
use DB;
class SynJdRapidController extends BaseController
{
/**|---------------------------------------------------------------------------------
* @name 同步token
* @param string token token
* @retrun \Illuminate\Http\JsonResponse
* @author dou 2025/9/1 10:37
* |---------------------------------------------------------------------------------
*/
public function receiveToken ( Request $request ){
if(!$request->filled('token')){
$post = file_get_contents('php://input');
}else{
$post = $request->input('token');
}
CommonService::addLog('接收秒送同步token信息', $post, '','receiveToken-JdRapid');
$post = json_decode($post,true);
if(isset($post['venderId'])) {
$rea = DB::table('jdpop_token')->where('venderId',$post['venderId'])->update(['access_token'=>$post['token'],'update_time'=>date("Y-m-d H:i:s")]);
}
return Response()->json(["code"=>"200","msg"=>"success","data"=>""]);
}
/**|---------------------------------------------------------------------------------
* @name 接收秒送推送的订单
* @param string
* @retrun \Illuminate\Http\JsonResponse
* @author dou 2025/9/18 10:21
* |---------------------------------------------------------------------------------
*/
public function newOrder ( Request $request ){
$post = file_get_contents('php://input');
parse_str($post, $outputArray);
if (isset($outputArray['jd_param_json'])) {
// 注意：parse_str 已经对 %7B 等编码进行了解码，现在的值是合法的 JSON 字符串
$jsonDecodedValue = json_decode($outputArray['jd_param_json'], true); // true 表示返回关联数组
if (json_last_error() === JSON_ERROR_NONE) {
$rea = DB::table("order_jd")->insert(['oj_billId'=>$jsonDecodedValue['billId'],'oj_statusId'=>$jsonDecodedValue['statusId'],'oj_creact_time'=>date("Y-m-d H:i:s"),'oj_update_time'=>date("Y-m-d H:i:s"),'oj_token'=>$outputArray['token'],'oj_type'=>1]);
if($rea) {
$billId = $jsonDecodedValue['billId'];
$token = $outputArray['token'];
app()->terminating(function () use ($billId, $token) {
// 这里的代码会在响应发送后执行
self::sysJdData($billId, $token,1);
});
}
$outputArray['jd_param_json'] = $jsonDecodedValue;
} else {
// JSON 解析错误处理
$outputArray['jd_param_json_error'] = json_last_error_msg();
}
}
CommonService::addLog('接收秒送同步post', json_encode($outputArray), '','receiveNewOrder-JdRapid');
return Response()->json(["code"=>"0","msg"=>"success","data"=>""]);
}
/**|---------------------------------------------------------------------------------
* @name 接收秒送取消订单
* @retrun \Illuminate\Http\JsonResponse
* @author dou 2025/9/22 14:39
* |---------------------------------------------------------------------------------
*/
public function userCancelOrder ( Request $request ){
$post = file_get_contents('php://input');
parse_str($post, $outputArray);
if (isset($outputArray['jd_param_json'])) {
// 注意：parse_str 已经对 %7B 等编码进行了解码，现在的值是合法的 JSON 字符串
$jsonDecodedValue = json_decode($outputArray['jd_param_json'], true); // true 表示返回关联数组
if (json_last_error() === JSON_ERROR_NONE) {
$rea = DB::table("order_jd")->insert(['oj_billId'=>$jsonDecodedValue['billId'],'oj_statusId'=>$jsonDecodedValue['statusId'],'oj_creact_time'=>date("Y-m-d H:i:s"),'oj_update_time'=>date("Y-m-d H:i:s"),'oj_token'=>$outputArray['token'],'oj_type'=>2]);
if($rea) {
$billId = $jsonDecodedValue['billId'];
$token = $outputArray['token'];
app()->terminating(function () use ($billId, $token) {
// 这里的代码会在响应发送后执行
self::sysJdData($billId, $token,2);
});
}
$outputArray['jd_param_json'] = $jsonDecodedValue;
} else {
// JSON 解析错误处理
$outputArray['jd_param_json_error'] = json_last_error_msg();
}
}
CommonService::addLog('接收秒送同步post', json_encode($outputArray), '','userCancelOrder-JdRapid');
return Response()->json(["code"=>"0","msg"=>"success","data"=>""]);
}
/**|---------------------------------------------------------------------------------
* @name 接收秒送用户申请取消
* @retrun \Illuminate\Http\JsonResponse
* @author dou 2025/9/22 14:39
* |---------------------------------------------------------------------------------
*/
public function applyCancelOrder ( Request $request ){
$post = file_get_contents('php://input');
parse_str($post, $outputArray);
if (isset($outputArray['jd_param_json'])) {
// 注意：parse_str 已经对 %7B 等编码进行了解码，现在的值是合法的 JSON 字符串
$jsonDecodedValue = json_decode($outputArray['jd_param_json'], true); // true 表示返回关联数组
if (json_last_error() === JSON_ERROR_NONE) {
$rea = DB::table("order_jd")->insert(['oj_billId'=>$jsonDecodedValue['billId'],'oj_statusId'=>$jsonDecodedValue['statusId'],'oj_creact_time'=>date("Y-m-d H:i:s"),'oj_update_time'=>date("Y-m-d H:i:s"),'oj_token'=>$outputArray['token'],'oj_type'=>3]);
if($rea) {
$billId = $jsonDecodedValue['billId'];
$token = $outputArray['token'];
app()->terminating(function () use ($billId, $token) {
// 这里的代码会在响应发送后执行
self::sysJdData($billId, $token,3);
});
}
$outputArray['jd_param_json'] = $jsonDecodedValue;
} else {
// JSON 解析错误处理
$outputArray['jd_param_json_error'] = json_last_error_msg();
}
}
CommonService::addLog('接收秒送同步post', json_encode($outputArray), '','applyCancelOrder-JdRapid');
return Response()->json(["code"=>"0","msg"=>"success","data"=>""]);
}
/**|---------------------------------------------------------------------------------
* @name 计划执行未处理订单
* @retrun /multitype:array
* @author dou 2025/9/22 14:12
* |---------------------------------------------------------------------------------
*/
public function searchJdOrder ( ){
$list = DB::table("order_jd")->where('oj_state',1)->where('oj_num','<',2)->limit(10)->get();
$list = CommonService::dataToArray($list);
if($list){
foreach($list as $k => $v){
self::sysJdData($v['oj_billId'],$v['oj_token'],$v['oj_type']);
}
}
return ["code"=>"200","msg"=>"操作完成","data"=>"操作完成"];
}
/**|---------------------------------------------------------------------------------
* @name 加载数据状态
* @param string $billId 订单单号
* @param string $type 处理类型 1创建订单2取消订单
* @retrun /multitype:array
* @author dou 2025/9/22 11:21
* |---------------------------------------------------------------------------------
*/
public function sysJdData ( $oj_billId,$token='',$type=1 ){
$res = self::searchOrder($oj_billId,$token,$type);
CommonService::addLog('接收秒送同步post', json_encode($res), '','sysJdData-JdRapid');
if($res['code']==200){
$post['oj_state']=2;
}else{
$post['oj_state']=3;
}
$post['oj_centent']=$res['msg'];
$post['oj_update_time']=date("Y-m-d H:i:s");
DB::table("order_jd")->where('oj_billId',$oj_billId)->where('oj_type',$type)->increment('oj_num');
DB::table("order_jd")->where('oj_billId',$oj_billId)->where('oj_type',$type)->update($post);
}
/**|---------------------------------------------------------------------------------
* @name 获取订单信息
* @param string oj_billId 订单单号
* @retrun \Illuminate\Http\JsonResponse
* @author dou 2025/9/18 14:58
* |---------------------------------------------------------------------------------
*/
public function searchOrder ( $oj_billId ,$token='',$type = 1){
if($token=='') {
$token = DB::table("jdpop_token")->where("pt_id", '50')->first();
}else{
$token = DB::table("jdpop_token")->where("access_token", $token)->first();
}
if(!empty($token)){
$json['orderId']=$oj_billId;
$sysParams['token']=$token['access_token'];
$sysParams['app_key']=$token['app_key'];
$sysParams['format']='json';
$sysParams['timestamp']=date("Y-m-d H:i:s");
$sysParams['v']='1.0';
$apiParams["jd_param_json"]=json_encode($json);
$sysParams["sign"] = JdDataService::generateSign(array_merge($sysParams, $apiParams),$token['app_secret']);
$apiParams=array_merge($sysParams, $apiParams);
ksort($apiParams);
foreach( $apiParams as $k => $v ){
if(strpos($v,' ')){
$urldata[]=$k."=".urlencode ($v);
}else{
$urldata[]=$k."=".$v;
}
}
$urldata=implode("&",$urldata);
$url="https://openapi.jddj.com/djapi/order/es/query?".$urldata;
$resp=CommonService::https_get($url);
$resp = json_decode($resp,true);
if(isset($resp['encryptData']) && !empty($resp['encryptData'])){
$data = JdDataService::decryptAES($resp['encryptData'], $token['app_secret']);
$data = json_decode($data,true);
if($data['code']=='0' && isset($data['result']) && !empty($data['result'])){
$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');
$result = $data['result'];
$result = json_decode($result,true);
$result = $result['resultList'];
$arr_goods = [];
$arr = [];
$company_id = Pt::where("id",$token['pt_id'])->value('company_id');
$ip = $_SERVER["REMOTE_ADDR"];
foreach( $result 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','new_money','company_id']);
if($order_info){
if(in_array($vv['orderStatus'], ['20010','20020','20030','20040']) || $type==2 || $type==3) {
if ($order_info['lock_type'] == 2 || in_array($order_info['order_status'], [50, 55])) {
return ["code"=>"200","msg"=>"订单已取消1","data"=>"订单已取消"];
} else {
$datar['allprice'] = $order_info['new_money'];
$goods_arr = OrderMsg::where('sys_num', $order_info['sys_num'])->get(['id as msg_id', 'goods_name', 'goods_price', 'goods_id as good_id']);
$datar['goodsArr'] = CommonService::dataToArray($goods_arr);
$datar['goods_state'] = 2;//2:平台; 4:财务
$datar['sys_num'] = $order_info['sys_num'];
$datar['order_num'] = $order_info['order_num'];
$datar['apply_type'] = 1;
$content = $vv['orderCancelRemark'];
$datar['content'] = $content;
$datar['p_id'] = $order_info['p_id'];
$datar['ser_id'] = $order_info['ser_id'];
$datar['new_customer_id'] = $order_info['new_customer_id'];
$datar['order_status'] = $order_info['order_status'];
$datar['create_time'] = $order_info['create_time'];
$userArr = User::where('id', $order_info['new_customer_id'])->first();
$session['admin_groupnew'] = 7;
$session['admin_acc'] = '系统录入';
$session['id'] = 164;
$session['company_id'] = $order_info['company_id'];
$ret = OrderService::lockByRefund($datar, $session, $userArr);
CommonService::addLog('取消订单', json_encode($ret), $vv['customOrderId'], 'JdRapid-cancel');
return ["code"=>"200","msg"=>"订单已取消2","data"=>"订单已取消"];
}
}
return ["code"=>"200","msg"=>"订单已存在","data"=>"订单已存在"];
}
if(in_array($vv['orderStatus'], ['20010','20020','20030','20040'])|| $type==2 || $type==3) {
return ["code"=>"200","msg"=>"success","data"=>"订单已取消无需创建"];
}
$flag = 1;
$skuId = array_column($vv['product'], 'skuId');
$goodids = DB::table("jd_bound")->whereRaw("sku_id in (".implode(',',$skuId).")")->pluck('goods_id','sku_id')->toarray();
if(empty($goodids)){
CommonService::addLog('无sku', json_encode($skuId), $vv['orderId'],'JdRapid-无sku');
$flag = 2;
}
if($goodids){
if(count($goodids)<count($vv['product'])){
$flag = 2;
}
}
/**********************************************整理商品信息******************************************/
$resjdgoods = DB::table('jdgoods')->where("order_id",$vv['orderId'])->value('id');
$price = 0;
$orderMsgData = [];
foreach( $vv['product'] as $ka => $va ){
$price= $price+$va['skuStorePrice']/100;
if(!$resjdgoods){
if(in_array($vv['orderId'], $arr_goods)){
unset($arr_goods[$kk]);
}
$arr_goods[$kk]['order_id'] = $vv['orderId'];//订单单号
$arr_goods[$kk]['pt_id'] = $token['pt_id'];//平台id
$arr_goods[$kk]['sku_id'] = $va['skuId'];//京东sku
$arr_goods[$kk]['item_total'] = $va['skuCount'];//商品数量
$arr_goods[$kk]['jd_price'] = $va['skuJdPrice']/100;//京东单价
$arr_goods[$kk]['jd_cost'] = $va['skuStorePrice']/100;//采购价
$arr_goods[$kk]['sku_name'] = $va['skuName'];//商品名称
DB::table('jdgoods')->insert($arr_goods[$kk]);
unset($arr_goods[$kk]);
}
$sys_num = 'L'.date("YmdHis").str_pad(rand(0,999),3,'0',STR_PAD_LEFT).'-'.$kk;
if($flag==1) {
$goodid = $goodids[$va['skuId']];
if($goodid){
$goods_res = $goods[$goodid];
if($goods_res['pg_series']==''){
$type = $goods_res['version'];
}else{
$type = $goods_res['pg_series']."-".$goods_res['version'];
}
$goods_name = $goods_name.$goods_res['brand_name'].",".$type.",".$goods_res['general_version'].",";
$good_brand[] = $goods_res['brand_name'];
$orderMsgData[$ka]['goods_id'] = $goodid;
$orderMsgData[$ka]['goods_name'] = $goods_res['brand_name']."-".$type;
$orderMsgData[$ka]['goods_price'] = $va['skuStorePrice']/100;//实收/商品单价
// $orderMsgData['goods_paid'] = $va['jdPrice'];//应收
$orderMsgData[$ka]['goods_num'] = $va['skuCount'];
$orderMsgData[$ka]['goods_brand'] = $goods_res['brand_name'];
$orderMsgData[$ka]['goods_number'] = $type;
$orderMsgData[$ka]['cd_id'] = 1;
// dump($orderMsgData);
}
}
}
/*********************************************************************************************/
/**********************************************添加订单信息******************************************/
$newOrderId = false;
if($flag==1){
$orders[$kk]['sys_bh'] = $sys_num;
$orders[$kk]['skb_bh'] = $vv['orderId'];//平台单号
$orders[$kk]['pt_id'] = $token['pt_id'];//平台id
$orders[$kk]['ser_type'] = 1;//服务类型：1上门安装，2到店服务
$orders[$kk]['shr_name'] = $vv['buyerFullName'];//姓名
$tel = explode(',', $vv['buyerMobile']);
$orders[$kk]['shr_phone'] = $tel[0].'-'.$tel[1];//$vv['telephone'];//电话
$areaProvince = explode($vv['buyerCityName'], $vv['buyerFullAddress']);
$orders[$kk]['shr_sheng'] = $areaProvince[0];//省份
$orders[$kk]['shr_shi'] = $vv['buyerCityName'];//城市
$orders[$kk]['shr_xian'] = $vv['buyerCountryName'];//区县
$fullAddress = str_replace($orders[$kk]['shr_sheng'].$vv['buyerCityName'].$vv['buyerCountryName'], '', $vv['buyerFullAddress']);
$orders[$kk]['shr_adress'] = $fullAddress;//
$orders[$kk]['shr_other'] = '店铺名称'.$vv['produceStationName'].';'.$vv['orderBuyerRemark'].'接单后10分钟内务必联系客户核实车型跟安装时间！不断电安装、如果无法完成 请立刻反馈我们处理~！';
$orders[$kk]['car_audit'] = 2;//1:新订单；2：可派单；3：处理中
$orders[$kk]['order_type'] = 1;//订单类型：1：普通；20加急；10：夜间
$orders[$kk]['order_time'] = date("Y-m-d H:i:s");
$orders[$kk]['pay_type'] = 1;//支付方式：1在线支付；2货到付款
$orders[$kk]['goods'] = $orderMsgData;
// $session = $request->get('session_token');//获取操作人信息
$session['admin_groupnew'] = 7;
$session['admin_acc'] = '系统录入';
$session['id'] = 164;
$session['company_id'] = $company_id;
// dump($orders[$kk]);
$return = OrderaddService::addOrder($orders[$kk], $session, $ip);
// dump($return);
CommonService::addLog('添加定单', json_encode($return)."--".json_encode($orders[$kk]).'--'.json_encode($goodids), $vv['orderId'],'JdRapid_addOrder');
// $return['ErrorCode'] = 2;
if($return['ErrorCode']==1){
$newOrderId = true;
}
}
/*********************************************************************************************/
/**********************************************添加同步记录******************************************/
$rea = DB::table('jd_proprietary')->where("order_id",$vv['orderId'])->value('id');
if(in_array($vv['orderId'], array_column($arr, 'order_id'))){
unset($arr[$kk]);
}
$arr[$kk]['order_id'] = $vv['orderId'];//订单单号
$arr[$kk]['admin_acc'] = '系统录入';//操作人
$arr[$kk]['pt_id'] = $token['pt_id'];//平台id
$arr[$kk]['pay_type'] = $vv['payChannel']??1;//支付方式
$arr[$kk]['order_seller_price'] = $price;//订单金额
$arr[$kk]['freight_price'] = 0;//运费
$arr[$kk]['order_state'] = $vv['orderStatus'];//订单状态（20010:锁定，20020:订单取消，20030:订单取消申请，20040:超时未支付系统取消，31000:等待付款，31020:已付款，41000:待处理，32000:等待出库，33040:配送中，33060:已妥投，90000:订单完成）
$arr[$kk]['invoice_info'] = '不需要开具发票';//'发票1开2不开'
$arr[$kk]['order_remark'] = $vv['orderBuyerRemark']??'';//订单备注
$arr[$kk]['order_start_time'] = date("Y-m-d H:i:s");//下单时间
$arr[$kk]['fullname'] = $vv['buyerFullName'];//姓名
$tel = explode(',', $vv['buyerMobile']);
$arr[$kk]['mobile'] = $tel[0].'-'.$tel[1];//$vv['telephone'];//电话
$arr[$kk]['telephone'] = $tel;//客户电话
$areaProvince = explode($vv['buyerCityName'], $vv['buyerFullAddress']);
$arr[$kk]['province'] = $areaProvince[0];//省份
$arr[$kk]['city'] = $vv['buyerCityName'];//城市
$arr[$kk]['county'] = $vv['buyerCountryName'];//区县
$fullAddress = str_replace($orders[$kk]['shr_sheng'].$vv['buyerCityName'].$vv['buyerCountryName'], '', $vv['buyerFullAddress']);
$arr[$kk]['full_address'] = $fullAddress;//详细地址
$arr[$kk]['order_pay'] = $price;//实收金额
$arr[$kk]['parent_orderid'] = $vv['orderId'];//父类单号
if (!$newOrderId || $flag=='2'){
//echo '添加订单信息失败';
if(!$rea){
$arr[$kk]['is_show'] = 2;//'1 未填单 2 已填单 3 已删除 4 已完成'
DB::table('jd_proprietary')->insert($arr[$kk]);
unset($arr[$kk]);
}
return ["code"=>"201","msg"=>"建单失败","data"=>"建单失败"];
}else{
if(!$rea){
$arr[$kk]['is_show'] = 1;//'1 未填单 2 已填单 3 已删除 4 已完成'
DB::table('jd_proprietary')->insert($arr[$kk]);
unset($arr[$kk]);
}
return ["code"=>"200","msg"=>"建单成功","data"=>"建单成功"];
}
/*********************************************************************************************/
}
}
}
}
return ["code"=>"201","msg"=>"获取订单信息失败","data"=>"获取订单信息失败"];
}
function https_request($url, $data = null)
{
$curl = curl_init();
curl_setopt($curl, CURLOPT_URL, $url);
curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, FALSE);
curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, FALSE);
if (!empty($data)) {
curl_setopt($curl, CURLOPT_POST, 1);
curl_setopt($curl, CURLOPT_POSTFIELDS, $data);
}
curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
$output = curl_exec($curl);
curl_close($curl);
return $output;
}
}
app/Http/Controllers/Dou/MyTestController.php
浏览文件 @ c895c690
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
namespace App\Http\Controllers\Dou; namespace App\Http\Controllers\Dou;
use App\Exports\BasicExport; use App\Exports\BasicExport;
use App\Http\Controllers\Api\SynJdRapidController;
use App\Http\Controllers\BaseController; use App\Http\Controllers\BaseController;
use App\Http\Controllers\Orders\AotuorderController; use App\Http\Controllers\Orders\AotuorderController;
use App\Models\Admin; use App\Models\Admin;
...@@ -33,7 +34,7 @@ use BlueCity\Core\Traits\ResourceControllerMethod; ...@@ -33,7 +34,7 @@ use BlueCity\Core\Traits\ResourceControllerMethod;
use App\Services\TechnicalLevelService; use App\Services\TechnicalLevelService;
use BlueCity\Core\Inc\ErrorInc; use BlueCity\Core\Inc\ErrorInc;
use DB; use DB;
use ACES\TDEClient;
class MyTestController extends BaseController class MyTestController extends BaseController
{ {
public function test ( Request $request ){ public function test ( Request $request ){
...@@ -1225,14 +1226,30 @@ class MyTestController extends BaseController ...@@ -1225,14 +1226,30 @@ class MyTestController extends BaseController
* |--------------------------------------------------------------------------------- * |---------------------------------------------------------------------------------
*/ */
public function getDataDecrypt ( $input ){ public function getDataDecrypt ( $input ){
$datafullname['accessToken'] = $input['access_token'];//'e0a1c90e617f4b3a9865ed059f99c5f42ztb'; // $datafullname['accessToken'] = $input['access_token'];//'e0a1c90e617f4b3a9865ed059f99c5f42ztb';
$datafullname['appKey'] = $input['app_key'];;//'41D9668E8CB81C9890A065BEC300FD84'; // $datafullname['appKey'] = $input['app_key'];;//'41D9668E8CB81C9890A065BEC300FD84';
$datafullname['appSecret'] = $input['app_secret'];//'93bff142bf5c4422ae7bec9eb992e751'; // $datafullname['appSecret'] = $input['app_secret'];//'93bff142bf5c4422ae7bec9eb992e751';
$fullname = $this->decrypt($datafullname,$input['str'],$input['orderId']); // $fullname = $this->decrypt($datafullname,$input['str'],$input['orderId']);
echo "解密信息：".$fullname;exit; // echo "解密信息：".$fullname;exit;
// phpinfo();
// die();
// $encrypted = base64_decode('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');
//
// // 解密
// $decrypted = openssl_decrypt(
// $encrypted,
// 'AES-128-CBC',
// '285ad85204144f41',
// OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING,
// '981bab04953790b1'
// );
$SynJdRapidController = new SynJdRapidController();
// $decrypted = $SynJdRapidController->sysJdData($input['orderId'],$input['token'],$input['type']);
$decrypted = $SynJdRapidController->searchJdOrder();
// dump($decrypted);
return $decrypted;
} }
/**|--------------------------------------------------------------------------------- /**|---------------------------------------------------------------------------------
* @name 计算订单退款 * @name 计算订单退款
* @param string ju_ordernum 订单单号 * @param string ju_ordernum 订单单号
......
app/Http/Controllers/Orders/OrderListController.php
浏览文件 @ c895c690
...@@ -750,7 +750,7 @@ class OrderListController extends BaseController ...@@ -750,7 +750,7 @@ class OrderListController extends BaseController
$id = $request->get('session_token')['id']; $id = $request->get('session_token')['id'];
$db = new OrderList; $db = new OrderList;
$params = ['sys_num'=>$input['sys_num']]; $params = ['sys_num'=>$input['sys_num']];
$select = ['order_num','sys_num','serial_number','stauas','ser_id','p_id','order_goods_id','store_type','ol_dispamount','customer_id']; $select = ['order_num','sys_num','serial_number','stauas','ser_id','p_id','order_goods_id','store_type','ol_dispamount','customer_id','company_id'];
$orderBy = ['stauas'=>'DESC']; $orderBy = ['stauas'=>'DESC'];
$orderListArrs = CommonService::getMysqlData($db, $params,$select,$orderBy); $orderListArrs = CommonService::getMysqlData($db, $params,$select,$orderBy);
if(!$orderListArrs){ if(!$orderListArrs){
......
app/Http/Controllers/Orders/OrdersController.php
浏览文件 @ c895c690
...@@ -579,7 +579,7 @@ class OrdersController extends BaseController ...@@ -579,7 +579,7 @@ class OrdersController extends BaseController
if (!empty($sett_status)) { if (!empty($sett_status)) {
OrderService::updataReplaceMoney($input, $sett_status, $session); OrderService::updataReplaceMoney($input, $sett_status, $session);
} }
if ($input['goods_state'] == 3 || $input['goods_state'] == 4 || $input['goods_state'] == 5) { if (($input['goods_state'] == 3 || $input['goods_state'] == 4 || $input['goods_state'] == 5 ) && $orderinfo['company_id']!=14) {
$ArrSett['locksel_type'] = 2;//锁定 $ArrSett['locksel_type'] = 2;//锁定
$submit_stauas = 1;//差额处理，1申请中 $submit_stauas = 1;//差额处理，1申请中
} else { } else {
......
app/Services/AfterSaleService.php
浏览文件 @ c895c690
...@@ -226,7 +226,7 @@ class AfterSaleService extends Service ...@@ -226,7 +226,7 @@ class AfterSaleService extends Service
*/ */
public static function getButtonDatas($all_button,$list){ public static function getButtonDatas($all_button,$list){
$labArr = SetmoneyType::where('lt_statues','!=',2)->pluck('sety_name','sety_id')->toArray(); $labArr = SetmoneyType::pluck('sety_name','sety_id')->toArray();
foreach ($list as $k => $v){ foreach ($list as $k => $v){
$buttonData = []; $buttonData = [];
$list[$k]['labname'] = $labArr[$v['afs_type']]; $list[$k]['labname'] = $labArr[$v['afs_type']];
......
app/Services/Api/MobileWeb/OrderListService.php
浏览文件 @ c895c690
...@@ -65,6 +65,10 @@ class OrderListService extends Model ...@@ -65,6 +65,10 @@ class OrderListService extends Model
$wheres['stauas_searchin'] = [34,40]; $wheres['stauas_searchin'] = [34,40];
} }
} }
if(!empty($request['keyword'])) {
$wheres['search_searchor']['order_num_like'] = $request['keyword'];
$wheres['search_searchor']['shr_name_like'] = $request['keyword'];
}
$wheres = array_merge($where, $wheres); $wheres = array_merge($where, $wheres);
$wheres = CommonService::jointWhere($wheres); $wheres = CommonService::jointWhere($wheres);
$list_data = $list_data->whereRaw($wheres) $list_data = $list_data->whereRaw($wheres)
......
app/Services/Api/MobileWeb/StatementsListService.php
浏览文件 @ c895c690
...@@ -58,6 +58,9 @@ class StatementsListService extends Model ...@@ -58,6 +58,9 @@ class StatementsListService extends Model
}else { }else {
$list_data = $list_data->where('s.ser_id', $session['admin_id']); $list_data = $list_data->where('s.ser_id', $session['admin_id']);
} }
if(isset($request['keyword']) && !empty($request['keyword'])){//查询单号
$list_data = $list_data->where('s.order_num','like', "%".$request['keyword']."%");
}
$list_data = $list_data->where('list_service_type', 40) $list_data = $list_data->where('list_service_type', 40)
->whereIn('sett_status', [1,60,63]) ->whereIn('sett_status', [1,60,63])
->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') ->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')
...@@ -204,15 +207,21 @@ class StatementsListService extends Model ...@@ -204,15 +207,21 @@ class StatementsListService extends Model
$info_data = DB::table('settlement_list as s') $info_data = DB::table('settlement_list as s')
->leftJoin('order_list as o', 'o.serial_number', '=', 's.list_id') ->leftJoin('order_list as o', 'o.serial_number', '=', 's.list_id')
->leftJoin('order_msg as om', 'om.id', '=', 'o.order_goods_id') ->leftJoin('order_msg as om', 'om.id', '=', 'o.order_goods_id')
->where('s.ser_id', $session['admin_id']) ->where('s.ser_id', $session['admin_id']);
->where('wat_num', $data['stl_wat']) if(isset($request['keyword']) && !empty($request['keyword'])){//查询单号
$info_data = $info_data->where('o.order_num','like', "%".$request['keyword']."%");
}
$info_data = $info_data->where('wat_num', $data['stl_wat'])
->select('s.id', 's.sys_num', 's.create_time', 'all_price', 's.order_num as 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')
->orderBy('s.id', 'asc') ->orderBy('s.id', 'asc')
->paginate($show_count); ->paginate($show_count);
$list = $info_data->items(); $list = $info_data->items();
}else{ }else{
$info_data = TicketList::where('til_wats',$data['stl_wat']) $info_data = TicketList::where('til_wats',$data['stl_wat']);
->select('til_id as id', 'til_ticnum as sys_num', 'til_creactime as create_time', 'til_price as all_price', 'til_ornum as list_id', 'til_cause as goods_name') if(isset($request['keyword']) && !empty($request['keyword'])){//查询单号
$info_data = $info_data->where('o.til_ticnum','like', "%".$request['keyword']."%");
}
$info_data = $info_data->select('til_id as id', 'til_ticnum as sys_num', 'til_creactime as create_time', 'til_price as all_price', 'til_ornum as list_id', 'til_cause as goods_name')
->orderBy('til_id', 'asc') ->orderBy('til_id', 'asc')
->paginate($show_count); ->paginate($show_count);
$list = $info_data->items(); $list = $info_data->items();
......
app/Services/CommonService.php
浏览文件 @ c895c690
...@@ -1824,4 +1824,14 @@ class CommonService extends Service{ ...@@ -1824,4 +1824,14 @@ class CommonService extends Service{
AdminToken::where('at_token',$search_token['at_token'])->insert($arr); AdminToken::where('at_token',$search_token['at_token'])->insert($arr);
} }
} }
public static function https_get ($url){
$arrContextOptions=array(
"ssl"=>array(
"verify_peer"=>false,
"verify_peer_name"=>false,
),
);
$resp = file_get_contents($url, false, stream_context_create($arrContextOptions));
return $resp;
}
} }
app/Services/DataStatisticsService.php
浏览文件 @ c895c690
...@@ -178,9 +178,10 @@ class DataStatisticsService extends Service{ ...@@ -178,9 +178,10 @@ class DataStatisticsService extends Service{
} }
$paginate = OrderList::leftjoin('orders', 'orders.order_num', '=', 'order_list.order_num') $paginate = OrderList::leftjoin('orders', 'orders.order_num', '=', 'order_list.order_num')
->leftjoin('order_msg', 'order_msg.id', '=', 'order_list.order_goods_id') ->leftjoin('order_msg', 'order_msg.id', '=', 'order_list.order_goods_id')
->leftjoin('user', 'user.id', '=', 'order_list.customer_id')
->whereBetween('order_list.create_time',[$time_start,$time_end]) ->whereBetween('order_list.create_time',[$time_start,$time_end])
->whereRaw("gone_order_list.company_id='".$session['company_id']."' and gone_order_list.is_delete=1".$where) ->whereRaw("gone_order_list.company_id='".$session['company_id']."' and gone_order_list.is_delete=1".$where)
->selectRaw("(UNIX_TIMESTAMP(gone_order_list.feeds_time)-UNIX_TIMESTAMP(gone_order_list.get_time)) AS sgtime,(UNIX_TIMESTAMP(gone_order_list.get_time)-UNIX_TIMESTAMP(gone_order_list.create_time)) AS jdtime,stauas,gone_order_list.order_num,gone_order_list.ser_id,gone_order_list.create_time,gone_order_list.get_time,gone_order_list.feeds_time,gone_order_msg.goods_name") ->selectRaw("(UNIX_TIMESTAMP(gone_order_list.feeds_time)-UNIX_TIMESTAMP(gone_order_list.get_time)) AS sgtime,(UNIX_TIMESTAMP(gone_order_list.get_time)-UNIX_TIMESTAMP(gone_order_list.create_time)) AS jdtime,stauas,gone_order_list.order_num,gone_order_list.ser_id,gone_order_list.create_time,gone_order_list.get_time,gone_order_list.feeds_time,gone_order_msg.goods_name,gone_user.shr_sheng,gone_user.shr_shi,gone_user.shr_xian,gone_user.shr_adress")
->orderBy('create_time','ASC') ->orderBy('create_time','ASC')
->paginate($page_size); ->paginate($page_size);
if ($is_excel == 2) { if ($is_excel == 2) {
......
app/Services/JdDataService.php 0 → 100644
浏览文件 @ c895c690
<?php
/**
* 文件名称（处理京东数据）
* 文件简单描述（处理京东数据）
* @author DouBin
* @Date: 2025/9/18
* @Time: 15:59
* @Email: db@sudianwang.com
* @version 1.0
* @copyright BlueCity
*/
namespace App\Services;
use BlueCity\Core\Service\Service;
class JdDataService extends Service{
/**|---------------------------------------------------------------------------------
* @name 生成签名
* @param string $params 参数
* @param string $appsecret appsecret
* @retrun \Illuminate\Http\JsonResponse /multitype:array
* @author dou 2025/9/18 15:33
* |---------------------------------------------------------------------------------
*/
public static function generateSign($params,$appsecret) {
if ($params != null) { // 所有请求参数按照字母先后顺序排序
ksort($params);
// 定义字符串开始 结尾所包括的字符串
$stringToBeSigned = $appsecret;
// 把所有参数名和参数值串在一起
foreach ($params as $k => $v) {
$stringToBeSigned .= "$k$v";
}
unset($k, $v);
// 把venderKey加在字符串的两端
$stringToBeSigned .= $appsecret;
} else {
// 定义字符串开始 结尾所包括的字符串
$stringToBeSigned = $appsecret;
// 把venderKey加在字符串的两端
$stringToBeSigned .= $appsecret;
}
// 使用MD5进行加密，再转化成大写
return strtoupper(md5($stringToBeSigned));
}
/**|---------------------------------------------------------------------------------
* @name 解密京东秒送加密信息
* @param string $encrypted 加密信息
* @param string $appsecret appsecret
* @retrun \Illuminate\Http\JsonResponse
* @author dou 2025/9/18 16:03
* |---------------------------------------------------------------------------------
*/
public static function decryptAES ( $encrypted,$appsecret ){
$k = substr($appsecret, 0, 16);
$v = substr($appsecret, -16);
$encrypted = base64_decode($encrypted);
$decrypted = openssl_decrypt(
$encrypted,
'AES-128-CBC',
$k,
OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING,
$v
);
$decrypted = trim($decrypted);
return $decrypted;
}
}
composer.json
浏览文件 @ c895c690
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
"php": ">=7.0.0", "php": ">=7.0.0",
"bluecity/core": "^0.1.23", "bluecity/core": "^0.1.23",
"bluecity/data": "^0.1.9", "bluecity/data": "^0.1.9",
"bluecity/jos": "1.0.0",
"chumper/zipper": "^1.0", "chumper/zipper": "^1.0",
"fideloper/proxy": "~3.3", "fideloper/proxy": "~3.3",
"guzzlehttp/guzzle": "^7.3", "guzzlehttp/guzzle": "^7.3",
...@@ -81,6 +82,10 @@ ...@@ -81,6 +82,10 @@
"bluecity/data": { "bluecity/data": {
"type": "git", "type": "git",
"url": "https://gitlab.bluearp.com/bluecity/data.git" "url": "https://gitlab.bluearp.com/bluecity/data.git"
},
"bluecity/jos": {
"type": "git",
"url": "http://gitlab.bluearp.com/bluecity/jos.git"
} }
} }
} }
routes/api.php
浏览文件 @ c895c690
...@@ -1167,6 +1167,13 @@ Route::group( ...@@ -1167,6 +1167,13 @@ Route::group(
Route::group(['prefix'=>'SynOrderRejected'], function (){ Route::group(['prefix'=>'SynOrderRejected'], function (){
Route::get('rejectedOrder', 'SynOrderRejectedController@rejectedOrder');//自动拒单 Route::get('rejectedOrder', 'SynOrderRejectedController@rejectedOrder');//自动拒单
}); });
#系统任务 >> 京东秒送
Route::group(['prefix'=>'SynJdRapid'], function (){
Route::post('receiveToken', 'SynJdRapidController@receiveToken');//接收 token
Route::post('djsw/newOrder', 'SynJdRapidController@newOrder');//接收 订单
Route::post('djsw/userCancelOrder', 'SynJdRapidController@userCancelOrder');//接收 取消订单
Route::post('djsw/applyCancelOrder', 'SynJdRapidController@applyCancelOrder');//接收 用户申请取消
});
#系统任务 >> 电话通知 #系统任务 >> 电话通知
Route::group(['prefix'=>'SingLeCallByTts'], function (){ Route::group(['prefix'=>'SingLeCallByTts'], function (){
Route::get('getSingleCallByTts', 'SingLeCallByTtsController@getSingleCallByTts');//电话通知 Route::get('getSingleCallByTts', 'SingLeCallByTtsController@getSingleCallByTts');//电话通知
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论