hrjy 2 rokov pred
rodič
commit
1ed671bf97

+ 25 - 25
app/api/controller/user/UserBillController.php

@@ -206,35 +206,35 @@ class UserBillController
                             array(
                                 'url' => $urlCode,     //二维码资源
                                 'stream' => 0,
-                                'left' => 114,
-                                'top' => 790,
+                                'left' => 390,
+                                'top' => 1350,
                                 'right' => 0,
                                 'bottom' => 0,
-                                'width' => 120,
-                                'height' => 120,
-                                'opacity' => 100
-                            )
-                        ),
-                        'text' => array(
-                            array(
-                                'text' => $user['nickname'],
-                                'left' => 250,
-                                'top' => 840,
-                                'fontPath' => $rootPath . 'public' . DS . $filelink['Bold'],     //字体文件
-                                'fontSize' => 16,             //字号
-                                'fontColor' => '40,40,40',       //字体颜色
-                                'angle' => 0,
-                            ),
-                            array(
-                                'text' => '邀请您加入' . sys_config('site_name'),
-                                'left' => 250,
-                                'top' => 880,
-                                'fontPath' => $rootPath . 'public' . DS . $filelink['Normal'],     //字体文件
-                                'fontSize' => 16,             //字号
-                                'fontColor' => '40,40,40',       //字体颜色
-                                'angle' => 0,
+                                'width' => 300,
+                                'height' => 300,
+                                'opacity' => 100,
                             )
                         ),
+//                        'text' => array(
+//                            array(
+//                                'text' => $user['nickname'],
+//                                'left' => 250,
+//                                'top' => 840,
+//                                'fontPath' => $rootPath . 'public' . DS . $filelink['Bold'],     //字体文件
+//                                'fontSize' => 16,             //字号
+//                                'fontColor' => '40,40,40',       //字体颜色
+//                                'angle' => 0,
+//                            ),
+//                            array(
+//                                'text' => '邀请您加入' . sys_config('site_name'),
+//                                'left' => 250,
+//                                'top' => 880,
+//                                'fontPath' => $rootPath . 'public' . DS . $filelink['Normal'],     //字体文件
+//                                'fontSize' => 16,             //字号
+//                                'fontColor' => '40,40,40',       //字体颜色
+//                                'angle' => 0,
+//                            )
+//                        ),
                         'background' => $item['pic']
                     );
                     $resRoutine = $resRoutine && $posterInfo = UtilService::setSharePoster($config, 'routine/spread/poster');

+ 2 - 2
app/models/user/User.php

@@ -854,8 +854,8 @@ class User extends BaseModel
         $end_time = date('Y-m-d 23:59:59', strtotime(-date('d').'day'));
         foreach ($user as $item)
         {
-            $count = StoreOrder::whereBetweenTime('add_time', $start_time, $end_time)->where('paid', 1)->where('uid', $item['uid'])->sum('total_num');// 月结
-            $price = StoreOrder::whereBetweenTime('add_time', $start_time, $end_time)->where('paid', 1)->where('uid', $item['uid'])->sum('pay_price');// 月结
+            $count = StoreOrder::whereBetweenTime('add_time', strtotime('today'), strtotime('tomorrow'))->where('paid', 1)->where('uid', $item['uid'])->sum('total_num');// 月结
+            $price = StoreOrder::whereBetweenTime('add_time',  strtotime('today'), strtotime('tomorrow'))->where('paid', 1)->where('uid', $item['uid'])->sum('pay_price');// 月结
             if ($item['spread_uid'] > 0 and $price > 0){
                 $spread = getParent($item['spread_uid'], $user->toArray());// 找到所有上级
                 $v1 = 0;