dev

admin/control/refill_order.php

@@ -112,7 +112,7 @@ class refill_orderControl extends SystemControl
             $this->RefillOrderExport($condition);
         }
         $merchants = [];
-        $merchant_list = Model('')->table('merchant')->limit(1000)->order('name asc')->select();
+        $merchant_list = Model('')->table('merchant')->limit(1000)->order('company_name asc')->select();
         foreach ($merchant_list as $value) {
             $merchants[$value['mchid']] = $value;
         }

helper/refill/policy/mgroup.php

@@ -207,7 +207,7 @@ class rgroup_ctl
     private function parase($text)
     {
         $data = explode('-',$text);
-        if(count($data) != 4) {
+        if(count($data) != 5) {
             Log::record(__METHOD__ . " group info:{$text} format error.",Log::ERR);
         }