Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

modify stats #468

Merged
merged 10 commits into from
Jul 22, 2016
Merged

modify stats #468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8f643d7
card module.
wangniuniu Jul 18, 2016
b1e18f9
card module
wangniuniu Jul 18, 2016
e9dcdee
2016-7-18 update
wangniuniu Jul 18, 2016
7a7aaa5
2016-7-18 Code Standard
wangniuniu Jul 18, 2016
a950a77
2016-7-18 Code Standard E
wangniuniu Jul 18, 2016
c170a57
2016-7-18 Code Standard L
wangniuniu Jul 18, 2016
c39aacb
rename function
wangniuniu Jul 19, 2016
0107ed7
edit function
wangniuniu Jul 22, 2016
49311b4
Conflict resolution
wangniuniu Jul 22, 2016
36fbbcf
conflict resolution
wangniuniu Jul 22, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 22 additions & 22 deletions src/Card/Card.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ public function showQRCode($ticket = null)
'reason' => $response->getReasonPhrase(),
'headers' => $response->getHeaders(),
'body' => strval($response->getBody()),
'url' => self::API_SHOW_QRCODE.'?'.http_build_query($params),
'url' => self::API_SHOW_QRCODE . '?' . http_build_query($params),
];
}

Expand All @@ -153,7 +153,7 @@ public function showQRCode($ticket = null)
*/
public function getQRCodeUrl($ticket)
{
return self::API_SHOW_QRCODE.'?ticket='.$ticket;
return self::API_SHOW_QRCODE . '?ticket=' . $ticket;
}

/**
Expand All @@ -165,7 +165,7 @@ public function getQRCodeUrl($ticket)
*/
public function getAPITicket($refresh = false)
{
$key = self::TICKET_CACHE_PREFIX.$this->getAccessToken()->getAppId();
$key = self::TICKET_CACHE_PREFIX . $this->getAccessToken()->getAppId();

$ticket = $this->getCache()->fetch($key);

Expand Down Expand Up @@ -206,12 +206,12 @@ public function attachExtension($cardId, array $extension = [])
{
$timestamp = time();
$ext = [
'code' => Arr::get($extension, 'code'),
'openid' => Arr::get($extension, 'openid', Arr::get($extension, 'open_id')),
'timestamp' => $timestamp,
'outer_id' => Arr::get($extension, 'outer_id'),
'balance' => Arr::get($extension, 'balance'),
];
'code' => Arr::get($extension, 'code'),
'openid' => Arr::get($extension, 'openid', Arr::get($extension, 'open_id')),
'timestamp' => $timestamp,
'outer_id' => Arr::get($extension, 'outer_id'),
'balance' => Arr::get($extension, 'balance'),
];
$ext['signature'] = $this->getSignature(
$this->getAPITicket(),
$timestamp,
Expand All @@ -222,9 +222,9 @@ public function attachExtension($cardId, array $extension = [])
);

return [
'cardId' => $cardId,
'cardExt' => json_encode($ext),
];
'cardId' => $cardId,
'cardExt' => json_encode($ext),
];
}

/**
Expand Down Expand Up @@ -686,16 +686,16 @@ public function createSubMerchant(array $info = [])
{
$params = [
'info' => Arr::only($info, [
'brand_name',
'logo_url',
'protocol',
'end_time',
'primary_category_id',
'secondary_category_id',
'agreement_media_id',
'operator_media_id',
'app_id',
]),
'brand_name',
'logo_url',
'protocol',
'end_time',
'primary_category_id',
'secondary_category_id',
'agreement_media_id',
'operator_media_id',
'app_id',
]),
];

return $this->parseJSON('json', [self::API_CREATE_SUB_MERCHANT, $params]);
Expand Down
74 changes: 70 additions & 4 deletions src/Stats/Stats.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,12 @@ class Stats extends AbstractAPI
const API_INTERFACE_SUMMARY = 'https://api.weixin.qq.com/datacube/getinterfacesummary';
// 获取接口分析分时数据
const API_INTERFACE_SUMMARY_HOURLY = 'https://api.weixin.qq.com/datacube/getinterfacesummaryhour';
// 拉取卡券概况数据接口
const API_CARD_SUMMARY = 'https://api.weixin.qq.com/datacube/getcardbizuininfo';
// 获取免费券数据接口
const API_FREE_CARD_SUMMARY = 'https://api.weixin.qq.com/datacube/getcardcardinfo';
// 拉取会员卡数据接口
const API_MEMBER_CARD_SUMMARY = 'https://api.weixin.qq.com/datacube/getcardmembercardinfo';

/**
* 获取用户增减数据.
Expand Down Expand Up @@ -283,6 +289,62 @@ public function interfaceSummaryHourly($from, $to)
return $this->query(self::API_INTERFACE_SUMMARY_HOURLY, $from, $to);
}

/**
* 拉取卡券概况数据接口.
*
* @param string $from
* @param string $to
* @param int $condSource
*
* @return array
*/
public function cardSummary($from, $to, $condSource = 0)
{
$ext = [
'cond_source' => intval($condSource),
];

return $this->query(self::API_CARD_SUMMARY, $from, $to, $ext);
}

/**
* 获取免费券数据接口.
*
* @param string $from
* @param string $to
* @param int $condSource
* @param string $cardId
*
* @return array
*/
public function freeCardSummary($from, $to, $condSource = 0, $cardId = '')
{
$ext = [
'cond_source' => intval($condSource),
'card_id' => $cardId,
];

return $this->query(self::API_FREE_CARD_SUMMARY, $from, $to, $ext);
}

/**
* 拉取会员卡数据接口.
*
* @param string $from
* @param string $to
* @param int $condSource
*
* @return array
*/
public function memberCardSummary($from, $to, $condSource = 0)
{
$ext = [
'cond_source' => intval($condSource),
];

return $this->query(self::API_MEMBER_CARD_SUMMARY, $from, $to, $ext);
}

/**
* 查询数据.
*
Expand All @@ -292,12 +354,16 @@ public function interfaceSummaryHourly($from, $to)
*
* @return array
*/
protected function query($api, $from, $to)
protected function query($api, $from, $to, array $ext = [])
{
$params = [
'begin_date' => $from,
'end_date' => $to,
];
'begin_date' => $from,
'end_date' => $to,
];

if (!empty($ext)) {
$params = array_merge($params, $ext);
}

return $this->parseJSON('json', [$api, $params]);
}
Expand Down
11 changes: 3 additions & 8 deletions tests/Card/CardTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,6 @@ public function testCheckCode()
$card = $this->getCard();

$cardId = 'pdkJ9uLCEF_HSKO7JdQOUcZ-PUzo';

$code = ['807732265476', '22222', '33333'];

$result = $card->checkCode($cardId, $code);
Expand Down Expand Up @@ -312,12 +311,10 @@ public function testSetTestWhitelist()
$openids = ['foo', 'bar', 'baz'];
$usernames = ['tianye0327', 'iovertrue'];


// openids
$result = $card->setTestWhitelist($openids);
$this->assertStringStartsWith(Card::API_SET_TEST_WHITE_LIST, $result['api']);
$this->assertEquals($openids, $result['params']['openid']);

// usernames
$result = $card->setTestWhitelistByUsername($usernames);
$this->assertStringStartsWith(Card::API_SET_TEST_WHITE_LIST, $result['api']);
Expand Down Expand Up @@ -360,6 +357,7 @@ public function testDecryptCode()
$card = $this->getCard();

$encryptedCode = 'XXIzTtMqCxwOaawoE91+VJdsFmv7b8g0VZIZkqf4GWA60Fzpc8ksZ/5ZZ0DVkXdE';

$result = $card->decryptCode($encryptedCode);
$this->assertStringStartsWith(Card::API_DECRYPT_CODE, $result['api']);
$this->assertEquals($encryptedCode, $result['params']['encrypt_code']);
Expand All @@ -385,8 +383,8 @@ public function testGetCard()
$card = $this->getCard();

$cardId = 'pdkJ9uLRSbnB3UFEjZAgUxAJrjeY';

$result = $card->getCard($cardId);

$this->assertStringStartsWith(Card::API_GET_CARD, $result['api']);
$this->assertEquals($cardId, $result['params']['card_id']);
}
Expand All @@ -413,9 +411,7 @@ public function testUpdate()
$card = $this->getCard();

$cardId = 'pdkJ9uCzKWebwgNjxosee0ZuO3Os';

$type = 'groupon';

$baseInfo = [
'logo_url' => 'http://mmbiz.qpic.cn/mmbiz/2aJY6aCPatSeibYAyy7yct9zJXL9WsNVL4JdkTbBr184gNWS6nibcA75Hia9CqxicsqjYiaw2xuxYZiaibkmORS2oovdg/0',
'center_title' => '顶部居中按钮',
Expand Down Expand Up @@ -454,12 +450,11 @@ public function testModifyStock()
$card = $this->getCard();

$cardId = 'pdkJ9uLRSbnB3UFEjZAgUxAJrjeY';

$result = $card->increaseStock($cardId, 100);

$this->assertStringStartsWith(Card::API_MODIFY_STOCK, $result['api']);
$this->assertEquals($cardId, $result['params']['card_id']);
$this->assertEquals(100, $result['params']['increase_stock_value']);

$result = $card->reduceStock($cardId, 100);
$this->assertStringStartsWith(Card::API_MODIFY_STOCK, $result['api']);
$this->assertEquals($cardId, $result['params']['card_id']);
Expand Down
50 changes: 50 additions & 0 deletions tests/Stats/StatsStatsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,4 +231,54 @@ public function testinterfaceSummaryHourly()

$this->assertEquals(['begin_date' => 1, 'end_date' => 2], $result['params']);
}

//拉取卡券概况数据接口.
public function testCardSummary()
{
$stats = $this->getStats();

$beginDate = '2016-06-20';
$endDate = '2016-06-28';
$condSource = 1; //卡券来源，0为公众平台创建的卡券数据、1是API创建的卡券数据

$result = $stats->cardSummary($beginDate, $endDate, $condSource);
$this->assertStringStartsWith(Stats::API_CARD_SUMMARY, $result['api']);
$this->assertEquals($beginDate, $result['params']['begin_date']);
$this->assertEquals($endDate, $result['params']['end_date']);
$this->assertEquals($condSource, $result['params']['cond_source']);
}

//获取免费券数据接口.
public function testFreeCardSummary()
{
$stats = $this->getStats();

$beginDate = '2016-06-20';
$endDate = '2016-06-28';
$condSource = 1; //卡券来源，0为公众平台创建的卡券数据、1是API创建的卡券数据
$cardId = '';

$result = $stats->freeCardSummary($beginDate, $endDate, $condSource, $cardId);
$this->assertStringStartsWith(Stats::API_FREE_CARD_SUMMARY, $result['api']);
$this->assertEquals($beginDate, $result['params']['begin_date']);
$this->assertEquals($endDate, $result['params']['end_date']);
$this->assertEquals($condSource, $result['params']['cond_source']);
$this->assertEquals($cardId, $result['params']['card_id']);
}

//拉取会员卡数据接口.
public function testMemberCardSummary()
{
$stats = $this->getStats();

$beginDate = '2015-05-20';
$endDate = '2015-07-20';
$condSource = 1; //卡券来源，0为公众平台创建的卡券数据、1是API创建的卡券数据

$result = $stats->memberCardSummary($beginDate, $endDate, $condSource);
$this->assertStringStartsWith(Stats::API_MEMBER_CARD_SUMMARY, $result['api']);
$this->assertEquals($beginDate, $result['params']['begin_date']);
$this->assertEquals($endDate, $result['params']['end_date']);
$this->assertEquals($condSource, $result['params']['cond_source']);
}
}