Commit bd13b9cd authored by 蒋林's avatar 蒋林

1. 搜索维修单

2. 获取维修单详情
3. api返回修改
parent 38adbe41
......@@ -6,74 +6,9 @@ defined('BASEPATH') OR exit('No direct script access allowed');
*/
class Welcome extends BaseController {
public function order()
{
$this->load->config('account', true);
$account = $this->config->item('account');
$galanzAccount = $account['galanz'];
var_dump($galanzAccount);die();
$this->load->library('Source/SourceGalanz', $galanzAccount['c01000005'], 'SourceGalanz');
$order = $this->SourceGalanz->OrderDetail('8e2a13a1-5624-4b1e-a36f-93adcc08befa');
echo "<pre>";
print_r($order);
}
public function t()
{
$this->load->library('Push/PushGalanz', null, 'PushGalanz');
$result = $this->PushGalanz->GetToken();
print_r($result);
echo '11';
}
public function api()
{
$this->load->library('Receive/ReceiveGalanz', null, 'ReceiveGalanz');
$data['appid'] = '10001';
$data['out_trade_no'] = 'CALL2016082200544';
$data['nonce_str'] = $this->ReceiveGalanz->GetNonceStr();
$this->ReceiveGalanz->SetValues($data);
$this->ReceiveGalanz->SetSign();
$values = $this->ReceiveGalanz->GetValues();
$url = "http://testwxh.pp.cc/api/galanz/getOrderDetail";
$result = $this->curlPost($url, $values);
$result['data'] = json_decode($result['data'], true);
echo "<pre>";
print_r($result);
}
protected function curlGet($url) {
$curl = curl_init();
curl_setopt($curl, CURLOPT_URL, $url);
curl_setopt($curl, CURLOPT_HEADER, 0);
curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
$result = curl_exec($curl); //执行cURL抓取页面内容
$code = curl_getinfo($curl, CURLINFO_HTTP_CODE);
curl_close($curl);
return ['code' => $code, 'data' => $result];
}
protected function curlPost($url, $post) {
$curl = curl_init();
curl_setopt($curl, CURLOPT_URL, $url);
curl_setopt($curl, CURLOPT_HEADER, 0);
curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($curl, CURLOPT_POSTFIELDS, http_build_query($post));
$result = curl_exec($curl);
$code = curl_getinfo($curl, CURLINFO_HTTP_CODE);
curl_close($curl);
return ['code' => $code, 'data' => $result];
}
}
......@@ -20,33 +20,21 @@ defined('BASEPATH') OR exit('No direct script access allowed');
class Galanz extends BaseController
{
protected static $receiveGalanzObj = null;
public function __construct()
{
parent::__construct();
$this->load->library('Receive/ReceiveGalanz', null, 'ReceiveGalanz');
self::$receiveGalanzObj = $this->ReceiveGalanz;
}
private function getAccount($username)
{
$this->load->config('account', true);
$account = $this->config->item('account');
$galanzAccount = $account['galanz'];
return $galanzAccount[$username];
}
//订单详情
public function getOrderDetail()
{
$param = $this->input->post();
//验证参数
self::$receiveGalanzObj->SetValues($param);
self::$receiveGalanzObj->CheckGetOrderDetailValues();
$values = self::$receiveGalanzObj->GetValues();
$obj = $this->receiveGalanzObj();
$obj->SetValues($param);
$obj->CheckGetOrderDetailValues();
$values = $obj->GetValues();
$this->saveLog($values['out_trade_no'], 'getOrderDetail', $param);
......@@ -54,31 +42,37 @@ class Galanz extends BaseController
$info = $this->galanz_model->infoByNewName($values['out_trade_no']);
if (empty($info)) {
self::$receiveGalanzObj->ReturnMessage('10101', '订单不存在');
$obj->ReturnMessage(false, '订单不存在');
}
//订单账号
$account = $this->getAccount($info['new_username']);
//订单详情
$sourceGalanzObj = $this->sourceGalanzObj($info['new_username'], $obj);
$order = $sourceGalanzObj->OrderDetail($info['new_id']);
$obj->ReturnMessage(true, '', $order);
}
//获取订单详情
$this->load->library('Source/SourceGalanz', $account, 'SourceGalanz');
$order = $this->SourceGalanz->OrderDetail($info['new_id']);
//搜索订单
public function searchOrder()
{
self::$receiveGalanzObj->ReturnMessage('10000', '', $order);
}
//搜索维修单
//保存订单
public function saveOrder()
{
$param = $this->input->post();
//验证参数
self::$receiveGalanzObj->SetValues($param);
self::$receiveGalanzObj->CheckSaveOrderValues();
$obj = $this->receiveGalanzObj();
$obj->SetValues($param);
$obj->CheckSaveOrderValues();
$values = $obj->GetValues();
$this->saveLog('', 'saveOrder', $param);
self::$receiveGalanzObj->ReturnMessage('10000');
$obj->ReturnMessage(true, '', $values);
}
//拒绝订单
......@@ -87,12 +81,13 @@ class Galanz extends BaseController
$param = $this->input->post();
//验证参数
self::$receiveGalanzObj->SetValues($param);
self::$receiveGalanzObj->CheckRefuseOrderValues();
$obj = $this->receiveGalanzObj();
$obj->SetValues($param);
$obj->CheckRefuseOrderValues();
$values = $obj->GetValues();
$this->saveLog('', 'refuseOrder', $param);
self::$receiveGalanzObj->ReturnMessage('10000');
$obj->ReturnMessage(true, '', $values);
}
//接受订单
......@@ -101,12 +96,13 @@ class Galanz extends BaseController
$param = $this->input->post();
//验证参数
self::$receiveGalanzObj->SetValues($param);
self::$receiveGalanzObj->CheckAcceptOrderValues();
$obj = $this->receiveGalanzObj();
$obj->SetValues($param);
$obj->CheckAcceptOrderValues();
$values = $obj->GetValues();
$this->saveLog('', 'acceptOrder', $param);
self::$receiveGalanzObj->ReturnMessage('10000');
$obj->ReturnMessage(true, '', $values);
}
//转录维修单
......@@ -115,12 +111,13 @@ class Galanz extends BaseController
$param = $this->input->post();
//验证参数
self::$receiveGalanzObj->SetValues($param);
self::$receiveGalanzObj->CheckCreateWorkOrderValues();
$obj = $this->receiveGalanzObj();
$obj->SetValues($param);
$obj->CheckCreateWorkOrderValues();
$values = $obj->GetValues();
$this->saveLog('', 'createWorkOrder', $param);
self::$receiveGalanzObj->ReturnMessage('10000');
$obj->ReturnMessage(true, '', $values);
}
//转录安装单
......@@ -129,13 +126,13 @@ class Galanz extends BaseController
$param = $this->input->post();
//验证参数
self::$receiveGalanzObj->SetValues($param);
self::$receiveGalanzObj->CheckCreateUserprofileOrderValues();
$obj = $this->receiveGalanzObj();
$obj->SetValues($param);
$obj->CheckCreateUserprofileOrderValues();
$values = $obj->GetValues();
$this->saveLog('', 'createUserprofileOrder', $param);
self::$receiveGalanzObj->ReturnMessage('10000');
$obj->ReturnMessage(true, '', $values);
}
private function saveLog($search, $method, $data)
......@@ -145,4 +142,25 @@ class Galanz extends BaseController
$this->api_log_model->add($search, 'galanz', $method, $data);
}
private function receiveGalanzObj()
{
$this->load->library('Receive/ReceiveGalanz', null, 'ReceiveGalanz');
return $this->ReceiveGalanz;
}
private function sourceGalanzObj($username, $obj)
{
$this->load->config('account', true);
$account = $this->config->item('account');
$galanzAccount = $account['galanz'];
if (!array_key_exists($username, $galanzAccount)) {
$obj->ReturnMessage(false, '用户名不存在');
}
$this->load->library('Source/SourceGalanz', $galanzAccount[$username], 'SourceGalanz');
return $this->SourceGalanz;
}
}
\ No newline at end of file
......@@ -65,7 +65,7 @@ class Galanz extends BaseController
$endTime = date("Y/m/d", strtotime($nowTime) + 86400);
$orders = $this->SourceGalanz->SearchOrder($startTime, $endTime);
$orders = $this->SourceGalanz->SearchOrder('', '', $startTime, $endTime);
if (empty($orders)) {
return false;
......
<?php
/**
* Created by PhpStorm.
* User: LinJiangL
* Date: 16/8/23
* Time: 下午1:58
*/
defined('BASEPATH') OR exit('No direct script access allowed');
/**
* 接口测试
*
* @property SourceGalanz SourceGalanz
*/
class Rgalanz extends BaseController
{
public function getOrderDetail()
{
$obj = $this->galanzObj();
$data['appid'] = '10001';
$data['out_trade_no'] = 'CALL2016082200544';
$data['nonce_str'] = $obj->GetNonceStr();
$obj->SetValues($data);
$obj->SetSign();
$values = $obj->GetValues();
$url = "http://wxh.pp.cn/api/galanz/getOrderDetail";
$result = $this->curlPost($url, $values);
$result['data'] = json_decode($result['data'], true);
$this->show($result['data']);
}
private function galanzObj()
{
$this->load->library('Receive/ReceiveGalanz', null, 'ReceiveGalanz');
return $this->ReceiveGalanz;
}
private function show($data)
{
echo "<pre>";
print_r($data);
}
protected function curlPost($url, $post) {
$curl = curl_init();
curl_setopt($curl, CURLOPT_URL, $url);
curl_setopt($curl, CURLOPT_HEADER, 0);
curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($curl, CURLOPT_POSTFIELDS, http_build_query($post));
$result = curl_exec($curl);
$code = curl_getinfo($curl, CURLINFO_HTTP_CODE);
curl_close($curl);
return ['code' => $code, 'data' => $result];
}
}
\ No newline at end of file
<?php
/**
* Created by PhpStorm.
* User: LinJiangL
* Date: 16/8/23
* Time: 下午1:58
*/
defined('BASEPATH') OR exit('No direct script access allowed');
/**
* 抓取数据接口测试
*
* @property SourceGalanz SourceGalanz
*/
class Sgalanz extends BaseController
{
public function searchOrder()
{
$obj = $this->galanzObj();
$list = $obj->SearchOrder('CALL2016082203611');
$this->show($list);
}
public function orderDetail()
{
$obj = $this->galanzObj();
$list = $obj->OrderDetail('3911c4cd-6855-4a2c-8085-6e489972e6a3');
$this->show($list);
}
public function searchWorkOrder()
{
$obj = $this->galanzObj();
$list = $obj->SearchWorkOrder('WO2016082204280');
$this->show($list);
}
public function workOrderDetail()
{
$obj = $this->galanzObj();
$list = $obj->WorkOrderDetail('07ef7b0e-9788-4d05-88a5-25adc4406aef');
$this->show($list);
}
private function galanzObj($username = 'c01000005')
{
$this->load->config('account', true);
$account = $this->config->item('account');
$galanzAccount = $account['galanz'];
$this->load->library('Source/SourceGalanz', $galanzAccount[$username], 'SourceGalanz');
return $this->SourceGalanz;
}
private function show($data)
{
echo "<pre>";
print_r($data);
}
}
\ No newline at end of file
......@@ -159,12 +159,12 @@ class Receive
/**
* 返回数据
* @param string $code
* @param string $data
* @param bool $code
* @param string $msg
* @return array
* @param array $data
* @return string
*/
public function ReturnMessage($code = '10000', $msg = '', $data = '')
public function ReturnMessage($code= true, $msg = '', $data = [])
{
echo $this->SetErrorCode($code, $msg, $data);
die();
......@@ -172,23 +172,25 @@ class Receive
/**
* 返回数据
* @param string $code
* @param string $data
* @param bool $code
* @param string $msg
* @return array
* @param array $data
* @return string
*/
public function SetErrorCode($code = '10000', $msg = '', $data = '')
public function SetErrorCode($code= true, $msg = '', $data = [])
{
$error = [
'10000' => 'OK',
'10001' => 'APPID错误',
'10002' => '签名错误',
'10999' => '参数错误',
];
$return['return_code'] = $code ? 'SUCCESS' : 'FAIL';
$return['return_msg'] = $code ? '成功' : $msg;
$msg = isset($error[$code]) ? $error[$code] : $msg;
if ($data) {
if (!is_array($data)) {
$return['return_data'] = $data;
}
$return = array_merge($return, $data);
}
return json_encode(['code' => $code, 'msg' => $msg, 'data' => $data], JSON_UNESCAPED_UNICODE);
return json_encode($return, JSON_UNESCAPED_UNICODE);
}
}
\ No newline at end of file
......@@ -14,15 +14,15 @@ class ReceiveGalanz extends Receive
public function CheckPublicValues()
{
if (!$this->GetValues()) {
$this->ReturnMessage('10999');
$this->ReturnMessage(false, '参数错误!');
}
if ($this->CheckAppid() == false) {
$this->ReturnMessage('10001');
$this->ReturnMessage(false, '缺少appid参数!');
}
if ($this->CheckSign() == false) {
$this->ReturnMessage('10002');
$this->ReturnMessage(false, '签名错误!');
}
}
......@@ -34,7 +34,7 @@ class ReceiveGalanz extends Receive
$this->CheckPublicValues();
if (!array_key_exists('out_trade_no', $this->values) || $this->values['out_trade_no'] == '') {
$this->ReturnMessage('10003', '缺少out_trade_no参数!');
$this->ReturnMessage(false, '缺少out_trade_no参数!');
}
}
......
# Netscape HTTP Cookie File
# https://curl.haxx.se/docs/http-cookies.html
# This file was generated by libcurl! Edit at your own risk.
#HttpOnly_202.104.26.131 FALSE / FALSE 0 ASP.NET_SessionId s25qsykf2gs54yyimlfkg3te
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment