Merge branch 'ralb' of 39.97.239.116:gyfl/xyzshop into ralb

crontab/control/date.php

@@ -117,10 +117,10 @@ class dateControl extends BaseCronControl
 
     public function merchant_availableOp()
     {
-        $merchant = Model('merchant')->getMerchantList([], 1000, '', true,'merchant.mchid,member.available_predeposit');
+        $merchant = Model('merchant')->getMerchantList([], 1000, '', true,'merchant.mchid,member.available_predeposit,merchant.credit_bonus');
         $merchants = [];
         foreach ($merchant as $value) {
-            $merchants[$value['mchid']] = $value['available_predeposit'];
+            $merchants[$value['mchid']] = $value['available_predeposit'] - $value['credit_bonus'];
         }
         $time = date("Y-m-d");
         wcache("merchant_balance_{$time}", ['data' => serialize($merchants)], 'refill-');