From 3dbefdda6f941444813be3e744e9b98b79c4ce66 Mon Sep 17 00:00:00 2001 From: wyn <1074145239@qq.com> Date: Tue, 19 May 2026 10:35:05 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E6=B3=A8=E5=86=8C=E6=97=B6=E9=97=B4=E5=92=8C=E8=BF=81?= =?UTF-8?q?=E7=A7=BB=E6=97=B6=E9=97=B4=20=E5=B9=B6=E5=8F=AF=E6=8E=92?= =?UTF-8?q?=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../book/controller/MedicaldesController.java | 1 + .../common/controller/UserVipController.java | 11 +++++++++-- .../common/service/impl/UserVipServiceImpl.java | 15 +++++++++------ src/main/resources/application.yml | 2 +- 4 files changed, 20 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/peanut/modules/book/controller/MedicaldesController.java b/src/main/java/com/peanut/modules/book/controller/MedicaldesController.java index 44b7f5f..a03dda0 100644 --- a/src/main/java/com/peanut/modules/book/controller/MedicaldesController.java +++ b/src/main/java/com/peanut/modules/book/controller/MedicaldesController.java @@ -55,6 +55,7 @@ public class MedicaldesController { public R typeList(String label) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper(); wrapper.eq(SysDictDataEntity::getDictLabel,label); + wrapper.orderByAsc(SysDictDataEntity::getSort); return R.ok().put("result",sysDictDataService.list(wrapper)); } diff --git a/src/main/java/com/peanut/modules/common/controller/UserVipController.java b/src/main/java/com/peanut/modules/common/controller/UserVipController.java index f45b105..01077b1 100644 --- a/src/main/java/com/peanut/modules/common/controller/UserVipController.java +++ b/src/main/java/com/peanut/modules/common/controller/UserVipController.java @@ -201,6 +201,7 @@ public class UserVipController { ll.add(Arrays.asList(9)); ll.add(Arrays.asList(5)); ll.add(Arrays.asList(6)); + ll.add(Arrays.asList(10)); ll.add(Arrays.asList(2)); ll.add(Arrays.asList(7,8)); } @@ -229,17 +230,20 @@ public class UserVipController { List uv9 = userVipService.list(new LambdaQueryWrapper().eq(UserVip::getUserId,ShiroUtils.getUId()).eq(UserVip::getType,9).orderByDesc(UserVip::getEndTime)); List uv5 = userVipService.list(new LambdaQueryWrapper().eq(UserVip::getUserId,ShiroUtils.getUId()).eq(UserVip::getType,5).orderByDesc(UserVip::getEndTime)); List uv6 = userVipService.list(new LambdaQueryWrapper().eq(UserVip::getUserId,ShiroUtils.getUId()).eq(UserVip::getType,6).orderByDesc(UserVip::getEndTime)); - if (uv4.size() > 0 && uv9.size() > 0 && uv5.size() > 0 && uv6.size() > 0){//办理过 + List uv10 = userVipService.list(new LambdaQueryWrapper().eq(UserVip::getUserId,ShiroUtils.getUId()).eq(UserVip::getType,10).orderByDesc(UserVip::getEndTime)); + if (uv4.size() > 0 && uv9.size() > 0 && uv5.size() > 0 && uv6.size() > 0&& uv10.size() > 0){//办理过 if (uv4.get(0).getState()==0&&uv9.get(0).getState()==0&&uv5.get(0).getState()==0&&uv6.get(0).getState()==0){ long l4 = uv4.get(0).getEndTime().getTime(); long l9 = uv9.get(0).getEndTime().getTime(); long l5 = uv5.get(0).getEndTime().getTime(); long l6 = uv6.get(0).getEndTime().getTime(); + long l10 = uv10.get(0).getEndTime().getTime(); List tempList = new ArrayList(); tempList.add(l4); tempList.add(l9); tempList.add(l5); tempList.add(l6); + tempList.add(l10); tempList = tempList.stream().sorted((long1,long2)->{ return Long.compare(long1,long2); }).collect(Collectors.toList()); @@ -311,6 +315,7 @@ public class UserVipController { ll.add(Arrays.asList(9)); ll.add(Arrays.asList(5)); ll.add(Arrays.asList(6)); + ll.add(Arrays.asList(10)); ll.add(Arrays.asList(2)); ll.add(Arrays.asList(7,8)); List> resList = new ArrayList<>(); @@ -468,7 +473,7 @@ public class UserVipController { Map map = new HashMap(); map.put("courseCount",0); map.put("originalPrice",0); - if ("4".equals(type)||"9".equals(type)||"5".equals(type)||"6".equals(type)){ + if ("4".equals(type)||"9".equals(type)||"5".equals(type)||"6".equals(type)||"10".equals(type)){ List list = new ArrayList<>(); if ("4".equals(type)){ userVipService.bottomLabel(1,list); @@ -478,6 +483,8 @@ public class UserVipController { userVipService.bottomLabel(2,list); }else if ("6".equals(type)){ userVipService.bottomLabel(5,list); + }else if ("10".equals(type)){ + userVipService.bottomLabel(109,list); } if (list.size()>0){ MPJLambdaWrapper wrapper = new MPJLambdaWrapper(); diff --git a/src/main/java/com/peanut/modules/common/service/impl/UserVipServiceImpl.java b/src/main/java/com/peanut/modules/common/service/impl/UserVipServiceImpl.java index f4801b6..d21a097 100644 --- a/src/main/java/com/peanut/modules/common/service/impl/UserVipServiceImpl.java +++ b/src/main/java/com/peanut/modules/common/service/impl/UserVipServiceImpl.java @@ -136,7 +136,7 @@ public class UserVipServiceImpl extends ServiceImpl impleme .eq(UserVip::getUserId, u==null?ShiroUtils.getUId():u.getId()) .eq(UserVip::getState,0)); for (UserVip userVip : userVipList) { - if (userVip.getType()==4||userVip.getType()==9||userVip.getType()==5||userVip.getType()==6) { + if (userVip.getType()==4||userVip.getType()==9||userVip.getType()==5||userVip.getType()==6||userVip.getType()==10) { List list = courseToMedicalDao.selectList(new LambdaQueryWrapper() .eq(CourseToMedicine::getCourseId,courseId)); for (CourseToMedicine ctm:list) { @@ -145,6 +145,7 @@ public class UserVipServiceImpl extends ServiceImpl impleme if ((cm.getId()==1&&userVip.getType()==4)||//中医学 (cm.getId()==74&&userVip.getType()==9)||//中西汇通 (cm.getId()==2&&userVip.getType()==5)||//针灸学 + (cm.getId()==109&&userVip.getType()==10)||//妇幼生殖 (cm.getId()==5&&userVip.getType()==6)){//肿瘤学 return userVip; } @@ -201,6 +202,8 @@ public class UserVipServiceImpl extends ServiceImpl impleme set.add(6); }else if (cm.getId() == 4) {//心身医学 set.add(8); + }else if (cm.getId() == 109) {//妇幼生殖 + set.add(10); } } } @@ -254,8 +257,8 @@ public class UserVipServiceImpl extends ServiceImpl impleme List resList = new ArrayList(); if(vipBuyConfigEntity.getType()==1){//医学超级 List userVipList = userVipDao.selectList(new LambdaQueryWrapper() - .eq(UserVip::getUserId,buyOrder.getUserId()).eq(UserVip::getState,0).in(UserVip::getType,4,9,5,6)); - for (int i=4;i<=7;i++){ + .eq(UserVip::getUserId,buyOrder.getUserId()).eq(UserVip::getState,0).in(UserVip::getType,4,9,5,6,10)); + for (int i=4;i<=10;i++){ if (i==7){ i=9; } @@ -285,7 +288,7 @@ public class UserVipServiceImpl extends ServiceImpl impleme } } }else if(vipBuyConfigEntity.getType()==11){//延期医学超级 - for (int i=4;i<=7;i++){ + for (int i=4;i<=10;i++){ if (i==7){ i=9; } @@ -363,7 +366,7 @@ public class UserVipServiceImpl extends ServiceImpl impleme } } }else if (vipBuyConfigEntity.getType()==4||vipBuyConfigEntity.getType()==9||vipBuyConfigEntity.getType()==5||vipBuyConfigEntity.getType()==6|| - vipBuyConfigEntity.getType()==7||vipBuyConfigEntity.getType()==8){ + vipBuyConfigEntity.getType()==7||vipBuyConfigEntity.getType()==8||vipBuyConfigEntity.getType()==10){ UserVip userVip = new UserVip(); userVip.setUserId(buyOrder.getUserId()); userVip.setType(vipBuyConfigEntity.getType()); @@ -372,7 +375,7 @@ public class UserVipServiceImpl extends ServiceImpl impleme userVipDao.insert(userVip); resList.add(userVip); }else if (vipBuyConfigEntity.getType()==41||vipBuyConfigEntity.getType()==91||vipBuyConfigEntity.getType()==51||vipBuyConfigEntity.getType()==61|| - vipBuyConfigEntity.getType()==71||vipBuyConfigEntity.getType()==81){ + vipBuyConfigEntity.getType()==71||vipBuyConfigEntity.getType()==81||vipBuyConfigEntity.getType()==101){ List userVipList = userVipDao.selectList(new LambdaQueryWrapper() .eq(UserVip::getUserId,buyOrder.getUserId()) .eq(UserVip::getType,vipBuyConfigEntity.getType().toString().substring(0,1)) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 7905077..c220b6c 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -11,7 +11,7 @@ connection-timeout: 6000000ms spring: # 环境 /dev1|test|prod profiles: - active: dev + active: prod # jackson时间格式化 jackson: time-zone: GMT+8