From 2dbf17ba2a72f6fdd6f403b485f6ffe7ac64c876 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Wed, 8 Jan 2025 22:12:44 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=96=9C=E6=AC=A2=20=E6=94=B6=E8=97=8F=20?= =?UTF-8?q?=E8=A7=82=E7=9C=8B=E8=AE=B0=E5=BD=95=20=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=E9=97=AE=E9=A2=98=20=E8=A7=86=E9=A2=91=E7=82=B9=E8=B5=9E?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/sqx/config/ShiroConfig.java | 1 + .../service/impl/CourseCollectServiceImpl.java | 3 +-- .../service/impl/CourseDetailsServiceImpl.java | 14 +++++++------- .../resources/mapper/course/CourseCollectDao.xml | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/sqx/config/ShiroConfig.java b/src/main/java/com/sqx/config/ShiroConfig.java index 375ece0d..af38c116 100644 --- a/src/main/java/com/sqx/config/ShiroConfig.java +++ b/src/main/java/com/sqx/config/ShiroConfig.java @@ -43,6 +43,7 @@ public class ShiroConfig { Map filterMap = new LinkedHashMap<>(); filterMap.put("/uniCallBack/**", "anon"); filterMap.put("/course/synCourse", "anon"); + filterMap.put("/discSpinningAmount/test111", "anon"); filterMap.put("/webjars/**", "anon"); filterMap.put("/druid/**", "anon"); filterMap.put("/app/**", "anon"); diff --git a/src/main/java/com/sqx/modules/course/service/impl/CourseCollectServiceImpl.java b/src/main/java/com/sqx/modules/course/service/impl/CourseCollectServiceImpl.java index 079b5875..742c40d4 100644 --- a/src/main/java/com/sqx/modules/course/service/impl/CourseCollectServiceImpl.java +++ b/src/main/java/com/sqx/modules/course/service/impl/CourseCollectServiceImpl.java @@ -145,8 +145,7 @@ public class CourseCollectServiceImpl extends ServiceImpl() .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() .select("course_id", "course_details_id") @@ -169,8 +169,8 @@ public class CourseDetailsServiceImpl extends ServiceImpl() - .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 finalStartSort && s.getSort() < finalEndSort) { Integer isGood = courseCollectDao.selectCount(new QueryWrapper() .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 From 60fa47ff698103761eb04d6fbf4eea4184ea05ad Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Wed, 8 Jan 2025 22:21:47 +0800 Subject: [PATCH 2/2] =?UTF-8?q?shiroConfig=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/sqx/OneTimeTaskListener.java | 117 ------------------ src/main/java/com/sqx/config/ShiroConfig.java | 8 -- 2 files changed, 125 deletions(-) delete mode 100644 src/main/java/com/sqx/OneTimeTaskListener.java diff --git a/src/main/java/com/sqx/OneTimeTaskListener.java b/src/main/java/com/sqx/OneTimeTaskListener.java deleted file mode 100644 index d6e7c1cf..00000000 --- a/src/main/java/com/sqx/OneTimeTaskListener.java +++ /dev/null @@ -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 { - - 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 cashOutList = cashOutDao.selectList(new LambdaQueryWrapper() -// .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().eq(SysUserMoney::getUserId, cashOut.getUserId())); -// if (sysUserMoney != null) { -// sysUserMoneyDao.decrMoney(cashOut.getMoney(), cashOut.getUserId()); -// } -// }else { -// UserMoney userMoney = userMoneyDao.selectOne(new LambdaQueryWrapper().eq(UserMoney::getUserId, cashOut.getUserId())); -// if (userMoney != null) { -// userMoneyDao.decrMoney(cashOut.getMoney(), cashOut.getUserId()); -// } -// } -// -// cashOutDao.update(null, new LambdaUpdateWrapper() -// .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().eq(CashOut::getUserId, cashOut.getUserId()).eq(CashOut::getId, cashOut.getId())); -// } -// }catch (Exception e) { -// logger.error("", e); -// } -// } - } -} - diff --git a/src/main/java/com/sqx/config/ShiroConfig.java b/src/main/java/com/sqx/config/ShiroConfig.java index af38c116..d535d4c4 100644 --- a/src/main/java/com/sqx/config/ShiroConfig.java +++ b/src/main/java/com/sqx/config/ShiroConfig.java @@ -43,22 +43,14 @@ public class ShiroConfig { Map filterMap = new LinkedHashMap<>(); filterMap.put("/uniCallBack/**", "anon"); filterMap.put("/course/synCourse", "anon"); - filterMap.put("/discSpinningAmount/test111", "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");