From 7e6274b9da072a87cd7070bdb7413a2d86e77aac Mon Sep 17 00:00:00 2001 From: wangjinlei <751475802@qq.com> Date: Mon, 24 Jun 2024 14:24:47 +0800 Subject: [PATCH 1/3] bug --- .../modules/book/controller/BuyOrderController.java | 6 +++--- .../modules/common/entity/CourseCatalogueEntity.java | 6 ++++++ .../medical/service/impl/CourseServiceImpl.java | 10 +++++++++- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java b/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java index 6733efe7..14dc6689 100644 --- a/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java +++ b/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java @@ -315,12 +315,12 @@ public class BuyOrderController { paymentInfo.setOrderSn(orderSn); paymentInfo.setBuyOrderId(buyOrder.getOrderId()); paymentInfo.setTotalAmount(totalPrice); - if (buyOrder.getCome()==2){ + if(buyOrder.getCome()==null||buyOrder.getCome()==0){ + paymentInfo.setAppName(buyOrder.getAppName()); + } else if (buyOrder.getCome()==2){ paymentInfo.setAppName("wumen"); } else if (buyOrder.getCome()==1) { paymentInfo.setAppName("zmzm"); - }else { - paymentInfo.setAppName(buyOrder.getAppName()); } wxpayService.prepay(paymentInfo); } diff --git a/src/main/java/com/peanut/modules/common/entity/CourseCatalogueEntity.java b/src/main/java/com/peanut/modules/common/entity/CourseCatalogueEntity.java index fac6a299..063bff81 100644 --- a/src/main/java/com/peanut/modules/common/entity/CourseCatalogueEntity.java +++ b/src/main/java/com/peanut/modules/common/entity/CourseCatalogueEntity.java @@ -76,4 +76,10 @@ public class CourseCatalogueEntity{ @TableField(exist = false) private Date lastStudyTime; + /** + * 试听章节列表 + */ + @TableField(exist = false) + private List STChapterList; + } diff --git a/src/main/java/com/peanut/modules/medical/service/impl/CourseServiceImpl.java b/src/main/java/com/peanut/modules/medical/service/impl/CourseServiceImpl.java index 3e28556c..24458eec 100644 --- a/src/main/java/com/peanut/modules/medical/service/impl/CourseServiceImpl.java +++ b/src/main/java/com/peanut/modules/medical/service/impl/CourseServiceImpl.java @@ -215,7 +215,7 @@ public class CourseServiceImpl extends ServiceImpl impl for (CourseCatalogueEntity c :courseCatalogueEntities){ List userCourseBuyList = userCourseBuyDao.selectList(new LambdaQueryWrapper().eq(UserCourseBuyEntity::getUserId, uId).eq(UserCourseBuyEntity::getCatalogueId, c.getId())); //完成度、上次学习时间 - catalogueCompletion(c); +// catalogueCompletion(c); if (userCourseBuyList.size() > 0) { c.setIsBuy(1); c.setStartTime(userCourseBuyList.get(0).getStartTime()); @@ -223,6 +223,14 @@ public class CourseServiceImpl extends ServiceImpl impl }else { c.setIsBuy(0); } + List courseCatalogueChapterEntities = courseCatalogueChapterDao.selectList(new LambdaQueryWrapper() + .eq(CourseCatalogueChapterEntity::getCatalogueId, c.getId()).eq(CourseCatalogueChapterEntity::getIsAudition, 1)); + for (CourseCatalogueChapterEntity cou:courseCatalogueChapterEntities){ + List courseCatalogueChapterVideoEntities = courseCatalogueChapterVideoDao.selectList(new LambdaQueryWrapper() + .eq(CourseCatalogueChapterVideoEntity::getChapterId, cou.getId())); + cou.setVideoList(courseCatalogueChapterVideoEntities); + } + c.setSTChapterList(courseCatalogueChapterEntities); } flag.put("catalogues",courseCatalogueEntities); return flag; From d080631a7cda8829905d923fc46b4333e6b09805 Mon Sep 17 00:00:00 2001 From: wangjinlei <751475802@qq.com> Date: Mon, 24 Jun 2024 15:06:35 +0800 Subject: [PATCH 2/3] bug --- .../modules/book/controller/BuyOrderController.java | 12 +++++++----- .../pay/alipay/service/impl/AliPayServiceImpl.java | 12 +++++++----- .../pay/weChatPay/service/impl/WxpayServiceImpl.java | 12 +++++++----- 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java b/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java index 14dc6689..86ce3808 100644 --- a/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java +++ b/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java @@ -979,15 +979,17 @@ public class BuyOrderController { LambdaQueryWrapper wrapper2 = new LambdaQueryWrapper<>(); wrapper2.eq(UserCourseBuyEntity::getUserId,orderEntity.getUserId()); wrapper2.eq(UserCourseBuyEntity::getCatalogueId,s.getCatalogueId()); - wrapper2.gt(UserCourseBuyEntity::getEndTime,new Date()); + wrapper2.and(r->r.isNull(UserCourseBuyEntity::getEndTime).or().gt(UserCourseBuyEntity::getEndTime,new Date())); List userCourseBuyEntities = userCourseBuyDao.selectList(wrapper2); if(userCourseBuyEntities.size()>0){//延长有效期 UserCourseBuyEntity userCourseBuyEntity = userCourseBuyEntities.get(0); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(userCourseBuyEntity.getEndTime()); - calendar.add(Calendar.DAY_OF_MONTH,s.getDays()); userCourseBuyEntity.setDays(userCourseBuyEntity.getDays()+s.getDays()); - userCourseBuyEntity.setEndTime(calendar.getTime()); + if(userCourseBuyEntity.getEndTime()==null){ + Calendar calendar = Calendar.getInstance(); + calendar.setTime(userCourseBuyEntity.getEndTime()); + calendar.add(Calendar.DAY_OF_MONTH,s.getDays()); + userCourseBuyEntity.setEndTime(calendar.getTime()); + } userCourseBuyDao.updateById(userCourseBuyEntity); }else{ UserCourseBuyEntity userCourseBuyEntity = new UserCourseBuyEntity(); diff --git a/src/main/java/com/peanut/modules/pay/alipay/service/impl/AliPayServiceImpl.java b/src/main/java/com/peanut/modules/pay/alipay/service/impl/AliPayServiceImpl.java index 55c87dc8..63ffb989 100644 --- a/src/main/java/com/peanut/modules/pay/alipay/service/impl/AliPayServiceImpl.java +++ b/src/main/java/com/peanut/modules/pay/alipay/service/impl/AliPayServiceImpl.java @@ -252,15 +252,17 @@ public class AliPayServiceImpl implements AliPayService { LambdaQueryWrapper wrapper2 = new LambdaQueryWrapper<>(); wrapper2.eq(UserCourseBuyEntity::getUserId,orderEntity.getUserId()); wrapper2.eq(UserCourseBuyEntity::getCatalogueId,s.getCatalogueId()); - wrapper2.gt(UserCourseBuyEntity::getEndTime,new Date()); + wrapper2.and(r->r.isNull(UserCourseBuyEntity::getEndTime).or().gt(UserCourseBuyEntity::getEndTime,new Date())); List userCourseBuyEntities = userCourseBuyDao.selectList(wrapper2); if(userCourseBuyEntities.size()>0){ UserCourseBuyEntity userCourseBuyEntity = userCourseBuyEntities.get(0); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(userCourseBuyEntity.getEndTime()); - calendar.add(Calendar.DAY_OF_MONTH,s.getDays()); userCourseBuyEntity.setDays(userCourseBuyEntity.getDays()+s.getDays()); - userCourseBuyEntity.setEndTime(calendar.getTime()); + if(userCourseBuyEntity.getEndTime()==null){ + Calendar calendar = Calendar.getInstance(); + calendar.setTime(userCourseBuyEntity.getEndTime()); + calendar.add(Calendar.DAY_OF_MONTH,s.getDays()); + userCourseBuyEntity.setEndTime(calendar.getTime()); + } userCourseBuyDao.updateById(userCourseBuyEntity); }else{ UserCourseBuyEntity userCourseBuyEntity = new UserCourseBuyEntity(); diff --git a/src/main/java/com/peanut/modules/pay/weChatPay/service/impl/WxpayServiceImpl.java b/src/main/java/com/peanut/modules/pay/weChatPay/service/impl/WxpayServiceImpl.java index 8ce6f3f0..bad89c08 100644 --- a/src/main/java/com/peanut/modules/pay/weChatPay/service/impl/WxpayServiceImpl.java +++ b/src/main/java/com/peanut/modules/pay/weChatPay/service/impl/WxpayServiceImpl.java @@ -195,15 +195,17 @@ public class WxpayServiceImpl extends ServiceImpl wrapper2 = new LambdaQueryWrapper<>(); wrapper2.eq(UserCourseBuyEntity::getUserId,order.getUserId()); wrapper2.eq(UserCourseBuyEntity::getCatalogueId,s.getCatalogueId()); - wrapper2.lt(UserCourseBuyEntity::getEndTime,new Date()); + wrapper2.and(r->r.isNull(UserCourseBuyEntity::getEndTime).or().gt(UserCourseBuyEntity::getEndTime,new Date())); List userCourseBuyEntities = userCourseBuyDao.selectList(wrapper2); if(userCourseBuyEntities.size()>0){ UserCourseBuyEntity userCourseBuyEntity = userCourseBuyEntities.get(0); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(userCourseBuyEntity.getEndTime()); - calendar.add(Calendar.DAY_OF_MONTH,s.getDays()); userCourseBuyEntity.setDays(userCourseBuyEntity.getDays()+s.getDays()); - userCourseBuyEntity.setEndTime(calendar.getTime()); + if(userCourseBuyEntity.getEndTime()==null){ + Calendar calendar = Calendar.getInstance(); + calendar.setTime(userCourseBuyEntity.getEndTime()); + calendar.add(Calendar.DAY_OF_MONTH,s.getDays()); + userCourseBuyEntity.setEndTime(calendar.getTime()); + } userCourseBuyDao.updateById(userCourseBuyEntity); }else{ UserCourseBuyEntity userCourseBuyEntity = new UserCourseBuyEntity(); From 4f02f747fe8a29fd4515ef8e982869c949a430f6 Mon Sep 17 00:00:00 2001 From: wangjinlei <751475802@qq.com> Date: Mon, 24 Jun 2024 15:21:10 +0800 Subject: [PATCH 3/3] bug --- .../com/peanut/modules/book/controller/BuyOrderController.java | 2 +- .../modules/pay/alipay/service/impl/AliPayServiceImpl.java | 2 +- .../modules/pay/weChatPay/service/impl/WxpayServiceImpl.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java b/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java index 86ce3808..7381e636 100644 --- a/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java +++ b/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java @@ -984,7 +984,7 @@ public class BuyOrderController { if(userCourseBuyEntities.size()>0){//延长有效期 UserCourseBuyEntity userCourseBuyEntity = userCourseBuyEntities.get(0); userCourseBuyEntity.setDays(userCourseBuyEntity.getDays()+s.getDays()); - if(userCourseBuyEntity.getEndTime()==null){ + if(userCourseBuyEntity.getEndTime()!=null){ Calendar calendar = Calendar.getInstance(); calendar.setTime(userCourseBuyEntity.getEndTime()); calendar.add(Calendar.DAY_OF_MONTH,s.getDays()); diff --git a/src/main/java/com/peanut/modules/pay/alipay/service/impl/AliPayServiceImpl.java b/src/main/java/com/peanut/modules/pay/alipay/service/impl/AliPayServiceImpl.java index 63ffb989..654b16fd 100644 --- a/src/main/java/com/peanut/modules/pay/alipay/service/impl/AliPayServiceImpl.java +++ b/src/main/java/com/peanut/modules/pay/alipay/service/impl/AliPayServiceImpl.java @@ -257,7 +257,7 @@ public class AliPayServiceImpl implements AliPayService { if(userCourseBuyEntities.size()>0){ UserCourseBuyEntity userCourseBuyEntity = userCourseBuyEntities.get(0); userCourseBuyEntity.setDays(userCourseBuyEntity.getDays()+s.getDays()); - if(userCourseBuyEntity.getEndTime()==null){ + if(userCourseBuyEntity.getEndTime()!=null){ Calendar calendar = Calendar.getInstance(); calendar.setTime(userCourseBuyEntity.getEndTime()); calendar.add(Calendar.DAY_OF_MONTH,s.getDays()); diff --git a/src/main/java/com/peanut/modules/pay/weChatPay/service/impl/WxpayServiceImpl.java b/src/main/java/com/peanut/modules/pay/weChatPay/service/impl/WxpayServiceImpl.java index bad89c08..c201f92c 100644 --- a/src/main/java/com/peanut/modules/pay/weChatPay/service/impl/WxpayServiceImpl.java +++ b/src/main/java/com/peanut/modules/pay/weChatPay/service/impl/WxpayServiceImpl.java @@ -200,7 +200,7 @@ public class WxpayServiceImpl extends ServiceImpl0){ UserCourseBuyEntity userCourseBuyEntity = userCourseBuyEntities.get(0); userCourseBuyEntity.setDays(userCourseBuyEntity.getDays()+s.getDays()); - if(userCourseBuyEntity.getEndTime()==null){ + if(userCourseBuyEntity.getEndTime()!=null){ Calendar calendar = Calendar.getInstance(); calendar.setTime(userCourseBuyEntity.getEndTime()); calendar.add(Calendar.DAY_OF_MONTH,s.getDays());