后台新增妇幼生殖VIP、批量开课bug修改

src/main/java/com/peanut/modules/book/controller/MedicaldesController.java

@@ -55,6 +55,7 @@ public class MedicaldesController {
     public R typeList(String label) {
         LambdaQueryWrapper<SysDictDataEntity> wrapper = new LambdaQueryWrapper();
         wrapper.eq(SysDictDataEntity::getDictLabel,label);
+        wrapper.orderByAsc(SysDictDataEntity::getSort);
         return R.ok().put("result",sysDictDataService.list(wrapper));
     }
 

src/main/java/com/peanut/modules/book/controller/MyUserController.java

@@ -84,8 +84,8 @@ public class MyUserController {
         if (!StringUtils.isEmpty(p.getVipType())){
             if ("1".equals(p.getVipType())){
                 List<Map<String,Object>> list = userVipService.listMaps(new MPJLambdaWrapper<UserVip>().eq(UserVip::getState,0)
-                        .in(UserVip::getType,4,5,6,9).groupBy(UserVip::getUserId)
+                        .in(UserVip::getType,4,5,6,9,10).groupBy(UserVip::getUserId)
-                        .select("count(1) num,user_id userId ").having("num = 4"));
+                        .select("count(1) num,user_id userId ").having("num = 5"));
                 List<Integer> ids = list.stream().map(map -> (int)map.get("userId")).collect(Collectors.toList());
                 wrapper.in(MyUserEntity::getId,ids);
             }else if ("2".equals(p.getVipType())){
@@ -101,11 +101,8 @@ public class MyUserController {
                 wrapper.eq(UserVip::getState,0);
             }
         }
-        wrapper.leftJoin(UserMigration.class,UserMigration::getUserId,MyUserEntity::getId);
+        wrapper.eq(MyUserEntity::getDelFlag, 0);
-        wrapper.selectAll(MyUserEntity.class);
+        wrapper.disableSubLogicDel().leftJoin(UserMigration.class,UserMigration::getUserId,MyUserEntity::getId);
-        wrapper.selectAs(UserMigration::getCreateTime,"migrationTime");
-
-        wrapper.leftJoin(UserMigration.class,UserMigration::getUserId,MyUserEntity::getId);
         wrapper.selectAll(MyUserEntity.class);
         wrapper.selectAs(UserMigration::getCreateTime,"migrationTime");
         boolean isAsc = p.getSortValue().equals("")?false:(p.getSortValue().equals("ascending")?true:true);

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<UserVip> uv9 = userVipService.list(new LambdaQueryWrapper<UserVip>().eq(UserVip::getUserId,ShiroUtils.getUId()).eq(UserVip::getType,9).orderByDesc(UserVip::getEndTime));
                     List<UserVip> uv5 = userVipService.list(new LambdaQueryWrapper<UserVip>().eq(UserVip::getUserId,ShiroUtils.getUId()).eq(UserVip::getType,5).orderByDesc(UserVip::getEndTime));
                     List<UserVip> uv6 = userVipService.list(new LambdaQueryWrapper<UserVip>().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<UserVip> uv10 = userVipService.list(new LambdaQueryWrapper<UserVip>().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<Long> 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<Map<String,Object>> 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<CourseCatalogueEntity> wrapper = new MPJLambdaWrapper();

src/main/java/com/peanut/modules/common/service/impl/UserVipServiceImpl.java

@@ -136,7 +136,7 @@ public class UserVipServiceImpl extends ServiceImpl<UserVipDao, UserVip> 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<CourseToMedicine> list = courseToMedicalDao.selectList(new LambdaQueryWrapper<CourseToMedicine>()
                         .eq(CourseToMedicine::getCourseId,courseId));
                 for (CourseToMedicine ctm:list) {
@@ -145,6 +145,7 @@ public class UserVipServiceImpl extends ServiceImpl<UserVipDao, UserVip> 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<UserVipDao, UserVip> 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<UserVipDao, UserVip> impleme
         List<UserVip> resList = new ArrayList();
         if(vipBuyConfigEntity.getType()==1){//医学超级
             List<UserVip> userVipList = userVipDao.selectList(new LambdaQueryWrapper<UserVip>()
-                    .eq(UserVip::getUserId,buyOrder.getUserId()).eq(UserVip::getState,0).in(UserVip::getType,4,9,5,6));
+                    .eq(UserVip::getUserId,buyOrder.getUserId()).eq(UserVip::getState,0).in(UserVip::getType,4,9,5,6,10));
-            for (int i=4;i<=7;i++){
+            for (int i=4;i<=10;i++){
                 if (i==7){
                     i=9;
                 }
@@ -285,7 +288,7 @@ public class UserVipServiceImpl extends ServiceImpl<UserVipDao, UserVip> 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<UserVipDao, UserVip> 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,10 +375,10 @@ public class UserVipServiceImpl extends ServiceImpl<UserVipDao, UserVip> 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<UserVip> userVipList = userVipDao.selectList(new LambdaQueryWrapper<UserVip>()
                     .eq(UserVip::getUserId,buyOrder.getUserId())
-                    .eq(UserVip::getType,vipBuyConfigEntity.getType().toString().substring(0,1))
+                    .eq(UserVip::getType,vipBuyConfigEntity.getType().toString().substring(0,vipBuyConfigEntity.getType()==101?2:1))
                     .orderByDesc(UserVip::getEndTime));
             UserVip userVip = userVipList.get(0);
             if (userVip.getState()==0) {

src/main/java/com/peanut/modules/master/service/impl/UserCourseBuyServiceImpl.java

@@ -223,7 +223,7 @@ public class UserCourseBuyServiceImpl extends ServiceImpl<UserCourseBuyDao, User
                 CellType cellTypeEnum = cell.getCellTypeEnum();
 //                if(cellTypeEnum==CellType.NUMERIC){
                     String phone = cell.toString();
-                    MyUserEntity myUserEntity = userDao.selectOne(new LambdaQueryWrapper<MyUserEntity>().select(MyUserEntity::getId,MyUserEntity::getName,MyUserEntity::getTel).eq(MyUserEntity::getTel, phone));
+                    MyUserEntity myUserEntity = userDao.selectOne(new LambdaQueryWrapper<MyUserEntity>().select(MyUserEntity::getId,MyUserEntity::getName,MyUserEntity::getTel).eq(MyUserEntity::getEmail, phone));
                     if(myUserEntity!=null){
                         has.add(myUserEntity);
                     }else{

src/main/resources/application-dev.yml

@@ -103,18 +103,18 @@ wxpay:
   mchId: 1612860909
   serialNo: 679AECB2F7AC4183033F713828892BA640E4EEE3
   apiV3Key: 4aYFklzaULeGlr7oJPZ6rHWKcxjihZUF
-  wechatPayCertificateUrl: F:\ideaProject\peanutBook\src\main\resources\cent\wechatpay_7B5676E3CDF56680D0414A009CE501C844DBE2D6.pem
+  wechatPayCertificateUrl: F:\hs\nuttyreading-global-java\src\main\resources\cent\wechatpay_7B5676E3CDF56680D0414A009CE501C844DBE2D6.pem
-  privateKeyUrl: F:\ideaProject\peanutBook\src\main\resources\cent\apiclient_key.pem
+  privateKeyUrl: F:\hs\nuttyreading-global-java\src\main\resources\cent\apiclient_key.pem
-  keyPemPath: F:\ideaProject\peanutBook\src\main\resources\cent\apiclient_key.pem
+  keyPemPath: F:\hs\nuttyreading-global-java\src\main\resources\cent\apiclient_key.pem
   notifyUrl: http://z6f8f828.natappfree.cc/pb/pay/payNotify
   refundNotifyUrl: https://testapi.nuttyreading.com/pay/refundNotify
   #灵枢商户号
   lsMchId: 1700371158
   lsSerialNo: 3132D23C3130B74B87890DC6E7C80256C75113B9
   lsApiV3Key: 4aYFklzaULeGlr7oJPZ6rHWKcxjihZUF
-  lsWechatPayCertificateUrl: F:\ideaProject\peanutBook\src\main\resources\cent\lscent\wechatpay_30CFE19A12EDB4D9E0C7DF01DBF457C657566D04.pem
+  lsWechatPayCertificateUrl: F:\hs\nuttyreading-global-java\src\main\resources\cent\lscent\wechatpay_30CFE19A12EDB4D9E0C7DF01DBF457C657566D04.pem
-  lsPrivateKeyUrl: F:\ideaProject\peanutBook\src\main\resources\cent\lscent\apiclient_key.pem
+  lsPrivateKeyUrl: F:\hs\nuttyreading-global-java\src\main\resources\cent\lscent\apiclient_key.pem
-  lsKeyPemPath: F:\ideaProject\peanutBook\src\main\resources\cent\lscent\apiclient_key.pem
+  lsKeyPemPath: F:\hs\nuttyreading-global-java\src\main\resources\cent\lscent\apiclient_key.pem
   lsNotifyUrl: http://z6f8f828.natappfree.cc/pb/pay/lsPayNotify
   lsRefundNotifyUrl: https://testapi.nuttyreading.com/pay/refundNotify
 

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