zm/nuttyreading-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/wjl2008_admin/nuttyreading-java into zcc

Browse Source
This commit is contained in:
wuchunlei
2024-06-24 17:21:22 +08:00
parent 9349113937 4f02f747fe
commit e2de3ea5bb
5 changed files with 39 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/com/peanut/modules/book/controller/BuyOrderController.java
View File

@@ -315,12 +315,12 @@ public class BuyOrderController {
paymentInfo.setOrderSn(orderSn); paymentInfo.setOrderSn(orderSn);
paymentInfo.setBuyOrderId(buyOrder.getOrderId()); paymentInfo.setBuyOrderId(buyOrder.getOrderId());
paymentInfo.setTotalAmount(totalPrice); 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"); paymentInfo.setAppName("wumen");
} else if (buyOrder.getCome()==1) { } else if (buyOrder.getCome()==1) {
paymentInfo.setAppName("zmzm"); paymentInfo.setAppName("zmzm");
}else {
paymentInfo.setAppName(buyOrder.getAppName());
} }
wxpayService.prepay(paymentInfo); wxpayService.prepay(paymentInfo);
} }
@@ -979,15 +979,17 @@ public class BuyOrderController {
LambdaQueryWrapper<UserCourseBuyEntity> wrapper2 = new LambdaQueryWrapper<>(); LambdaQueryWrapper<UserCourseBuyEntity> wrapper2 = new LambdaQueryWrapper<>();
wrapper2.eq(UserCourseBuyEntity::getUserId,orderEntity.getUserId()); wrapper2.eq(UserCourseBuyEntity::getUserId,orderEntity.getUserId());
wrapper2.eq(UserCourseBuyEntity::getCatalogueId,s.getCatalogueId()); 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<UserCourseBuyEntity> userCourseBuyEntities = userCourseBuyDao.selectList(wrapper2); List<UserCourseBuyEntity> userCourseBuyEntities = userCourseBuyDao.selectList(wrapper2);
if(userCourseBuyEntities.size()>0){//延长有效期 if(userCourseBuyEntities.size()>0){//延长有效期
UserCourseBuyEntity userCourseBuyEntity = userCourseBuyEntities.get(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.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); userCourseBuyDao.updateById(userCourseBuyEntity);
}else{ }else{
UserCourseBuyEntity userCourseBuyEntity = new UserCourseBuyEntity(); UserCourseBuyEntity userCourseBuyEntity = new UserCourseBuyEntity();

6
src/main/java/com/peanut/modules/common/entity/CourseCatalogueEntity.java
View File

@@ -76,4 +76,10 @@ public class CourseCatalogueEntity{
@TableField(exist = false) @TableField(exist = false)
private Date lastStudyTime; private Date lastStudyTime;
/**
* 试听章节列表
*/
@TableField(exist = false)
private List<CourseCatalogueChapterEntity> STChapterList;
} }

10
src/main/java/com/peanut/modules/medical/service/impl/CourseServiceImpl.java
View File

@@ -312,7 +312,7 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
for (CourseCatalogueEntity c :courseCatalogueEntities){ for (CourseCatalogueEntity c :courseCatalogueEntities){
List<UserCourseBuyEntity> userCourseBuyList = userCourseBuyDao.selectList(new LambdaQueryWrapper<UserCourseBuyEntity>().eq(UserCourseBuyEntity::getUserId, uId).eq(UserCourseBuyEntity::getCatalogueId, c.getId())); List<UserCourseBuyEntity> userCourseBuyList = userCourseBuyDao.selectList(new LambdaQueryWrapper<UserCourseBuyEntity>().eq(UserCourseBuyEntity::getUserId, uId).eq(UserCourseBuyEntity::getCatalogueId, c.getId()));
//完成度、上次学习时间 //完成度、上次学习时间
catalogueCompletion(c); // catalogueCompletion(c);
if (userCourseBuyList.size() > 0) { if (userCourseBuyList.size() > 0) {
c.setIsBuy(1); c.setIsBuy(1);
c.setStartTime(userCourseBuyList.get(0).getStartTime()); c.setStartTime(userCourseBuyList.get(0).getStartTime());
@@ -320,6 +320,14 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
}else { }else {
c.setIsBuy(0); c.setIsBuy(0);
} }
List<CourseCatalogueChapterEntity> courseCatalogueChapterEntities = courseCatalogueChapterDao.selectList(new LambdaQueryWrapper<CourseCatalogueChapterEntity>()
.eq(CourseCatalogueChapterEntity::getCatalogueId, c.getId()).eq(CourseCatalogueChapterEntity::getIsAudition, 1));
for (CourseCatalogueChapterEntity cou:courseCatalogueChapterEntities){
List<CourseCatalogueChapterVideoEntity> courseCatalogueChapterVideoEntities = courseCatalogueChapterVideoDao.selectList(new LambdaQueryWrapper<CourseCatalogueChapterVideoEntity>()
.eq(CourseCatalogueChapterVideoEntity::getChapterId, cou.getId()));
cou.setVideoList(courseCatalogueChapterVideoEntities);
}
c.setSTChapterList(courseCatalogueChapterEntities);
} }
flag.put("catalogues",courseCatalogueEntities); flag.put("catalogues",courseCatalogueEntities);
return flag; return flag;

12
src/main/java/com/peanut/modules/pay/alipay/service/impl/AliPayServiceImpl.java
View File

@@ -252,15 +252,17 @@ public class AliPayServiceImpl implements AliPayService {
LambdaQueryWrapper<UserCourseBuyEntity> wrapper2 = new LambdaQueryWrapper<>(); LambdaQueryWrapper<UserCourseBuyEntity> wrapper2 = new LambdaQueryWrapper<>();
wrapper2.eq(UserCourseBuyEntity::getUserId,orderEntity.getUserId()); wrapper2.eq(UserCourseBuyEntity::getUserId,orderEntity.getUserId());
wrapper2.eq(UserCourseBuyEntity::getCatalogueId,s.getCatalogueId()); 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<UserCourseBuyEntity> userCourseBuyEntities = userCourseBuyDao.selectList(wrapper2); List<UserCourseBuyEntity> userCourseBuyEntities = userCourseBuyDao.selectList(wrapper2);
if(userCourseBuyEntities.size()>0){ if(userCourseBuyEntities.size()>0){
UserCourseBuyEntity userCourseBuyEntity = userCourseBuyEntities.get(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.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); userCourseBuyDao.updateById(userCourseBuyEntity);
}else{ }else{
UserCourseBuyEntity userCourseBuyEntity = new UserCourseBuyEntity(); UserCourseBuyEntity userCourseBuyEntity = new UserCourseBuyEntity();

12
src/main/java/com/peanut/modules/pay/weChatPay/service/impl/WxpayServiceImpl.java
View File

@@ -195,15 +195,17 @@ public class WxpayServiceImpl extends ServiceImpl<PayWechatOrderDao, PayWechatOr
LambdaQueryWrapper<UserCourseBuyEntity> wrapper2 = new LambdaQueryWrapper<>(); LambdaQueryWrapper<UserCourseBuyEntity> wrapper2 = new LambdaQueryWrapper<>();
wrapper2.eq(UserCourseBuyEntity::getUserId,order.getUserId()); wrapper2.eq(UserCourseBuyEntity::getUserId,order.getUserId());
wrapper2.eq(UserCourseBuyEntity::getCatalogueId,s.getCatalogueId()); 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<UserCourseBuyEntity> userCourseBuyEntities = userCourseBuyDao.selectList(wrapper2); List<UserCourseBuyEntity> userCourseBuyEntities = userCourseBuyDao.selectList(wrapper2);
if(userCourseBuyEntities.size()>0){ if(userCourseBuyEntities.size()>0){
UserCourseBuyEntity userCourseBuyEntity = userCourseBuyEntities.get(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.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); userCourseBuyDao.updateById(userCourseBuyEntity);
}else{ }else{
UserCourseBuyEntity userCourseBuyEntity = new UserCourseBuyEntity(); UserCourseBuyEntity userCourseBuyEntity = new UserCourseBuyEntity();