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

# Conflicts:
#	src/main/java/cn/seecoder/courselearning/serviceimpl/order/CourseOrderServiceImpl.java

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

@@ -1,6 +1,5 @@
 package cn.seecoder.courselearning.service.order;
 
-import cn.seecoder.courselearning.po.CourseOrder;
 import cn.seecoder.courselearning.vo.CourseOrderVO;
 import cn.seecoder.courselearning.vo.ResultVO;
 
@@ -17,9 +16,6 @@ public interface CourseOrderService {
     // 取消使用优惠券/活动
     ResultVO<Boolean> cancelCoupon(CourseOrderVO orderVO, Integer couponId);
 
-    CourseOrder queryMostRecentOrder(Integer uid, Integer courseId);
-
-    CourseOrder getByPrimaryKey(Integer orderId);
 
     ResultVO<CourseOrderVO> getCourseOrderById(Integer orderId);
     // 完成付款

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

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

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

@@ -8,6 +8,7 @@ import cn.seecoder.courselearning.service.coupon.coupondeliverstrategy.CouponDel
 import cn.seecoder.courselearning.service.coupon.CouponService;
 import cn.seecoder.courselearning.service.course.CourseService;
 import cn.seecoder.courselearning.service.order.CourseOrderService;
+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;
@@ -15,6 +16,7 @@ import cn.seecoder.courselearning.vo.CouponVO;
 import cn.seecoder.courselearning.vo.CourseOrderVO;
 import cn.seecoder.courselearning.vo.ResultVO;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
@@ -33,14 +35,27 @@ public class CouponServiceImpl implements CouponService {
     @Resource
     private UserCouponMapper userCouponMapper;
 
-    @Resource
     private UserService userService;
 
-    @Resource
     private CourseService courseService;
 
-    @Resource
-    private CourseOrderService orderService;
+    private QueryOrderService orderService;
+
+    @Autowired
+    public void setUserService(UserService userService) {
+        this.userService = userService;
+    }
+
+    @Autowired
+    public void setCourseService(CourseService courseService) {
+        this.courseService = courseService;
+    }
+
+    @Autowired
+    public void setOrderService(QueryOrderService orderService) {
+        this.orderService = orderService;
+    }
+
     /**
      * 直接创建优惠券并发放
      * @param couponDTO

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

@@ -6,12 +6,14 @@ import cn.seecoder.courselearning.po.Course;
 import cn.seecoder.courselearning.po.CourseOrder;
 import cn.seecoder.courselearning.service.course.CourseService;
 import cn.seecoder.courselearning.service.order.CourseOrderService;
+import cn.seecoder.courselearning.service.order.QueryOrderService;
 import cn.seecoder.courselearning.util.Constant;
 import cn.seecoder.courselearning.util.PageInfoUtil;
 import cn.seecoder.courselearning.vo.CourseVO;
 import cn.seecoder.courselearning.vo.ResultVO;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -25,8 +27,13 @@ public class CourseServiceImpl implements CourseService {
     private CourseMapper courseMapper;
     @Resource
     private CourseLikesMapper courseLikesMapper;
-    @Resource
-    private CourseOrderService orderService;
+
+    private QueryOrderService orderService;
+
+    @Autowired
+    public void setOrderService(QueryOrderService orderService) {
+        this.orderService = orderService;
+    }
 
     @Override
     public PageInfo<CourseVO> getCourses(Integer currPage, Integer pageSize, Integer uid, String key) {

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

@@ -4,10 +4,11 @@ import cn.seecoder.courselearning.mapperservice.CourseWareMapper;
 import cn.seecoder.courselearning.po.CourseOrder;
 import cn.seecoder.courselearning.po.CourseWare;
 import cn.seecoder.courselearning.service.course.CourseWareService;
-import cn.seecoder.courselearning.service.order.CourseOrderService;
+import cn.seecoder.courselearning.service.order.QueryOrderService;
 import cn.seecoder.courselearning.util.Constant;
 import cn.seecoder.courselearning.vo.CourseWareVO;
 import cn.seecoder.courselearning.vo.ResultVO;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -19,8 +20,13 @@ import java.util.List;
 public class CourseWareServiceImpl implements CourseWareService {
     @Resource
     private CourseWareMapper courseWareMapper;
-    @Resource
-    private CourseOrderService orderService;
+
+    private QueryOrderService orderService;
+
+    @Autowired
+    public void setOrderService(QueryOrderService orderService) {
+        this.orderService = orderService;
+    }
 
     @Override
     public CourseWareVO getCourseWare(Integer uid, Integer courseWareId) {

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

@@ -10,6 +10,7 @@ import cn.seecoder.courselearning.util.Constant;
 import cn.seecoder.courselearning.vo.*;
 import org.omg.CORBA.IntHolder;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -26,13 +27,29 @@ public class CourseOrderServiceImpl implements CourseOrderService {
     CourseOrderMapper orderMapper;
     @Resource
     CourseOrderCouponMapper courseOrderCouponMapper;
-    @Resource
+
     UserService userService;
-    @Resource
+
     CouponService couponService;
-    @Resource
+
     CourseService courseService;
 
+    @Autowired
+    public void setUserService(UserService userService) {
+        this.userService = userService;
+    }
+
+    @Autowired
+    public void setCouponService(CouponService couponService) {
+        this.couponService = couponService;
+    }
+
+    @Autowired
+    public void setCourseService(CourseService courseService) {
+        this.courseService = courseService;
+    }
+
+
     @Override
     public ResultVO<CourseOrderVO> updateCourseOrder(Integer orderId, Integer orderStatus) {
         CourseOrder order = orderMapper.selectByPrimaryKey(orderId);
@@ -222,16 +239,6 @@ public class CourseOrderServiceImpl implements CourseOrderService {
     }
 
 
-    @Override
-    public CourseOrder queryMostRecentOrder(Integer uid, Integer courseId) {
-        return orderMapper.queryMostRecentOrder(uid, courseId);
-    }
-
-    @Override
-    public CourseOrder getByPrimaryKey(Integer orderId) {
-        return orderMapper.selectByPrimaryKey(orderId);
-    }
-
     public void updateBestCost(CourseOrderVO orderVO) {
         List<Coupon> usedCoupons = couponService.getByOrderId(orderVO.getId());
         boolean[] used = new boolean[usedCoupons.size()];

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

@@ -0,0 +1,24 @@
+package cn.seecoder.courselearning.serviceimpl.order;
+
+import cn.seecoder.courselearning.mapperservice.CourseOrderMapper;
+import cn.seecoder.courselearning.po.CourseOrder;
+import cn.seecoder.courselearning.service.order.QueryOrderService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+@Service
+public class QueryOrderServiceImpl implements QueryOrderService {
+    @Resource
+    CourseOrderMapper orderMapper;
+
+    @Override
+    public CourseOrder queryMostRecentOrder(Integer uid, Integer courseId) {
+        return orderMapper.queryMostRecentOrder(uid, courseId);
+    }
+
+    @Override
+    public CourseOrder getByPrimaryKey(Integer orderId) {
+        return orderMapper.selectByPrimaryKey(orderId);
+    }
+}

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

@@ -12,6 +12,7 @@ import cn.seecoder.courselearning.vo.ResultVO;
 import cn.seecoder.courselearning.vo.UserVO;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -27,6 +28,11 @@ public class RechargeServiceImpl implements RechargeService {
     @Resource
     RechargeOrderMapper rechargeOrderMapper;
 
+    @Autowired
+    public void setUserService(UserService userService) {
+        this.userService = userService;
+    }
+
     @Override
     public ResultVO<RechargeOrderVO> rechargeAccount(RechargeOrderVO rechargeOrderVO) {
         ResultVO<RechargeOrderVO> ret = new ResultVO<>();