Merge branch 'test' into dev

# Conflicts:
#	src/main/java/com/sqx/modules/course/service/impl/CourseCollectServiceImpl.java

src/main/java/com/sqx/modules/course/entity/Course.java

@@ -329,6 +329,7 @@ public class Course implements Serializable {
     private String courseDetailsName;
 
     @TableField(exist = false)
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long courseDetailsId;
 
     @TableField(exist = false)

src/main/java/com/sqx/modules/course/service/impl/CourseCollectServiceImpl.java

@@ -51,9 +51,13 @@ public class CourseCollectServiceImpl extends ServiceImpl<CourseCollectDao, Cour
     @Override
     @CacheEvict(value = "app:courseCollect", key = "#courseCollect.userId")
     public Result insertCourseCollect(CourseCollect courseCollect) {
-        reentrantReadWriteLock.writeLock().lock();
+
+//        reentrantReadWriteLock.writeLock().lock();
         try {
             if (courseCollect.getClassify() == 3) {
+                if (courseCollect.getCourseId() == null || courseCollect.getCourseDetailsId() == null) {
+                    return Result.success("操作成功！");
+                }
                 QueryWrapper<CourseCollect> queryWrapper = new QueryWrapper<>();
                 queryWrapper.eq("user_id", courseCollect.getUserId())
                         .eq("classify", 3)
@@ -103,9 +107,10 @@ public class CourseCollectServiceImpl extends ServiceImpl<CourseCollectDao, Cour
         } catch (Exception e) {
             e.printStackTrace();
             log.error("收藏短剧出错了！" + e.getMessage());
-        } finally {
-            reentrantReadWriteLock.writeLock().unlock();
         }
+//        finally {
+//            reentrantReadWriteLock.writeLock().unlock();
+//        }
         return Result.error("系统繁忙,请稍后再试！");
     }
 
@@ -148,7 +153,7 @@ public class CourseCollectServiceImpl extends ServiceImpl<CourseCollectDao, Cour
         //详情id
         Set<Long> courseDetailIds = new HashSet<>();
         courses.forEach(s -> {
-            if (s==null) {
+            if (s == null) {
                 return;
             }
             courseIdList.add(s.getCourseId());
@@ -160,7 +165,7 @@ public class CourseCollectServiceImpl extends ServiceImpl<CourseCollectDao, Cour
         List<CourseDetails> courseDetails1 = courseIdList.isEmpty() ? new ArrayList<>() :
                 courseDetailsService.list(new LambdaQueryWrapper<CourseDetails>().in(CourseDetails::getCourseDetailsId, courseDetailIds));
         Map<Long, CourseDetails> courseDetailsMap = courseDetails1.stream().collect(Collectors.toMap(CourseDetails::getCourseId, item -> item));
-        List<CourseDetails> courseDetails2 = courseDetailsDao.countByCourseId(courseIdList);
+        List<CourseDetails> courseDetails2 = courseIdList.isEmpty() ? new ArrayList<>() : courseDetailsDao.countByCourseId(courseIdList);
         Map<Long, Integer> countMap = courseDetails2.stream()
                 .collect(Collectors.toMap(CourseDetails::getCourseId, CourseDetails::getCourseDetailsCount));
 

src/main/java/com/sqx/modules/job/task/TempCashOutTask.java

@@ -45,7 +45,7 @@ public class TempCashOutTask{
                     cashOut.setRefund(null);
                     cashOut.setOutAt(DateUtil.now());
                     cashOutDao.update(cashOut, new LambdaQueryWrapper<CashOut>().eq(CashOut::getUserId, cashOut.getUserId()).eq(CashOut::getId, cashOut.getId()));
-                }else if (baseResp.getStatus() != null && baseResp.getStatus().equals(3)) {
+                }else if (baseResp.getStatus() != null && (baseResp.getStatus().equals(3) || baseResp.getStatus().equals(99999)) ){
                     cashOut.setState(2);
                     cashOutDao.update(cashOut, new LambdaQueryWrapper<CashOut>().eq(CashOut::getUserId, cashOut.getUserId()).eq(CashOut::getId, cashOut.getId()));
                 }

src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java

@@ -803,6 +803,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
         if (sysUserEntity == null) {
             return;
         }
-        orders.setSysUserId(sysUserEntity.getSysUserId());
+        orders.setSysUserId(sysUserEntity.getUserId());
+        orders.setUserName(sysUserEntity.getUsername());
     }
 }

src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java

@@ -581,6 +581,7 @@ public class CashOutServiceImpl extends ServiceImpl<CashOutDao, CashOut> impleme
                 if (baseResp.getStatus() != null && (baseResp.getStatus().equals(2) || baseResp.getStatus().equals(10000))) {
                     sysUserMoneyDetails.setContent("成功提现：" + money);
                     cashOut.setState(1);
+                    cashOut.setOutAt(DateUtil.date().toString());
                 }
 
                 if (baseResp.getErrorMsg() != null) {
@@ -617,6 +618,7 @@ public class CashOutServiceImpl extends ServiceImpl<CashOutDao, CashOut> impleme
                 if (baseResp.getStatus() != null && (baseResp.getStatus().equals(2) || baseResp.getStatus().equals(10000))) {
                     userMoneyDetails.setContent("成功提现：" + money);
                     cashOut.setState(1);
+                    cashOut.setOutAt(DateUtil.date().toString());
                 }
 
                 if (baseResp.getErrorMsg() != null) {

src/main/resources/mapper/course/CourseCollectDao.xml

@@ -49,6 +49,7 @@
         FROM `course_collect` c1
         WHERE c1.classify = 3
           AND c1.user_id = #{userId}
+        group by c1.course_id
         order by c1.create_time desc
     </select>
 </mapper>

src/main/resources/mapper/course/CourseDetailsDao.xml

@@ -112,7 +112,6 @@
         <foreach collection="courseIdList" item="ids" open="(" separator="," close=")">
             #{ids}
         </foreach>
-        GROUP BY course_id
     </select>
 
 </mapper>