|
@@ -90,9 +90,8 @@ class merchant_infoControl extends mbMerchantControl
|
|
|
if(empty($states)){
|
|
|
$states = [];
|
|
|
}else{
|
|
|
- $states = $this->datarcache($states);
|
|
|
+ $states = unserialize($states['data']);
|
|
|
}
|
|
|
-
|
|
|
$result = [];
|
|
|
$cache = [];
|
|
|
foreach ($begins as $begin)
|
|
@@ -111,31 +110,12 @@ class merchant_infoControl extends mbMerchantControl
|
|
|
}
|
|
|
}
|
|
|
if(!empty($cache) && !$this->isSame($states,$cache)) {
|
|
|
- $result = wcache($this->mchid() ,$this->datawcache($cache), 'refillstat-');
|
|
|
+ wcache($this->mchid() ,['data' => serialize($cache)], 'refillstat-');
|
|
|
}
|
|
|
|
|
|
return $result;
|
|
|
}
|
|
|
|
|
|
- private function datawcache($data)
|
|
|
- {
|
|
|
- foreach ($data as $key => $value)
|
|
|
- {
|
|
|
- $cache[$key] = serialize($value);
|
|
|
- }
|
|
|
- return $cache;
|
|
|
- }
|
|
|
-
|
|
|
- private function datarcache($data)
|
|
|
- {
|
|
|
- foreach ($data as $key => $value)
|
|
|
- {
|
|
|
- $data[$key] = unserialize($value);
|
|
|
- }
|
|
|
- return $data;
|
|
|
- }
|
|
|
-
|
|
|
-
|
|
|
private function isSame($arr1, $arr2) {
|
|
|
sort($arr1);
|
|
|
sort($arr2);
|
|
@@ -146,18 +126,16 @@ class merchant_infoControl extends mbMerchantControl
|
|
|
{
|
|
|
$result['count'] = $result['otherCount'] = $result['errorCount'] = $result['successCount'] = $result['amountCount'] = 0;
|
|
|
foreach ($stats as $count) {
|
|
|
+ $result['count'] += $count['order_count'];
|
|
|
if($count['order_state'] == ORDER_STATE_SEND) {
|
|
|
$result['otherCount'] = $count['order_count'];
|
|
|
- $result['count'] ++;
|
|
|
}
|
|
|
if($count['order_state'] == ORDER_STATE_CANCEL) {
|
|
|
$result['errorCount'] = $count['order_count'];
|
|
|
- $result['count'] ++;
|
|
|
}
|
|
|
if($count['order_state'] == ORDER_STATE_SUCCESS) {
|
|
|
$result['successCount'] = $count['order_count'];
|
|
|
$result['amountCount'] = $count['mch_amounts'];
|
|
|
- $result['count'] ++;
|
|
|
}
|
|
|
}
|
|
|
return $result;
|