commit

app/admin/model/user/User.php

@@ -174,11 +174,14 @@ class User extends BaseModel
                     $item['sex'] = '女';
                 } else $item['sex'] = '保密';
                 $item['vip_name'] = false;
-                $levelinfo = UserLevel::where('uid', $item['uid'])->where('is_del', 0)->order('grade desc')->field('level_id,is_forever,valid_time')->find();
-                if ($levelinfo) {
-                    if ($levelinfo['is_forever']) $item['vip_name'] = SystemUserLevel::where('id', $levelinfo['level_id'])->value('name');
-                    else if (time() > $levelinfo['valid_time']) $item['vip_name'] = SystemUserLevel::where('id', $levelinfo['level_id'])->value('name');
-                }
+                if ($item['level'] == 1) $item['vip_name'] = '会员';
+                if ($item['level'] == 2) $item['vip_name'] = '创业合伙人';
+                if ($item['level'] == 0) $item['vip_name'] = '普通用户';
+//                $levelinfo = UserLevel::where('uid', $item['uid'])->where('is_del', 0)->order('grade desc')->field('level_id,is_forever,valid_time')->find();
+//                if ($levelinfo) {
+//                    if ($levelinfo['is_forever']) $item['vip_name'] = SystemUserLevel::where('id', $levelinfo['level_id'])->value('name');
+//                    else if (time() > $levelinfo['valid_time']) $item['vip_name'] = SystemUserLevel::where('id', $levelinfo['level_id'])->value('name');
+//                }
             });//->toArray();
         $count = self::setWherePage(self::setWhere($where), $where, ['w.sex', 'w.province', 'w.city', 'u.status', 'u.is_promoter'], ['u.nickname', 'u.uid'])->alias('u')->join('WechatUser w', 'u.uid=w.uid')->count();
         return ['count' => $count, 'data' => $list];

app/admin/view/ump/store_coupon_user/index.php

@@ -67,10 +67,22 @@
                                 {$vo.use_min_price}
                             </td>
                             <td class="text-center">
+                                {if ($vo.add_time == 0)}
+                                没有过期时间
+                                {/if}
+                                {if ($vo.end_time > 0)}
                                 {$vo.add_time|date='Y-m-d H:i:s'}
+                                {/if}
+
                             </td>
                             <td class="text-center">
+                                {if ($vo.end_time == 0)}
+                                    没有过期时间
+                                {/if}
+                                {if ($vo.end_time > 0)}
                                 {$vo.end_time|date='Y-m-d H:i:s'}
+                                {/if}
+
                             </td>
                             <td class="text-center">
                                 {$vo.type == 'send' ? '后台发放' : '手动领取'}

app/api/controller/user/UserController.php

@@ -42,6 +42,7 @@ class UserController
     public function userInfo(Request $request)
     {
         $info = $request->user()->toArray();
+        StoreCouponUser::checkInvalidCoupon();
         $broken_time = intval(sys_config('extract_time'));
         $search_time = time() - 86400 * $broken_time;
         //返佣 +
@@ -60,6 +61,14 @@ class UserController
         $info['commissionCount'] = bcsub($info['brokerage_price'], $info['broken_commission'], 2);
         if ($info['commissionCount'] < 0)
             $info['commissionCount'] = 0;
+
+        if ($info['level'] == 1){
+            $info['level_name'] = '会员';
+        }elseif ($info['level'] == 2){
+            $info['level_name'] = '创业合伙人';
+        }else{
+            $info['level_name'] = '普通用户';
+        }
         return app('json')->success($info);
     }