Skip to content

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

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

上级 5edf03f1 f8e170f6
全部展开 显示空白字符变更
内嵌 并排
正在显示 包含 29 行增加 和 133 行删除
app/Http/Controllers/Api/MobileWeb/StatementsListController.php
浏览文件 @ 3d00d75e
...@@ -47,85 +47,23 @@ class StatementsListController extends Controller ...@@ -47,85 +47,23 @@ class StatementsListController extends Controller
* @param Request $request [description] * @param Request $request [description]
* @return [type] [description] * @return [type] [description]
*/ */
public function handle_ive(Request $request) { public function businessFirm(Request $request) {
// 验证数据 // 验证数据
$error_message = $this->dataValidator->handle_iveValidator($request->all()); $error_message = $this->dataValidator->businessFirmValidator($request->all());
if ($error_message) { if ($error_message) {
return response()->json(['ErrorCode'=>ErrorInc::INVALID_PARAM, 'ErrorMessage'=>$error_message->first(), 'Data'=>[$error_message]]); return response()->json(['ErrorCode'=>ErrorInc::INVALID_PARAM, 'ErrorMessage'=>$error_message->first(), 'Data'=>[$error_message]]);
} }
$data = $request->all(); $data = $request->all();
$data['ip'] = $request->ip(); $data['ip'] = $request->ip();
$return_data = AftersaleOrderService::handle_ive($data); $return_data = StatementsListService::businessFirm($data);
return response()->json($return_data); return response()->json($return_data);
} }
/**
* 日常反馈
* @authors ldj
* @email 909490343@qq.com
* @date 2024-09-12
* @param Request $request [description]
* @return [type] [description]
*/
public function dailyFeedback(Request $request) {
// 验证数据
$error_message = $this->dataValidator->dailyFeedbackValidator($request->all());
if ($error_message) {
return response()->json(['ErrorCode'=>ErrorInc::INVALID_PARAM, 'ErrorMessage'=>$error_message->first(), 'Data'=>[$error_message]]);
}
$data = $request->all();
$data['ip'] = $request->ip();
$return_data = AftersaleOrderService::dailyFeedback($data);
return response()->json($return_data);
}
/**
* 申请完成
* @authors ldj
* @email 909490343@qq.com
* @date 2024-09-12
* @param Request $request [description]
* @return [type] [description]
*/
public function quality (Request $request) {
// 验证数据
$error_message = $this->dataValidator->dailyFeedbackValidator($request->all());
if ($error_message) {
return response()->json(['ErrorCode'=>ErrorInc::INVALID_PARAM, 'ErrorMessage'=>$error_message->first(), 'Data'=>[$error_message]]);
}
$data = $request->all();
$data['ip'] = $request->ip();
$return_data = AftersaleOrderService::quality($data);
return response()->json($return_data);
}
/**
* 上传图片
* @authors ldj
* @email 909490343@qq.com
* @date 2024-09-12
* @param Request $request [description]
*/
public function upload(Request $request)
{
$session = $request['session'];
// if (empty($request['file'])) {
// return response()->json(['ErrorCode' => 2, 'ErrorMessage' => '请上传文件', 'Data' => []]);
// }
$request['path'] = './afterSale/'.date('Ym');
$return_data = DealPicService::upload($request);
if ($return_data['code'] == 200) {
return response()->json(['ErrorCode' => 1, 'ErrorMessage' => '上传成功', 'Data' => $return_data['data']]);
} else {
return response()->json(['ErrorCode' => 2, 'ErrorMessage' => $return_data['msg'], 'Data' => '']);
}
}
/** /**
* 详情 * 详情
* @authors ldj * @authors ldj
* @email 909490343@qq.com * @email 909490343@qq.com
* @date 2024-09-12 * @date 2024-09-13
* @param Request $request [description] * @param Request $request [description]
* @return [type] [description] * @return [type] [description]
*/ */
...@@ -137,7 +75,7 @@ class StatementsListController extends Controller ...@@ -137,7 +75,7 @@ class StatementsListController extends Controller
} }
$data = $request->all(); $data = $request->all();
$data['ip'] = $request->ip(); $data['ip'] = $request->ip();
$return_data = AftersaleOrderService::info($data); $return_data = StatementsListService::info($data);
return response()->json($return_data); return response()->json($return_data);
} }
} }
app/Http/Controllers/DatasBase/TipsController.php
浏览文件 @ 3d00d75e
...@@ -24,9 +24,9 @@ class TipsController extends BaseController ...@@ -24,9 +24,9 @@ class TipsController extends BaseController
* @date 2021/9/10 * @date 2021/9/10
*/ */
public function index(Request $request){ public function index(Request $request){
if($admin_pt_id = $request->get('session_token')['admin_groupnew'] == 2){ 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(); $orderList = OrderList::where('stauas',20)->where('ser_id',$request->get('session_token')['id'])->get();
if(!empty($orderList)) { if(count($orderList)>0) {
$list[0]['msg'] = "您有新工单未领取"; $list[0]['msg'] = "您有新工单未领取";
$list[0]['count'] = count($orderList); $list[0]['count'] = count($orderList);
$list[0]['orderList'] = $orderList; $list[0]['orderList'] = $orderList;
......
app/Http/Controllers/Service/PayController.php
浏览文件 @ 3d00d75e
...@@ -100,8 +100,18 @@ class PayController extends BaseController ...@@ -100,8 +100,18 @@ class PayController extends BaseController
if ($v['reo_type'] == 1){ if ($v['reo_type'] == 1){
$list[$k]['reo_type_name'] = "充值"; $list[$k]['reo_type_name'] = "充值";
if ($v['reo_pay_way'] == 1){
$list[$k]['reo_pay_way_name'] = "微信";
}elseif($v['reo_pay_way'] == 2){
$list[$k]['reo_pay_way_name'] = "支付宝";
}elseif($v['reo_pay_way'] == 3){
$list[$k]['reo_pay_way_name'] = "线下打款";
} else {
$list[$k]['reo_pay_way_name'] = "--";
}
}elseif($v['reo_type'] == 2){ }elseif($v['reo_type'] == 2){
$list[$k]['reo_type_name'] = "扣费"; $list[$k]['reo_type_name'] = "扣费";
$list[$k]['reo_pay_way_name'] = "派单扣费";
} else { } else {
$list[$k]['reo_type_name'] = "--"; $list[$k]['reo_type_name'] = "--";
} }
...@@ -120,15 +130,7 @@ class PayController extends BaseController ...@@ -120,15 +130,7 @@ class PayController extends BaseController
$list[$k]['reo_client_type_name'] = "其他"; $list[$k]['reo_client_type_name'] = "其他";
} }
if ($v['reo_pay_way'] == 1){
$list[$k]['reo_pay_way_name'] = "微信";
}elseif($v['reo_pay_way'] == 2){
$list[$k]['reo_pay_way_name'] = "支付宝";
}elseif($v['reo_pay_way'] == 3){
$list[$k]['reo_pay_way_name'] = "线下打款";
} else {
$list[$k]['reo_pay_way_name'] = "--";
}
if ($v['reo_pay_time'] == '0000-00-00 00:00:00') { if ($v['reo_pay_time'] == '0000-00-00 00:00:00') {
$list[$k]['reo_pay_time'] = "--"; $list[$k]['reo_pay_time'] = "--";
} }
......
app/Http/Requests/Validators/Api/MobileWeb/StatementsListValidator.php
浏览文件 @ 3d00d75e
...@@ -40,44 +40,17 @@ class StatementsListValidator extends FormRequest ...@@ -40,44 +40,17 @@ class StatementsListValidator extends FormRequest
} }
// 详情验证器 // 详情验证器
public function handle_iveValidator($data) public function businessFirmValidator($data)
{ {
// 自定义错误消息 // 自定义错误消息
$messages = [ $messages = [
'id.required' => '请选择售后单id', 'id.required' => '请选择售后单id',
'id.integer' => '参数错误', 'id.integer' => '参数错误'
'quality_content.required' => '请输入处理内容',
'quality_content.max' => '参数错误',
'appoint_time.required' => '请选择预约时间',
];
// 数据验证
$validator = Validator::make($data, [
'id' => 'required|integer|min:1',
'quality_content' => 'required|string|max:50',
'appoint_time' => 'required',
], $messages);
// 判断数据验证是否成功
if ($validator->fails()) {
return $validator->errors();
}
}
// 日常反馈验证器
public function dailyFeedbackValidator($data)
{
// 自定义错误消息
$messages = [
'id.required' => '请选择售后单id',
'id.integer' => '参数错误',
'remark.required' => '请输入反馈内容',
]; ];
// 数据验证 // 数据验证
$validator = Validator::make($data, [ $validator = Validator::make($data, [
'id' => 'required|integer|min:1', 'id' => 'required|integer|min:1'
'remark' => 'required',
], $messages); ], $messages);
// 判断数据验证是否成功 // 判断数据验证是否成功
......
app/Services/OrderDeductionFeeService.php
浏览文件 @ 3d00d75e
...@@ -66,7 +66,7 @@ class OrderDeductionFeeService extends Service ...@@ -66,7 +66,7 @@ class OrderDeductionFeeService extends Service
$add_dfee['reo_pay_time'] = date('Y-m-d H:i:s'); $add_dfee['reo_pay_time'] = date('Y-m-d H:i:s');
$add_dfee['reo_pay_way'] = 1; $add_dfee['reo_pay_way'] = 1;
$add_dfee['reo_type'] = 2; $add_dfee['reo_type'] = 2;
$add_dfee['reo_client_type'] = 2; $add_dfee['reo_client_type'] = $find_company_info['com_type'];
$update['adre_banlance'] = $find_balance['adre_banlance'] + $data['reo_price']; $update['adre_banlance'] = $find_balance['adre_banlance'] + $data['reo_price'];
if (($update['adre_banlance'] + $find_balance['adre_credit_limit']) <= 0) { if (($update['adre_banlance'] + $find_balance['adre_credit_limit']) <= 0) {
return ['code'=>500, 'msg'=>'余额不足，请充值']; return ['code'=>500, 'msg'=>'余额不足，请充值'];
......
app/Services/OrderService.php
浏览文件 @ 3d00d75e
...@@ -979,7 +979,6 @@ class OrderService extends Service ...@@ -979,7 +979,6 @@ class OrderService extends Service
DB::beginTransaction(); DB::beginTransaction();
$shr_code = UserService::getUserBy('id', $orderinfo['new_customer_id'],['shr_code','is_jdservice']); $shr_code = UserService::getUserBy('id', $orderinfo['new_customer_id'],['shr_code','is_jdservice']);
if($shr_code['shr_code'] == ''){ if($shr_code['shr_code'] == ''){
// DB::beginTransaction();
$appoint_code = OrderService::creactCode($orderinfo['p_id']); $appoint_code = OrderService::creactCode($orderinfo['p_id']);
if($appoint_code){ if($appoint_code){
$user['shr_code'] = $appoint_code; $user['shr_code'] = $appoint_code;
...@@ -992,13 +991,11 @@ class OrderService extends Service ...@@ -992,13 +991,11 @@ class OrderService extends Service
DB::rollback(); DB::rollback();
return ['Data' => '', 'ErrorMessage' => '生成客户识别码失败，请重试！', 'ErrorCode' => ErrorInc::MYSQL_FAILED]; return ['Data' => '', 'ErrorMessage' => '生成客户识别码失败，请重试！', 'ErrorCode' => ErrorInc::MYSQL_FAILED];
} }
// DB::commit();
} }
if ($orderinfo['order_status'] > 10) { if ($orderinfo['order_status'] > 10) {
DB::rollback(); DB::rollback();
return ['Data' => '', 'ErrorMessage' => '派单失败，该订单状态不正确，请刷新核实！', 'ErrorCode' => ErrorInc::REQUEST_FORBIDDEN]; return ['Data' => '', 'ErrorMessage' => '派单失败，该订单状态不正确，请刷新核实！', 'ErrorCode' => ErrorInc::REQUEST_FORBIDDEN];
} else { } else {
$sub_types = PlatformService::getFieldsById($orderinfo['p_id'],['bus_type','pcl_id']); $sub_types = PlatformService::getFieldsById($orderinfo['p_id'],['bus_type','pcl_id']);
$pcl_id = $sub_types['pcl_id']; $pcl_id = $sub_types['pcl_id'];
$sub_type = $sub_types['bus_type']; $sub_type = $sub_types['bus_type'];
...@@ -1032,7 +1029,6 @@ class OrderService extends Service ...@@ -1032,7 +1029,6 @@ class OrderService extends Service
} }
} }
} }
// DB::commit();
}else{ }else{
return ['Data' => '', 'ErrorMessage' => '下属商品数据异常', 'ErrorCode' => ErrorInc::INVALID_PARAM]; return ['Data' => '', 'ErrorMessage' => '下属商品数据异常', 'ErrorCode' => ErrorInc::INVALID_PARAM];
} }
...@@ -1080,10 +1076,6 @@ class OrderService extends Service ...@@ -1080,10 +1076,6 @@ class OrderService extends Service
$pt_instData[]=$pt_install; $pt_instData[]=$pt_install;
DB::table('pt_installog')->insert($pt_instData); DB::table('pt_installog')->insert($pt_instData);
// if($pt_data['pt_warnamount'] >= ($pt_data['pt_prepamount']-$pt_data['pt_dispamount']) && $pt_data['pt_warnuserid']){
// //
// $this->addNotice_Message(3,1,1,2,[$pt_data['pt_warnuserid']],'预充值金额不足',"平台:".$pt_data['pt_name'].",预充值金额已低于上次充值的30%的份额了。请前往平台管理进行充值操作");
// }
}else{ }else{
$pt_res = true; $pt_res = true;
} }
...@@ -1155,15 +1147,12 @@ class OrderService extends Service ...@@ -1155,15 +1147,12 @@ class OrderService extends Service
/***订单操作时间***/ /***订单操作时间***/
$BaseController->operatingTime($number, '下单时间', $orderinfo['create_time'], $orderinfo['order_num'], $session['admin_acc']);//订单操作时间 $BaseController->operatingTime($number, '下单时间', $orderinfo['create_time'], $orderinfo['order_num'], $session['admin_acc']);//订单操作时间
$BaseController->operatingTime($number, '派单时间', date("Y-m-d H:i:s"), $orderinfo['order_num'], $session['admin_acc']);//订单操作时间 $BaseController->operatingTime($number, '派单时间', date("Y-m-d H:i:s"), $orderinfo['order_num'], $session['admin_acc']);//订单操作时间
// $BaseController->operatingTime($number, '起始时间', $payout_time, $orderinfo['order_num'], $session['admin_acc']);//订单操作时间
$BaseController->addThistory($number, 'tih_crecttime', $payout_time, $input['ser_id'], 1);//添加历史时间 $BaseController->addThistory($number, 'tih_crecttime', $payout_time, $input['ser_id'], 1);//添加历史时间
/***************半径推送******************************/ /***************半径推送******************************/
// $store=SyncStores::where("ser_id",$input['ser_id'])->where("type",2)->value('id');
$store = CommonService::getSyncStores($input['ser_id'], $orderinfo['category']); $store = CommonService::getSyncStores($input['ser_id'], $orderinfo['category']);
if(!empty($store)){ if(!empty($store)){
$pt_id_arr = PlatformService::getPtIdByPtType(); $pt_id_arr = PlatformService::getPtIdByPtType();
// $supply_price = DB::table('gh_price')->where(['goods_id'=>$v['goods_id'],'ser_id'=>'0'])->orderBy('id',"DESC")->value('supply_price');
if(in_array($orderinfo['p_id'], $pt_id_arr)){ if(in_array($orderinfo['p_id'], $pt_id_arr)){
$supply_price = GhXPrice::whereRaw("`goods_id`='" . $v['goods_id'] . "' and `ser_id`=0")->orderBy('id', 'DESC')->value('supply_price'); $supply_price = GhXPrice::whereRaw("`goods_id`='" . $v['goods_id'] . "' and `ser_id`=0")->orderBy('id', 'DESC')->value('supply_price');
}else { }else {
...@@ -1233,24 +1222,13 @@ class OrderService extends Service ...@@ -1233,24 +1222,13 @@ class OrderService extends Service
$arr['company_id'] = $orderinfo['company_id']; $arr['company_id'] = $orderinfo['company_id'];
$returnMan = Management::insert($arr); $returnMan = Management::insert($arr);
if ($returnOrderList) { if ($returnOrderList) {
// if(!empty($serid)){
// $weixin['ser_id'] = $serid;
// }else{
$weixin['ser_id'] = $input['ser_id']; $weixin['ser_id'] = $input['ser_id'];
// }
$weixin['order_num'] = $orderinfo['order_num']; $weixin['order_num'] = $orderinfo['order_num'];
$weixin['goods_name'] = '安装服务';//$v['goods_name']; $weixin['goods_name'] = '安装服务';//$v['goods_name'];
$weixin['serial_number'] = $number; $weixin['serial_number'] = $number;
$weixin['dress'] = $shr_phone['shr_sheng'].$shr_phone['shr_shi'].$shr_phone['shr_xian'].$shr_phone['shr_adress']; $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);
/* if($v['category']==3) {
$smart_store = $input['smart_store']??1;
if($input['ser_id']<>'2006' && $input['ser_id']<>'2446' && $input['ser_id']<>'2445' && $input['ser_id']<>'3618' && $input['ser_id']<>'2697' && $input['ser_id']<>'4012' && $input['ser_id']<>'7098' && $input['ser_id']<>'7099' && $input['ser_id']<>'7655' && $smart_store !=2) {
self::server_order($orderinfo['p_id'], $input['sys_num'], $orderinfo['new_customer_id'], $v['id'], $input['ser_id'], $orderinfo['order_num'], $session);
}
}*/
/*--------------------------添加订单执行统计记录开始------------------------------------*/ /*--------------------------添加订单执行统计记录开始------------------------------------*/
$relation['sys_num'] = $input['sys_num'];//系统单号 $relation['sys_num'] = $input['sys_num'];//系统单号
...@@ -1273,7 +1251,6 @@ class OrderService extends Service ...@@ -1273,7 +1251,6 @@ class OrderService extends Service
/*--------------------------添加订单执行统计记录结束------------------------------------*/ /*--------------------------添加订单执行统计记录结束------------------------------------*/
/*--------------------------添加工单回访记录开始------------------------------------*/ /*--------------------------添加工单回访记录开始------------------------------------*/
// $visit_sys = OrderVisit::where('ov_sys', $input['sys_num'])->value("ov_id");
$visit_data['ov_serial'] = $number; $visit_data['ov_serial'] = $number;
$visit_data['ov_sys'] = $input['sys_num']; $visit_data['ov_sys'] = $input['sys_num'];
$visit_data['ov_order'] = $orderinfo['order_num']; $visit_data['ov_order'] = $orderinfo['order_num'];
...@@ -1305,9 +1282,13 @@ class OrderService extends Service ...@@ -1305,9 +1282,13 @@ class OrderService extends Service
// 扣费 // 扣费
$post_data['adm_id'] = $orderinfo['admin_id']; $post_data['adm_id'] = $orderinfo['admin_id'];
$post_data['company_id'] = $orderinfo['company_id']; $post_data['company_id'] = $orderinfo['company_id'];
$post_data['order_number'] = $orderinfo['sys_num']; $post_data['order_number'] = $input['sys_num'];
$post_data['reo_price'] = -0.5; $post_data['reo_price'] = -0.5;
$reduce_price = OrderDeductionFeeService::deductFee($post_data); $reduce_price = OrderDeductionFeeService::deductFee($post_data);
if ($reduce_price['code'] == 500) {
DB::rollback();
return ['Data' => '', 'ErrorMessage' =>$reduce_price['msg'], 'ErrorCode' => 2];
}
if ($returnOrder && $returnOrderList && $returnMan && $pt_res) { if ($returnOrder && $returnOrderList && $returnMan && $pt_res) {
DB::commit(); DB::commit();
......
routes/api.php
浏览文件 @ 3d00d75e
...@@ -1472,5 +1472,7 @@ Route::namespace('Api')->group(function () { ...@@ -1472,5 +1472,7 @@ Route::namespace('Api')->group(function () {
// 账单列表 // 账单列表
Route::post('w1/statement/index','MobileWeb\StatementsListController@index');//列表页 Route::post('w1/statement/index','MobileWeb\StatementsListController@index');//列表页
Route::post('w1/statement/info','MobileWeb\StatementsListController@info');//列表页
Route::post('w1/statement/businessFirm','MobileWeb\StatementsListController@businessFirm');//商家确认
}); });
}); });
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论