fix: bugs

src/main/java/cn/seecoder/courselearning/service/order/QueryOrderService.java

@@ -1,10 +0,0 @@
-package cn.seecoder.courselearning.service.order;
-
-import cn.seecoder.courselearning.po.order.CourseOrder;
-
-public interface QueryOrderService {
-
-    CourseOrder queryMostRecentOrder(Integer uid, Integer courseId);
-
-    CourseOrder getByPrimaryKey(Integer orderId);
-}

src/main/java/cn/seecoder/courselearning/serviceimpl/coupon/CouponServiceImpl.java

@@ -9,10 +9,10 @@ import cn.seecoder.courselearning.po.coupon.UserCoupon;
 import cn.seecoder.courselearning.po.course.Course;
 import cn.seecoder.courselearning.po.order.CourseOrder;
 import cn.seecoder.courselearning.po.user.User;
+import cn.seecoder.courselearning.service.coupon.CouponQueryOrderService;
 import cn.seecoder.courselearning.service.coupon.coupondeliverstrategy.CouponDeliverStrategy;
 import cn.seecoder.courselearning.service.coupon.CouponService;
 import cn.seecoder.courselearning.service.course.CourseService;
-import cn.seecoder.courselearning.service.order.QueryOrderService;
 import cn.seecoder.courselearning.service.user.UserService;
 import cn.seecoder.courselearning.util.Constant;
 import cn.seecoder.courselearning.util.CouponValidator;
@@ -43,7 +43,7 @@ public class CouponServiceImpl implements CouponService {
 
     private CourseService courseService;
 
-    private QueryOrderService orderService;
+    private CouponQueryOrderService orderService;
 
     @Autowired
     public void setUserService(UserService userService) {
@@ -56,7 +56,7 @@ public class CouponServiceImpl implements CouponService {
     }
 
     @Autowired
-    public void setOrderService(QueryOrderService orderService) {
+    public void setOrderService(CouponQueryOrderService orderService) {
         this.orderService = orderService;
     }
 

src/main/java/cn/seecoder/courselearning/serviceimpl/coupon/coupondeliverstrategy/CourseLikeDeliverStrategy.java

@@ -36,7 +36,7 @@ public class CourseLikeDeliverStrategy implements CouponDeliverStrategy {
         if (courseIdStr == null) return false;
         Integer courseId = Integer.valueOf(courseIdStr);
         // 获取用户点赞数
-        int result = courseLikesMapper.count(user.getId(), courseId);
+        int result = courseLikesMapper.count(courseId, user.getId());
         if (result == 1) {
             // 判断优惠券的适用范围
             Course course = courseMapper.selectByPrimaryKey(courseId);

src/main/java/cn/seecoder/courselearning/serviceimpl/course/CourseServiceImpl.java

@@ -4,8 +4,8 @@ import cn.seecoder.courselearning.mapperservice.course.CourseLikesMapper;
 import cn.seecoder.courselearning.mapperservice.course.CourseMapper;
 import cn.seecoder.courselearning.po.course.Course;
 import cn.seecoder.courselearning.po.order.CourseOrder;
+import cn.seecoder.courselearning.service.course.CourseQueryOrderService;
 import cn.seecoder.courselearning.service.course.CourseService;
-import cn.seecoder.courselearning.service.order.QueryOrderService;
 import cn.seecoder.courselearning.util.Constant;
 import cn.seecoder.courselearning.util.PageInfoUtil;
 import cn.seecoder.courselearning.vo.course.CourseVO;
@@ -27,10 +27,10 @@ public class CourseServiceImpl implements CourseService {
     @Resource
     private CourseLikesMapper courseLikesMapper;
 
-    private QueryOrderService orderService;
+    private CourseQueryOrderService orderService;
 
     @Autowired
-    public void setOrderService(QueryOrderService orderService) {
+    public void setOrderService(CourseQueryOrderService orderService) {
         this.orderService = orderService;
     }
 

src/main/java/cn/seecoder/courselearning/serviceimpl/course/CourseWareServiceImpl.java

@@ -3,8 +3,8 @@ package cn.seecoder.courselearning.serviceimpl.course;
 import cn.seecoder.courselearning.mapperservice.course.CourseWareMapper;
 import cn.seecoder.courselearning.po.order.CourseOrder;
 import cn.seecoder.courselearning.po.course.CourseWare;
+import cn.seecoder.courselearning.service.course.CourseQueryOrderService;
 import cn.seecoder.courselearning.service.course.CourseWareService;
-import cn.seecoder.courselearning.service.order.QueryOrderService;
 import cn.seecoder.courselearning.util.Constant;
 import cn.seecoder.courselearning.vo.course.CourseWareVO;
 import cn.seecoder.courselearning.vo.ResultVO;
@@ -21,10 +21,10 @@ public class CourseWareServiceImpl implements CourseWareService {
     @Resource
     private CourseWareMapper courseWareMapper;
 
-    private QueryOrderService orderService;
+    private CourseQueryOrderService orderService;
 
     @Autowired
-    public void setOrderService(QueryOrderService orderService) {
+    public void setOrderService(CourseQueryOrderService orderService) {
         this.orderService = orderService;
     }
 

src/main/java/cn/seecoder/courselearning/serviceimpl/order/CourseOrderServiceImpl.java

@@ -190,7 +190,7 @@ public class CourseOrderServiceImpl implements CourseOrderService {
         UserVO userVO = userService.getUser(order.getUserId());
 
         if(userVO.getBalance()>=order.getCost()){
-            userService.decreaseBalance(userVO.getId(),order.getCost());
+            // userService.decreaseBalance(userVO.getId(),order.getCost());
             // 支付成功，将订单存入数据库
             ResultVO<CourseOrderVO> resultVO = updateCourseOrder(orderId,Constant.ORDER_STATUS_SUCCESS);
             if (resultVO.getCode().equals(Constant.REQUEST_SUCCESS)){

src/main/java/cn/seecoder/courselearning/serviceimpl/order/QueryOrderServiceImpl.java

@@ -2,13 +2,14 @@ package cn.seecoder.courselearning.serviceimpl.order;
 
 import cn.seecoder.courselearning.mapperservice.order.CourseOrderMapper;
 import cn.seecoder.courselearning.po.order.CourseOrder;
-import cn.seecoder.courselearning.service.order.QueryOrderService;
+import cn.seecoder.courselearning.service.coupon.CouponQueryOrderService;
+import cn.seecoder.courselearning.service.course.CourseQueryOrderService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 
 @Service
-public class QueryOrderServiceImpl implements QueryOrderService {
+public class QueryOrderServiceImpl implements CouponQueryOrderService, CourseQueryOrderService {
     @Resource
     CourseOrderMapper orderMapper;