czg_team
/
video_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/test' into test

This commit is contained in:
Tankaikai 2025-01-08 22:23:55 +08:00
parent 18a20f750d 60fa47ff69
commit 9cca25f3a7
5 changed files with 11 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

117
src/main/java/com/sqx/OneTimeTaskListener.java
View File

@ -1,117 +0,0 @@
package com.sqx;
import cn.hutool.core.date.DateUtil;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.sqx.modules.app.dao.UserDao;
import com.sqx.modules.app.dao.UserMoneyDao;
import com.sqx.modules.app.dao.UserMoneyDetailsDao;
import com.sqx.modules.app.entity.UserMoney;
import com.sqx.modules.app.service.InviteAchievementService;
import com.sqx.modules.app.service.UserService;
import com.sqx.modules.job.task.TempOrdersTask;
import com.sqx.modules.orders.entity.Orders;
import com.sqx.modules.orders.service.OrdersService;
import com.sqx.modules.pay.dao.CashOutDao;
import com.sqx.modules.pay.dao.PayDetailsDao;
import com.sqx.modules.pay.entity.CashOut;
import com.sqx.modules.pay.entity.PayDetails;
import com.sqx.modules.pay.service.PayDetailsService;
import com.sqx.modules.pay.wuyou.BaseResp;
import com.sqx.modules.pay.wuyou.WuyouPay;
import com.sqx.modules.sys.dao.SysUserMoneyDao;
import com.sqx.modules.sys.entity.SysUserMoney;
import com.sqx.modules.sys.service.SysUserService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.context.event.ApplicationReadyEvent;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationListener;
import org.springframework.stereotype.Component;
import java.util.List;
@Component
public class OneTimeTaskListener implements ApplicationListener<ApplicationReadyEvent> {
final ApplicationContext applicationContext;
final UserService userService;
final TempOrdersTask tempOrdersTask;
final InviteAchievementService inviteAchievementService;
final PayDetailsService payDetailsService;
final PayDetailsDao payDetailsDao;
final UserMoneyDetailsDao userMoneyDetailsDao;
final UserMoneyDao userMoneyDao;
private final OrdersService ordersService;
private final WuyouPay wuyouPay;
private final SysUserMoneyDao sysUserMoneyDao;
private Logger logger = LoggerFactory.getLogger(getClass());
private final CashOutDao cashOutDao;
public OneTimeTaskListener(ApplicationContext applicationContext, UserService userService, TempOrdersTask tempOrdersTask, InviteAchievementService inviteAchievementService, PayDetailsService payDetailsService, PayDetailsDao payDetailsDao, UserMoneyDetailsDao userMoneyDetailsDao, UserMoneyDao userMoneyDao, OrdersService ordersService, WuyouPay wuyouPay, CashOutDao cashOutDao, SysUserMoneyDao sysUserMoneyDao) {
this.applicationContext = applicationContext;
this.userService = userService;
this.tempOrdersTask = tempOrdersTask;
this.inviteAchievementService = inviteAchievementService;
this.payDetailsService = payDetailsService;
this.payDetailsDao = payDetailsDao;
this.userMoneyDetailsDao = userMoneyDetailsDao;
this.userMoneyDao = userMoneyDao;
this.ordersService = ordersService;
this.wuyouPay = wuyouPay;
this.cashOutDao = cashOutDao;
this.sysUserMoneyDao = sysUserMoneyDao;
}
@Override
public void onApplicationEvent(ApplicationReadyEvent event) {
logger.info("应用启动完成后执行一次性方法");
// List<CashOut> cashOutList = cashOutDao.selectList(new LambdaQueryWrapper<CashOut>()
// .eq(CashOut::getState, 2)
// .isNull(CashOut::getOutAt)
// .eq(CashOut::getRefund, "订单不存在")
// .between(CashOut::getCreateAt, "2025-01-07 19:00:00", "2025-01-08 09:26:00"));
// logger.info("待处理订单{}", cashOutList.size());
// int i = 0;
// for (CashOut cashOut : cashOutList) {
// logger.info("处理体现订单: {}, 剩余数量: {}", cashOut.getId(), cashOutList.size() - ++i);
// try {
// BaseResp baseResp = wuyouPay.queryExtractOrder(cashOut.getOrderNumber(), cashOut.getUserId(), cashOut.getUserType() != 2, cashOut.getMoney());
// logger.info("baseResp：{} ", JSONUtil.toJsonStr(baseResp));
// if (cashOut.getUserType() != null && cashOut.getUserType().equals(2)) {
// SysUserMoney sysUserMoney = sysUserMoneyDao.selectOne(new LambdaQueryWrapper<SysUserMoney>().eq(SysUserMoney::getUserId, cashOut.getUserId()));
// if (sysUserMoney != null) {
// sysUserMoneyDao.decrMoney(cashOut.getMoney(), cashOut.getUserId());
// }
// }else {
// UserMoney userMoney = userMoneyDao.selectOne(new LambdaQueryWrapper<UserMoney>().eq(UserMoney::getUserId, cashOut.getUserId()));
// if (userMoney != null) {
// userMoneyDao.decrMoney(cashOut.getMoney(), cashOut.getUserId());
// }
// }
//
// cashOutDao.update(null, new LambdaUpdateWrapper<CashOut>()
// .eq(CashOut::getUserId, cashOut.getUserId())
// .eq(CashOut::getState, 3)
// .set(CashOut::getRefund, "异常提现")
// .set(CashOut::getState, 2));
//
// if (baseResp.getStatus() != null && (baseResp.getStatus().equals(2) || baseResp.getStatus().equals(10000))){
// logger.info("成功订单: {}, {}", cashOut.getId(), cashOut.getUserName());
// cashOut.setState(1);
// cashOut.setRefund("异常提现1");
// cashOut.setOutAt(DateUtil.now());
// cashOutDao.update(cashOut, new LambdaQueryWrapper<CashOut>().eq(CashOut::getUserId, cashOut.getUserId()).eq(CashOut::getId, cashOut.getId()));
// }
// }catch (Exception e) {
// logger.error("", e);
// }
// }
}
}

7
src/main/java/com/sqx/config/ShiroConfig.java
View File

@ -43,21 +43,14 @@ public class ShiroConfig {
Map<String, String> filterMap = new LinkedHashMap<>();
filterMap.put("/uniCallBack/**", "anon");
filterMap.put("/course/synCourse", "anon");
filterMap.put("/webjars/**", "anon");
filterMap.put("/druid/**", "anon");
filterMap.put("/app/**", "anon");
filterMap.put("/activity/**", "anon");
filterMap.put("/banner/**", "anon");
filterMap.put("/courseClassification/selectCourseClassification", "anon");
filterMap.put("/sys/login", "anon");
filterMap.put("/sys/registered", "anon");
filterMap.put("/swagger/**", "anon");
filterMap.put("/alioss/**", "anon");
filterMap.put("/v2/api-docs", "anon");
filterMap.put("/swagger-ui.html", "anon");
filterMap.put("/swagger-resources/**", "anon");
filterMap.put("/captcha.jpg", "anon");
filterMap.put("/aaa.txt", "anon");
filterMap.put("/search/**", "anon");
filterMap.put("/cashOutAudit/batchCashOutOrder", "anon");
filterMap.put("/**", "oauth2");

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

@ -145,8 +145,7 @@ public class CourseCollectServiceImpl extends ServiceImpl<CourseCollectDao, Cour
courses = baseMapper.selectClassify1In3(userId);
}else if (classify.equals(2)){
courses = baseMapper.selectClassify1In2(userId);
}
else {
} else {
courses = baseMapper.selectClassify1ByUserId(userId);
}
if (CollectionUtil.isEmpty(courses)) {

14
src/main/java/com/sqx/modules/course/service/impl/CourseDetailsServiceImpl.java
View File

@ -153,12 +153,12 @@ public class CourseDetailsServiceImpl extends ServiceImpl<CourseDetailsDao, Cour
courseDao.update(null, new LambdaUpdateWrapper<Course>()
.eq(Course::getCourseId, course.getCourseId())
.set(Course::getViewCounts, course.getViewCounts())
.set(Course::getWeekView,course.getWeekView()));
.set(Course::getWeekView, course.getWeekView()));
}
@Override
public Result courseSets(Long userId, Long courseId, Integer sort) {
try{
try {
//观看记录
CourseCollect courseCollect = courseCollectDao.selectOne(new QueryWrapper<CourseCollect>()
.select("course_id", "course_details_id")
@ -169,8 +169,8 @@ public class CourseDetailsServiceImpl extends ServiceImpl<CourseDetailsDao, Cour
.eq("user_id", userId).eq("course_id", courseId)
.eq("classify", 1).last("limit 1"));
Course bean = courseDao.selectById(courseId);
if(bean==null){
log.error("未找到该剧集 用户id:{} 剧集:{}",userId,courseId);
if (bean == null) {
log.error("未找到该剧集 用户id:{} 剧集:{}", userId, courseId);
return Result.error("未找到该剧集");
}
//查询用户是否购买了整集
@ -182,7 +182,7 @@ public class CourseDetailsServiceImpl extends ServiceImpl<CourseDetailsDao, Cour
if (sort == null) {
if (courseCollect != null) {
CourseDetails courseDetails = baseMapper.selectOne(new QueryWrapper<CourseDetails>()
.select("sort")
.select("sort")
.eq("course_details_id", courseCollect.getCourseDetailsId()).eq("course_id", courseCollect.getCourseId()).last("limit 1"));
sort = courseDetails.getSort();
}
@ -223,7 +223,7 @@ public class CourseDetailsServiceImpl extends ServiceImpl<CourseDetailsDao, Cour
if (s.getSort() > finalStartSort && s.getSort() < finalEndSort) {
Integer isGood = courseCollectDao.selectCount(new QueryWrapper<CourseCollect>()
.eq("user_id", userId).eq("course_details_id", s.getCourseDetailsId()).eq("classify", 2).last("limit 1"));
s.setIsGood(isGood == null ? 0 : 1);
s.setIsGood(isGood == null || isGood == 0 ? 0 : 1);
}
});
if (courseCollect == null) {
@ -240,7 +240,7 @@ public class CourseDetailsServiceImpl extends ServiceImpl<CourseDetailsDao, Cour
map.put("collect", collect == null || collect.equals(0) ? 0L : 1L);
map.put("list", courseDetailsSetVos);
return new Result().put("data", map);
}catch (Exception e){
} catch (Exception e) {
log.error("请求剧集异常打印:");
e.printStackTrace();
return Result.error("请求剧集失败");

6
src/main/resources/mapper/course/CourseCollectDao.xml
View File

@ -40,7 +40,7 @@
WHERE
c1.classify = 3
AND c1.user_id = #{userId}
order by c1.create_time desc
order by c1.update_time desc
</select>
<select id="selectClassify1In2" resultType="com.sqx.modules.course.entity.Course">
@ -52,7 +52,7 @@
WHERE
c1.classify = 2
AND c1.user_id = #{userId}
order by c1.create_time desc
order by c1.update_time desc
</select>
<select id="selectClassify1ByUserId" resultType="com.sqx.modules.course.entity.Course">
@ -61,6 +61,6 @@
FROM `course_collect` c1
WHERE c1.classify = 3
AND c1.user_id = #{userId}
order by c1.create_time desc
order by c1.update_time desc
</select>
</mapper>