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

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);
         }
@@ -979,15 +979,17 @@ public class BuyOrderController {
             LambdaQueryWrapper<UserCourseBuyEntity> 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<UserCourseBuyEntity> userCourseBuyEntities = userCourseBuyDao.selectList(wrapper2);
             if(userCourseBuyEntities.size()>0){//延长有效期
                 UserCourseBuyEntity userCourseBuyEntity = userCourseBuyEntities.get(0);
+                userCourseBuyEntity.setDays(userCourseBuyEntity.getDays()+s.getDays());
+                if(userCourseBuyEntity.getEndTime()!=null){
                     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());
+                }
                 userCourseBuyDao.updateById(userCourseBuyEntity);
             }else{
                 UserCourseBuyEntity userCourseBuyEntity = new UserCourseBuyEntity();

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<CourseCatalogueChapterEntity> STChapterList;
+
 }

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

@@ -312,7 +312,7 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
         for (CourseCatalogueEntity c :courseCatalogueEntities){
             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) {
                 c.setIsBuy(1);
                 c.setStartTime(userCourseBuyList.get(0).getStartTime());
@@ -320,6 +320,14 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
             }else {
                 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);
         return flag;

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

@@ -252,15 +252,17 @@ public class AliPayServiceImpl  implements AliPayService {
                             LambdaQueryWrapper<UserCourseBuyEntity> 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<UserCourseBuyEntity> userCourseBuyEntities = userCourseBuyDao.selectList(wrapper2);
                             if(userCourseBuyEntities.size()>0){
                                 UserCourseBuyEntity userCourseBuyEntity = userCourseBuyEntities.get(0);
+                                userCourseBuyEntity.setDays(userCourseBuyEntity.getDays()+s.getDays());
+                                if(userCourseBuyEntity.getEndTime()!=null){
                                     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());
+                                }
                                 userCourseBuyDao.updateById(userCourseBuyEntity);
                             }else{
                                 UserCourseBuyEntity userCourseBuyEntity = new UserCourseBuyEntity();

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

@@ -195,15 +195,17 @@ public class WxpayServiceImpl extends ServiceImpl<PayWechatOrderDao, PayWechatOr
                 LambdaQueryWrapper<UserCourseBuyEntity> 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<UserCourseBuyEntity> userCourseBuyEntities = userCourseBuyDao.selectList(wrapper2);
                 if(userCourseBuyEntities.size()>0){
                     UserCourseBuyEntity userCourseBuyEntity = userCourseBuyEntities.get(0);
+                    userCourseBuyEntity.setDays(userCourseBuyEntity.getDays()+s.getDays());
+                    if(userCourseBuyEntity.getEndTime()!=null){
                         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());
+                    }
                     userCourseBuyDao.updateById(userCourseBuyEntity);
                 }else{
                     UserCourseBuyEntity userCourseBuyEntity = new UserCourseBuyEntity();