|
@@ -132,13 +132,7 @@ class refill_orderControl extends SystemControl
|
|
|
$order_list[$order_id]['org_quality_text'] = $this->quality_format($order_info['org_quality'],$order_info['card_type']);
|
|
|
}
|
|
|
|
|
|
- $provider_list = Model('')->table('refill_provider,store')
|
|
|
- ->field('refill_provider.*,store.store_name')
|
|
|
- ->join('inner')
|
|
|
- ->on('store.store_id=refill_provider.store_id')
|
|
|
- ->order('opened asc, name asc')
|
|
|
- ->limit(1000)
|
|
|
- ->select();
|
|
|
+ $provider_list = $this->providers();
|
|
|
|
|
|
if ($fShowStat) {
|
|
|
$stat = $this->all_order_state_stat($condition);
|
|
@@ -177,7 +171,41 @@ class refill_orderControl extends SystemControl
|
|
|
return strcmp($lp,$rp);
|
|
|
}
|
|
|
};
|
|
|
-
|
|
|
+
|
|
|
+ usort($items,$asc);
|
|
|
+ return $items;
|
|
|
+ }
|
|
|
+
|
|
|
+ private function providers()
|
|
|
+ {
|
|
|
+ $items = Model('')->table('refill_provider,store')
|
|
|
+ ->field('refill_provider.*,store.store_name')
|
|
|
+ ->join('inner')
|
|
|
+ ->on('store.store_id=refill_provider.store_id')
|
|
|
+ ->order('opened asc, name asc')
|
|
|
+ ->limit(1000)
|
|
|
+ ->select();
|
|
|
+
|
|
|
+ foreach ($items as &$item) {
|
|
|
+ $item['pinyin'] = Pinyin::getPinyin($item['store_name']);
|
|
|
+ }
|
|
|
+
|
|
|
+ $asc = function ($l,$r)
|
|
|
+ {
|
|
|
+ $lp = $l['pinyin'];
|
|
|
+ $rp = $r['pinyin'];
|
|
|
+
|
|
|
+ $lo = $l['opened'];
|
|
|
+ $ro = $r['opened'];
|
|
|
+
|
|
|
+ if($lo != $ro) {
|
|
|
+ return $lo < $ro ? -1 : 1;
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ return strcmp($lp,$rp);
|
|
|
+ }
|
|
|
+ };
|
|
|
+
|
|
|
usort($items,$asc);
|
|
|
return $items;
|
|
|
}
|