dev

helper/statistics/refill_balance.php

@@ -124,19 +124,19 @@ class refill_balance
             $item = $mod_refill->table('refill_order')->field('order_id,order_time')
                 ->where(['order_time' => ['lt', $end]])
                 ->order('order_id asc')->find();
-            $time = $item['order_time'] ?? time();
+            $time = $item['order_time'] ?? 0;
         } elseif ($type == 'merchant') {
             $mod_refill = Model('refill_order');
             $item = $mod_refill->table('refill_order')->field('order_id,order_time')
                 ->where(['mchid' => $cid, 'order_time' => ['lt', $end]])
                 ->order('order_id asc')->find();
-            $time = $item['order_time'] ?? time();
+            $time = $item['order_time'] ?? 0;
         } else {
             $mod_refill = Model('vr_order');
             $item = $mod_refill->table('vr_order')->field('order_id,add_time')
                 ->where(['store_id' => $cid,'add_time' => ['lt', $end]])
                 ->order('order_id asc')->find();
-            $time = $item['order_time'] ?? time();
+            $time = $item['order_time'] ?? 0;
         }
 
         return $time;
@@ -164,7 +164,7 @@ class refill_balance
                 ->find();
         }
 
-        $time = $item['madd_time'] ?? time();
+        $time = $item['madd_time'] ?? 0;
         return $time;
     }
 
@@ -190,7 +190,7 @@ class refill_balance
                 ->find();
         }
 
-        $time = $item['madd_time'] ?? time();
+        $time = $item['madd_time'] ?? 0;
         return $time;
     }
 
@@ -244,8 +244,13 @@ class refill_balance
             $balance = ncPriceFormat($in - $order_stat['channel_amounts']);
         }
 
-        if($start == 0) {
+        if($start == 0)
+        {
             $time = min($refill_time,$pay_time);
+            if($time == 0) {
+                return [];
+            }
+
             $start = strtotime(date('Y-m-d', $time));
         }
 
@@ -301,6 +306,10 @@ class refill_balance
     public function add_balance($type, $cid, $start, $end, $time_type, $parent_balance = 0, $remark = '系统自动生成')
     {
         $data = $this->balance_data($type, $cid, $start, $end, $time_type, $parent_balance, $remark);
+        if(empty($data)) {
+            return false;
+        }
+
         $ret = Model('refill_balance')->insert($data);
         return $ret != false;
     }
@@ -319,6 +328,10 @@ class refill_balance
         $remark = '记录重新生成';
 
         $data = $this->balance_data($type, $cid, $start, $end, $time_type, $parent_balance, $remark);
+        if(empty($data)) {
+            return false;
+        }
+
         $ret = Model('refill_balance')->where(['balance_id' => $balance_id])->update($data);
         return $ret != false;
     }