Skip to content

Commit 56db29b

Browse files
thisliuthisliu
authored
Merge pull request #19 from finecho/analysis-8QnGgO
Apply fixes from StyleCI
2 parents 2e2a6bd + 0331720 commit 56db29b

File tree

2 files changed

+78
-60
lines changed

2 files changed

+78
-60
lines changed

‎src/Providers/Kdniao.php‎

Lines changed: 73 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -36,51 +36,72 @@ class Kdniao extends AbstractProvider
3636

3737
const LOGISTICS_COM_CODE_URL = 'http://api.kdniao.com/Ebusiness/EbusinessOrderHandle.aspx';
3838

39-
const SUCCESS_STATUS = 200;
40-
const STATUS_ERROR = -1;
41-
const STATUS_NO_TRACK = 0;
42-
const STATUS_PACKAGE = 1;
43-
const STATUS_ON_THE_WAY = 2;
44-
const STATUS_SIGNING = 3;
45-
const STATUS_QUESTION_PACKAGE = 4;
46-
const STATUS_IN_THE_CITY = 201;
47-
const STATUS_IN_THE_PACKAGE = 202;
48-
const STATUS_DIEPOSIT_ARK = 211;
49-
const STATUS_NORMAL_SIGNING = 301;
50-
const STATUS_ABNORMAL_SIGNING = 302;
51-
const STATUS_ISSUING_SIGNING = 304;
52-
const STATUS_ARK_SIGNING = 311;
53-
const STATUS_NO_DELIVERY_INFO = 401;
39+
const SUCCESS_STATUS = 200;
40+
41+
const STATUS_ERROR = -1;
42+
43+
const STATUS_NO_TRACK = 0;
44+
45+
const STATUS_PACKAGE = 1;
46+
47+
const STATUS_ON_THE_WAY = 2;
48+
49+
const STATUS_SIGNING = 3;
50+
51+
const STATUS_QUESTION_PACKAGE = 4;
52+
53+
const STATUS_IN_THE_CITY = 201;
54+
55+
const STATUS_IN_THE_PACKAGE = 202;
56+
57+
const STATUS_DIEPOSIT_ARK = 211;
58+
59+
const STATUS_NORMAL_SIGNING = 301;
60+
61+
const STATUS_ABNORMAL_SIGNING = 302;
62+
63+
const STATUS_ISSUING_SIGNING = 304;
64+
65+
const STATUS_ARK_SIGNING = 311;
66+
67+
const STATUS_NO_DELIVERY_INFO = 401;
68+
5469
const STATUS_TIMEOUT_NOT_SIGNING = 402;
55-
const STATUS_TIMEOUT_NOT_UPDATE = 403;
56-
const STATUS_RETURN_PACKAGE = 404;
57-
const STATUS_PACKAGE_ERROR = 405;
58-
const STATUS_RETURN_SINGNING = 406;
70+
71+
const STATUS_TIMEOUT_NOT_UPDATE = 403;
72+
73+
const STATUS_RETURN_PACKAGE = 404;
74+
75+
const STATUS_PACKAGE_ERROR = 405;
76+
77+
const STATUS_RETURN_SINGNING = 406;
78+
5979
const STATUS_RETURN_NOT_SINGNING = 407;
60-
const STATUS_ARK_NOT_SINGNING = 412;
80+
81+
const STATUS_ARK_NOT_SINGNING = 412;
6182

6283
const STATUS_LABELS = [
63-
self::STATUS_ERROR => '异常',
64-
self::STATUS_NO_TRACK => '无轨迹',
65-
self::STATUS_PACKAGE => '已揽收',
66-
self::STATUS_SIGNING => '已签收',
67-
self::STATUS_ON_THE_WAY => '在途中',
68-
self::STATUS_QUESTION_PACKAGE => '问题件',
69-
self::STATUS_IN_THE_CITY => '到达派件城市',
70-
self::STATUS_IN_THE_PACKAGE => '派件中',
71-
self::STATUS_DIEPOSIT_ARK => '已放入快递柜或驿站',
72-
self::STATUS_NORMAL_SIGNING => '正常签收',
73-
self::STATUS_ABNORMAL_SIGNING => '派件异常后最终签收',
74-
self::STATUS_ISSUING_SIGNING => '代收签收',
75-
self::STATUS_ARK_SIGNING => '快递柜或驿站签收',
76-
self::STATUS_NO_DELIVERY_INFO => '发货无信息',
84+
self::STATUS_ERROR => '异常',
85+
self::STATUS_NO_TRACK => '无轨迹',
86+
self::STATUS_PACKAGE => '已揽收',
87+
self::STATUS_SIGNING => '已签收',
88+
self::STATUS_ON_THE_WAY => '在途中',
89+
self::STATUS_QUESTION_PACKAGE => '问题件',
90+
self::STATUS_IN_THE_CITY => '到达派件城市',
91+
self::STATUS_IN_THE_PACKAGE => '派件中',
92+
self::STATUS_DIEPOSIT_ARK => '已放入快递柜或驿站',
93+
self::STATUS_NORMAL_SIGNING => '正常签收',
94+
self::STATUS_ABNORMAL_SIGNING => '派件异常后最终签收',
95+
self::STATUS_ISSUING_SIGNING => '代收签收',
96+
self::STATUS_ARK_SIGNING => '快递柜或驿站签收',
97+
self::STATUS_NO_DELIVERY_INFO => '发货无信息',
7798
self::STATUS_TIMEOUT_NOT_SIGNING => '超时未签收',
78-
self::STATUS_TIMEOUT_NOT_UPDATE => '超时未更新',
79-
self::STATUS_RETURN_PACKAGE => '拒收(退件)',
80-
self::STATUS_PACKAGE_ERROR => '派件异常',
81-
self::STATUS_RETURN_SINGNING => '退货签收',
99+
self::STATUS_TIMEOUT_NOT_UPDATE => '超时未更新',
100+
self::STATUS_RETURN_PACKAGE => '拒收(退件)',
101+
self::STATUS_PACKAGE_ERROR => '派件异常',
102+
self::STATUS_RETURN_SINGNING => '退货签收',
82103
self::STATUS_RETURN_NOT_SINGNING => '退货未签收',
83-
self::STATUS_ARK_NOT_SINGNING => '快递柜或驿站超时未取',
104+
self::STATUS_ARK_NOT_SINGNING => '快递柜或驿站超时未取',
84105
];
85106

86107
/**
@@ -95,7 +116,6 @@ class Kdniao extends AbstractProvider
95116
*/
96117
public function order($no, $company = null)
97118
{
98-
99119
if (empty($company)) {
100120
$query['LogisticCode'] = $no;
101121

@@ -113,9 +133,8 @@ public function order($no, $company = null)
113133

114134
$param['ShipperCode'] = $response['Shippers'][0]['ShipperCode'];
115135
} else {
116-
117136
$param['ShipperCode'] = $this->getLogisticsCompanyAliases($company);
118-
$this->company = $company;
137+
$this->company = $company;
119138
}
120139

121140
$param['LogisticCode'] = $no;
@@ -125,7 +144,7 @@ public function order($no, $company = null)
125144
$response = $this->sendRequestPost(self::LOGISTICS_INFO_URL, $params, [], self::SUCCESS_STATUS);
126145

127146
// 处理未付费用户
128-
if ($response && $response['Success'] == false) {
147+
if ($response && false == $response['Success']) {
129148
$params['RequestType'] = self::KDNIAO_NOT_PAY;
130149

131150
$response = $this->sendRequestPost(
@@ -140,20 +159,19 @@ public function order($no, $company = null)
140159
}
141160

142161
/**
143-
* @param $requestData
144-
* @param $requestType
162+
* @param $requestData
163+
* @param $requestType
145164
*
146165
* @return array
147-
*
148166
*/
149167
private function getRequestParams($requestData, $requestType = self::KDNIAO_PAY)
150168
{
151169
return [
152170
'EBusinessID' => $this->config[\strtolower(self::PROVIDER_NAME)]['customer'],
153-
'DataType' => self::KDNIAO_DATA_TYPE,
171+
'DataType' => self::KDNIAO_DATA_TYPE,
154172
'RequestType' => $requestType,
155173
'RequestData' => \urlencode(\json_encode($requestData)),
156-
'DataSign' => $this->generateSign($requestData, $this->config[\strtolower(self::PROVIDER_NAME)]['app_code']),
174+
'DataSign' => $this->generateSign($requestData, $this->config[\strtolower(self::PROVIDER_NAME)]['app_code']),
157175
];
158176
}
159177

@@ -199,12 +217,12 @@ protected function mapLogisticsOrderToObject($logisticsOrder)
199217
$list = $this->resetList($logisticsOrder['Traces']);
200218

201219
return new Order([
202-
'code' => self::GLOBAL_SUCCESS_CODE,
203-
'msg' => self::GLOBAL_SUCCESS_MSG,
204-
'company' => $this->company ?: $logisticsOrder['ShipperCode'],
205-
'no' => $logisticsOrder['LogisticCode'],
206-
'status' => \in_array($status, \array_keys(self::STATUS_LABELS)) ? self::STATUS_LABELS[$status] : self::STATUS_LABELS[self::STATUS_ERROR],
207-
'list' => $list,
220+
'code' => self::GLOBAL_SUCCESS_CODE,
221+
'msg' => self::GLOBAL_SUCCESS_MSG,
222+
'company' => $this->company ?: $logisticsOrder['ShipperCode'],
223+
'no' => $logisticsOrder['LogisticCode'],
224+
'status' => \in_array($status, \array_keys(self::STATUS_LABELS)) ? self::STATUS_LABELS[$status] : self::STATUS_LABELS[self::STATUS_ERROR],
225+
'list' => $list,
208226
'original' => $logisticsOrder,
209227
]);
210228
}
@@ -265,6 +283,6 @@ public function getProviderName()
265283
*/
266284
protected function generateSign($param, $key)
267285
{
268-
return urlencode(base64_encode(md5(\json_encode($param) . $key)));
286+
return urlencode(base64_encode(md5(\json_encode($param).$key)));
269287
}
270288
}

‎tests/Providers/KdniaoProviderTest.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ public function testGetLogisticsInfo()
3131
$config = [
3232
'provider' => 'kdniao',
3333

34-
'kdniao' => [
34+
'kdniao' => [
3535
'app_code' => 'd7696d82-95d5-4922-ab95-4e0adee0fe8c',
3636
'customer' => '1270293',
37-
]];
37+
], ];
3838

3939
$response = '{
4040
"LogisticCode": "805741929402797742",
@@ -84,16 +84,16 @@ public function testGetLogisticsInfo()
8484

8585
$response = json_decode($response, true);
8686

87-
$Kdniao = \Mockery::mock(Kdniao::class . '[post]', [$config])->shouldAllowMockingProtectedMethods();
87+
$Kdniao = \Mockery::mock(Kdniao::class.'[post]', [$config])->shouldAllowMockingProtectedMethods();
8888

8989
$param = ['ShipperCode' => 'YTO', 'LogisticCode' => '805741929402797742'];
9090

9191
$params = [
9292
'EBusinessID' => $config['kdniao']['customer'],
9393
'RequestType' => 8001,
94-
'DataType' => 2,
94+
'DataType' => 2,
9595
'RequestData' => \urlencode(\json_encode($param)),
96-
'DataSign' => urlencode(base64_encode(md5(\json_encode($param) . $config['kdniao']['app_code']))),
96+
'DataSign' => urlencode(base64_encode(md5(\json_encode($param).$config['kdniao']['app_code']))),
9797
];
9898

9999
$Kdniao->shouldReceive('post')->with(

0 commit comments

Comments
 (0)