青雲慧bug

renren-admin/src/main/java/io/renren/modules/qmgj/api/MemberUtils.java

@@ -6,46 +6,31 @@ import io.renren.modules.qmgj.entity.MemberInfoEntity;
 
 public class MemberUtils {
     public static R isYF(MemberInfoEntity memberInfoEntity){
-        if(memberInfoEntity.getName()==null || "".equals(memberInfoEntity.getName())){
-             throw new RRException("请完善真实姓名资料");
-        }
-        if(memberInfoEntity.getSex()==null || "".equals(memberInfoEntity.getSex())){
-            throw new RRException("请完善性别资料");
-        }
-        if(memberInfoEntity.getVipname()==null || "".equals(memberInfoEntity.getVipname())){
-            throw new RRException("请完善昵称资料");
-        }
-
         if(memberInfoEntity.getMemberphoto()==null || "".equals(memberInfoEntity.getMemberphoto())){
             throw new RRException("请完善会员头像资料");
         }
-        if(memberInfoEntity.getHeight()==null || "".equals(memberInfoEntity.getHeight())){
-            return R.error(503,"身高资料不全");
-        }
-        if(memberInfoEntity.getWeighttype()==null || "".equals(memberInfoEntity.getWeighttype())){
-            return R.error(503,"体重类型资料不全");
-        }
-        if(memberInfoEntity.getDormitoryno()==null || "".equals(memberInfoEntity.getDormitoryno())){
-            return R.error(503,"宿舍号资料不全");
+        if(memberInfoEntity.getVipname()==null || "".equals(memberInfoEntity.getVipname())){
+            throw new RRException("请完善昵称资料");
         }
-        if(memberInfoEntity.getIdcard()==null || "".equals(memberInfoEntity.getIdcard())){
-            return R.error(503,"身份证号资料不全");
+        if(memberInfoEntity.getName()==null || "".equals(memberInfoEntity.getName())){
+             throw new RRException("请完善真实姓名资料");
         }
-        if(memberInfoEntity.getBirthday()==null || "".equals(memberInfoEntity.getBirthday())){
-            return R.error(503,"生日资料不全");
+        if(memberInfoEntity.getSex()==null || "".equals(memberInfoEntity.getSex())){
+            throw new RRException("请完善性别资料");
         }
-        if(memberInfoEntity.getFreetime()==null || "".equals(memberInfoEntity.getFreetime())){
-            return R.error(503,"本周空闲时间资料不全");
+        if(memberInfoEntity.getCardno()==null || "".equals(memberInfoEntity.getCardno())){
+            return R.error(503,"会员卡号资料不全");
         }
-        if(memberInfoEntity.getSkill()==null || "".equals(memberInfoEntity.getSkill())){
-            return R.error(503,"其他技能资料不全");
+        if(memberInfoEntity.getPhone()==null || "".equals(memberInfoEntity.getPhone())){
+            return R.error(503,"手机号资料不全");
         }
-        if(memberInfoEntity.getIshealth()==null || "".equals(memberInfoEntity.getIshealth())){
-            return R.error(503,"健康证有否资料不全");
+        if(memberInfoEntity.getReferrer()==null || "".equals(memberInfoEntity.getReferrer())){
+            return R.error(503,"推荐人资料不全");
         }
-        if(memberInfoEntity.getRemarks()==null || "".equals(memberInfoEntity.getRemarks())){
-            return R.error(503,"备注资料不全");
+        if(memberInfoEntity.getExpireTime()==null){
+            return R.error(503,"服务到期时间不全");
         }
+
 //        if(memberInfoEntity.getEmail()==null || "".equals(memberInfoEntity.getEmail())){
 //            return R.error(503,"邮箱信息不全!");
 //        }

renren-admin/src/main/java/io/renren/modules/qmgj/controller/ActivityStuController.java

@@ -65,7 +65,7 @@ public class ActivityStuController {
      * 列表
      */
     @RequestMapping("/list")
-    @RequiresPermissions("qmgj:activitystu:list")
+    //@RequiresPermissions("qmgj:activitystu:list")
     public R list(@RequestParam Map<String, Object> params){
         PageUtils page = activityStuService.queryPage(params);
 

renren-admin/src/main/java/io/renren/modules/qmgj/service/impl/MemberInfoServiceImpl.java

@@ -1436,9 +1436,14 @@ public class MemberInfoServiceImpl extends ServiceImpl<MemberInfoDao, MemberInfo
     @Override
     public Long completeNum(Long stuId) {
         MemberInfoEntity member = this.baseMapper.selectById(stuId);
+        String expireTime = null;
+        if (ObjectUtil.isNotNull(member.getExpireTime())){
+             expireTime = member.getExpireTime().toString();
+        }
         List<String> fieldList =  Arrays.asList(
                 member.getMemberphoto(), member.getName(),member.getVipname(), member.getSex(),
-                member.getCardno(), member.getHeight(), member.getWeighttype(), member.getDormitoryno(), member.getIdcard(), member.getBirthday(),
+                member.getCardno(), member.getPhone(), member.getReferrer(), expireTime, member.getHeight(), member.getWeighttype(),
+                member.getDormitoryno(), member.getIdcard(), member.getBirthday(), member.getLng(),
                 member.getFreetime(), member.getSkill(), member.getIshealth(), member.getRemarks()
         );
         return fieldList.stream()

renren-admin/src/main/java/io/renren/modules/qmjz/enums/TaskType.java

@@ -11,8 +11,8 @@ public enum TaskType {
     WORK_ACTIVITY(6L,"参加兼职/成长会"),
     COMMENT(7L,"评价"),
     DAILY_SIGN(8L,"每日签到"),
-    STUDENT_STATUS(8L,"学籍认证"),
-    ACTIVITY_APPLY_DEDUCT(9L,"活动报名抵扣的积分");
+    STUDENT_STATUS(9L,"学籍认证"),
+    ACTIVITY_APPLY_DEDUCT(10L,"活动报名抵扣的积分");
 
     private final Long code;
     private final String info;

renren-admin/src/main/java/io/renren/modules/qyh/api/ApiNewsController.java

@@ -50,6 +50,7 @@ public class ApiNewsController extends AbstractController {
         if (ObjectUtil.isNotNull(news)){
             news.setHits(news.getHits() + 1);
         }
+        newsService.updateById(news);
         return R.ok().put("data", news);
     }
 

renren-admin/src/main/java/io/renren/modules/qyh/service/impl/ApiAuthServiceImpl.java

@@ -267,6 +267,7 @@ public class ApiAuthServiceImpl implements ApiAuthService {
             memberinfo.setPassword("123456");
             memberinfo.setLoginname(carNo);
             memberinfo.setInviteCode(memberInfoService.getInviteCode());
+            memberinfo.setReferrer(memberInfoInviteCode.getName());
             memberinfo.setCreateTime(LocalDateTime.now());
             memberinfo.setUpdateTime(LocalDateTime.now());
             memberInfoService.save(memberinfo);

renren-admin/src/main/java/io/renren/modules/qyh/service/impl/NewsServiceImpl.java

@@ -45,7 +45,7 @@ public class NewsServiceImpl extends ServiceImpl<NewsMapper, NewsEntity> impleme
                         .ge(StrUtil.isNotBlank(publishStartTime), NewsEntity::getPublishTime, publishStartTime)
                         .le(StrUtil.isNotBlank(publishEndTime), NewsEntity::getPublishTime, publishEndTime)
                         .orderByAsc(NewsEntity::getSortNo)
-                        .orderByDesc(NewsEntity::getCreateTime));
+                        .orderByDesc(NewsEntity::getPublishTime));
         return new PageUtils(page);
     }