Merge branch 'master' of ssh://193.112.35.168:29418/tejia

admin

2021-05-29 40d0d99fb89665e6e7702ea62e45fabe2d01e51a

Merge branch 'master' of ssh://193.112.35.168:29418/tejia

 service-vip/src/main/java/com/ks/vip/service/remote/VipCenterServiceImpl.java

@@ -136,7 +136,7 @@
    public VipGradePotence getVipPotence(String uid) {
        VipGradePotence potence = null;
        VipCenter vipCenter = vipCenterMapper.getByUid(uid);
        if (vipCenter != null || vipCenter.getGradeId() != null) {
        if (vipCenter != null && vipCenter.getGradeId() != null) {
            long nowTime = java.lang.System.currentTimeMillis();
            if (vipCenter.getStartTime().getTime() <= nowTime && vipCenter.getEndTime().getTime() >= nowTime) {
                potence = vipGradePotenceService.getPotenceByGradeId(vipCenter.getGradeId());