rabin 2 years ago
parent
commit
1375ea0b17
2 changed files with 4 additions and 4 deletions
  1. 2 2
      app/mshop/src/My.php
  2. 2 2
      app/shop/src/My.php

+ 2 - 2
app/mshop/src/My.php

@@ -534,9 +534,9 @@ class My extends Core
         $data['price'] = $shop['price'];
         if ($month) {
             $start = $month . '-01 00:00:00';
-            $end = strtotime("$start +1 month -1 day");
+            $end = date('Y-m-d', strtotime("$start +1 month -1 day"));
             $where['start'] = Dever::maketime($start);
-            $where['end'] = $end;
+            $where['end'] = Dever::maketime($end . ' 23:59:59');
         }
         $where['shop_id'] = $shop_id;
         $where['state'] = 1;

+ 2 - 2
app/shop/src/My.php

@@ -60,9 +60,9 @@ class My extends Core
         $month = Dever::input('month');
         if ($month) {
         	$start = $month . '-01 00:00:00';
-        	$end = strtotime("$start +1 month -1 day");
+        	$end = date('Y-m-d', strtotime("$start +1 month -1 day"));
         	$where['start'] = Dever::maketime($start);
-        	$where['end'] = $end;
+        	$where['end'] = Dever::maketime($end . ' 23:59:59');
         }
         $this->data['list'] = Dever::db('shop/user_money')->getData($where);
         if ($this->data['list']) {