Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai int...

liujie

12 小时以前 8f37a2de432a8d4d77f94dcf45d0b86ce3006ee2

 cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java

@@ -474,7 +474,14 @@
            VipPaymentVO res = new VipPaymentVO();
            res.setHeadImg(appUser.getHeadImg());
            res.setName(appUser.getName());
            res.setIsVip(appUser.getIsVip());
            if (appUser.getVipEndTime()==null){
                res.setIsVip(0);
            }else if (appUser.getVipEndTime().before(new Date())){
                res.setIsVip(0);
            }else{
                res.setIsVip(1);
            }
            appUserService.updateById(appUser);
            List<Vip> vips = vipClient.listAll();
            res.setVipList(vips);
        } catch (Exception e) {