更换包

src/main/java/cn/seecoder/courselearning/controller/CouponController.java

@@ -2,7 +2,7 @@ package cn.seecoder.courselearning.controller;
 
 import cn.seecoder.courselearning.dto.CouponDTO;
 import cn.seecoder.courselearning.dto.DeliverCouponDTO;
-import cn.seecoder.courselearning.service.CouponService;
+import cn.seecoder.courselearning.service.coupon.CouponService;
 import cn.seecoder.courselearning.vo.CouponVO;
 import cn.seecoder.courselearning.vo.ResultVO;
 import org.springframework.web.bind.annotation.*;

src/main/java/cn/seecoder/courselearning/controller/CourseController.java

@@ -1,6 +1,6 @@
 package cn.seecoder.courselearning.controller;
 
-import cn.seecoder.courselearning.service.CourseService;
+import cn.seecoder.courselearning.service.course.CourseService;
 import cn.seecoder.courselearning.util.Constant;
 import cn.seecoder.courselearning.vo.CourseVO;
 import cn.seecoder.courselearning.vo.ResultVO;

src/main/java/cn/seecoder/courselearning/controller/CourseOrderController.java

@@ -1,6 +1,6 @@
 package cn.seecoder.courselearning.controller;
 
-import cn.seecoder.courselearning.service.CourseOrderService;
+import cn.seecoder.courselearning.service.order.CourseOrderService;
 import cn.seecoder.courselearning.vo.CourseOrderVO;
 import cn.seecoder.courselearning.vo.ResultVO;
 import org.springframework.web.bind.annotation.*;

src/main/java/cn/seecoder/courselearning/controller/CourseWareController.java

@@ -1,6 +1,6 @@
 package cn.seecoder.courselearning.controller;
 
-import cn.seecoder.courselearning.service.CourseWareService;
+import cn.seecoder.courselearning.service.course.CourseWareService;
 import cn.seecoder.courselearning.vo.CourseWareVO;
 import cn.seecoder.courselearning.vo.ResultVO;
 import org.springframework.web.bind.annotation.*;

src/main/java/cn/seecoder/courselearning/controller/FileController.java

@@ -1,6 +1,6 @@
 package cn.seecoder.courselearning.controller;
 
-import cn.seecoder.courselearning.service.FileService;
+import cn.seecoder.courselearning.service.file.FileService;
 import cn.seecoder.courselearning.vo.FileInfoVO;
 import cn.seecoder.courselearning.vo.ResultVO;
 import org.springframework.web.bind.annotation.*;

src/main/java/cn/seecoder/courselearning/controller/RechargeController.java

@@ -1,6 +1,6 @@
 package cn.seecoder.courselearning.controller;
 
-import cn.seecoder.courselearning.service.RechargeService;
+import cn.seecoder.courselearning.service.order.RechargeService;
 import cn.seecoder.courselearning.vo.RechargeOrderVO;
 import cn.seecoder.courselearning.vo.ResultVO;
 import org.springframework.web.bind.annotation.PostMapping;

src/main/java/cn/seecoder/courselearning/controller/UserController.java

@@ -1,6 +1,6 @@
 package cn.seecoder.courselearning.controller;
 
-import cn.seecoder.courselearning.service.UserService;
+import cn.seecoder.courselearning.service.user.UserService;
 import cn.seecoder.courselearning.vo.ResultVO;
 import cn.seecoder.courselearning.vo.UserFormVO;
 import cn.seecoder.courselearning.vo.UserVO;

src/main/java/cn/seecoder/courselearning/enums/CouponDeliver.java

@@ -1,9 +1,9 @@
 package cn.seecoder.courselearning.enums;
 
-import cn.seecoder.courselearning.service.CouponDeliverStrategy;
-import cn.seecoder.courselearning.serviceimpl.coupondeliverstrategy.AllUserDeliverStrategy;
-import cn.seecoder.courselearning.serviceimpl.coupondeliverstrategy.CourseLikeDeliverStrategy;
-import cn.seecoder.courselearning.serviceimpl.coupondeliverstrategy.SingleUserDeliverStrategy;
+import cn.seecoder.courselearning.service.coupon.coupondeliverstrategy.CouponDeliverStrategy;
+import cn.seecoder.courselearning.serviceimpl.coupon.coupondeliverstrategy.AllUserDeliverStrategy;
+import cn.seecoder.courselearning.serviceimpl.coupon.coupondeliverstrategy.CourseLikeDeliverStrategy;
+import cn.seecoder.courselearning.serviceimpl.coupon.coupondeliverstrategy.SingleUserDeliverStrategy;
 import lombok.Getter;
 
 /**
@@ -12,7 +12,7 @@ import lombok.Getter;
 @Getter
 public enum CouponDeliver {
     SINGLE("发放给单个用户", new SingleUserDeliverStrategy()),
-    COURSE_LIKE("发放给某课程点赞超过一定数量的用户", new CourseLikeDeliverStrategy()),
+    COURSE_LIKE("发放给某课程点赞的用户", new CourseLikeDeliverStrategy()),
     ALL("发放给全体用户", new AllUserDeliverStrategy());
 
     private final String value;

src/main/java/cn/seecoder/courselearning/enums/CouponType.java

@@ -1,8 +1,8 @@
 package cn.seecoder.courselearning.enums;
 
-import cn.seecoder.courselearning.service.CouponStrategy;
-import cn.seecoder.courselearning.serviceimpl.couponstrategy.CutDownCouponStrategy;
-import cn.seecoder.courselearning.serviceimpl.couponstrategy.DiscountCouponStrategy;
+import cn.seecoder.courselearning.service.coupon.couponstrategy.CouponStrategy;
+import cn.seecoder.courselearning.serviceimpl.coupon.couponstrategy.CutDownCouponStrategy;
+import cn.seecoder.courselearning.serviceimpl.coupon.couponstrategy.DiscountCouponStrategy;
 import lombok.Getter;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;

src/main/java/cn/seecoder/courselearning/service/CouponService.java → src/main/java/cn/seecoder/courselearning/service/coupon/CouponService.java

@@ -1,4 +1,4 @@
-package cn.seecoder.courselearning.service;
+package cn.seecoder.courselearning.service.coupon;
 
 import cn.seecoder.courselearning.dto.CouponDTO;
 import cn.seecoder.courselearning.dto.DeliverCouponDTO;

src/main/java/cn/seecoder/courselearning/service/CouponDeliverStrategy.java → src/main/java/cn/seecoder/courselearning/service/coupon/coupondeliverstrategy/CouponDeliverStrategy.java

@@ -1,4 +1,4 @@
-package cn.seecoder.courselearning.service;
+package cn.seecoder.courselearning.service.coupon.coupondeliverstrategy;
 
 import cn.seecoder.courselearning.po.Coupon;
 import cn.seecoder.courselearning.po.User;

src/main/java/cn/seecoder/courselearning/service/CouponStrategy.java → src/main/java/cn/seecoder/courselearning/service/coupon/couponstrategy/CouponStrategy.java

@@ -1,4 +1,4 @@
-package cn.seecoder.courselearning.service;
+package cn.seecoder.courselearning.service.coupon.couponstrategy;
 
 import cn.seecoder.courselearning.po.Coupon;
 import cn.seecoder.courselearning.vo.CourseOrderVO;

src/main/java/cn/seecoder/courselearning/service/CourseService.java → src/main/java/cn/seecoder/courselearning/service/course/CourseService.java

@@ -1,4 +1,4 @@
-package cn.seecoder.courselearning.service;
+package cn.seecoder.courselearning.service.course;
 
 import cn.seecoder.courselearning.vo.CourseVO;
 import cn.seecoder.courselearning.vo.ResultVO;

src/main/java/cn/seecoder/courselearning/service/CourseWareService.java → src/main/java/cn/seecoder/courselearning/service/course/CourseWareService.java

@@ -1,4 +1,4 @@
-package cn.seecoder.courselearning.service;
+package cn.seecoder.courselearning.service.course;
 
 import cn.seecoder.courselearning.vo.CourseWareVO;
 import cn.seecoder.courselearning.vo.ResultVO;

src/main/java/cn/seecoder/courselearning/service/FileService.java → src/main/java/cn/seecoder/courselearning/service/file/FileService.java

@@ -1,4 +1,4 @@
-package cn.seecoder.courselearning.service;
+package cn.seecoder.courselearning.service.file;
 
 import cn.seecoder.courselearning.vo.FileInfoVO;
 import cn.seecoder.courselearning.vo.ResultVO;

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

@@ -1,4 +1,4 @@
-package cn.seecoder.courselearning.service;
+package cn.seecoder.courselearning.service.order;
 
 import cn.seecoder.courselearning.vo.CourseOrderVO;
 import cn.seecoder.courselearning.vo.ResultVO;

src/main/java/cn/seecoder/courselearning/service/RechargeService.java → src/main/java/cn/seecoder/courselearning/service/order/RechargeService.java

@@ -1,4 +1,4 @@
-package cn.seecoder.courselearning.service;
+package cn.seecoder.courselearning.service.order;
 
 import cn.seecoder.courselearning.vo.RechargeOrderVO;
 import cn.seecoder.courselearning.vo.ResultVO;

src/main/java/cn/seecoder/courselearning/service/UserService.java → src/main/java/cn/seecoder/courselearning/service/user/UserService.java

@@ -1,4 +1,4 @@
-package cn.seecoder.courselearning.service;
+package cn.seecoder.courselearning.service.user;
 
 import cn.seecoder.courselearning.vo.RechargeOrderVO;
 import cn.seecoder.courselearning.vo.ResultVO;

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

@@ -1,11 +1,11 @@
-package cn.seecoder.courselearning.serviceimpl;
+package cn.seecoder.courselearning.serviceimpl.coupon;
 
 import cn.seecoder.courselearning.dto.CouponDTO;
 import cn.seecoder.courselearning.dto.DeliverCouponDTO;
 import cn.seecoder.courselearning.mapperservice.*;
 import cn.seecoder.courselearning.po.*;
-import cn.seecoder.courselearning.service.CouponDeliverStrategy;
-import cn.seecoder.courselearning.service.CouponService;
+import cn.seecoder.courselearning.service.coupon.coupondeliverstrategy.CouponDeliverStrategy;
+import cn.seecoder.courselearning.service.coupon.CouponService;
 import cn.seecoder.courselearning.util.Constant;
 import cn.seecoder.courselearning.util.CouponValidator;
 import cn.seecoder.courselearning.vo.CouponVO;

src/main/java/cn/seecoder/courselearning/serviceimpl/coupondeliverstrategy/AllUserDeliverStrategy.java → src/main/java/cn/seecoder/courselearning/serviceimpl/coupon/coupondeliverstrategy/AllUserDeliverStrategy.java

@@ -1,8 +1,8 @@
-package cn.seecoder.courselearning.serviceimpl.coupondeliverstrategy;
+package cn.seecoder.courselearning.serviceimpl.coupon.coupondeliverstrategy;
 
 import cn.seecoder.courselearning.po.Coupon;
 import cn.seecoder.courselearning.po.User;
-import cn.seecoder.courselearning.service.CouponDeliverStrategy;
+import cn.seecoder.courselearning.service.coupon.coupondeliverstrategy.CouponDeliverStrategy;
 
 import java.util.Map;
 

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

@@ -1,8 +1,8 @@
-package cn.seecoder.courselearning.serviceimpl.coupondeliverstrategy;
+package cn.seecoder.courselearning.serviceimpl.coupon.coupondeliverstrategy;
 
 import cn.seecoder.courselearning.po.Coupon;
 import cn.seecoder.courselearning.po.User;
-import cn.seecoder.courselearning.service.CouponDeliverStrategy;
+import cn.seecoder.courselearning.service.coupon.coupondeliverstrategy.CouponDeliverStrategy;
 
 import java.util.Map;
 

src/main/java/cn/seecoder/courselearning/serviceimpl/coupondeliverstrategy/SingleUserDeliverStrategy.java → src/main/java/cn/seecoder/courselearning/serviceimpl/coupon/coupondeliverstrategy/SingleUserDeliverStrategy.java

@@ -1,8 +1,8 @@
-package cn.seecoder.courselearning.serviceimpl.coupondeliverstrategy;
+package cn.seecoder.courselearning.serviceimpl.coupon.coupondeliverstrategy;
 
 import cn.seecoder.courselearning.po.Coupon;
 import cn.seecoder.courselearning.po.User;
-import cn.seecoder.courselearning.service.CouponDeliverStrategy;
+import cn.seecoder.courselearning.service.coupon.coupondeliverstrategy.CouponDeliverStrategy;
 
 import java.util.Map;
 

src/main/java/cn/seecoder/courselearning/serviceimpl/couponstrategy/AbstractCouponStrategy.java → src/main/java/cn/seecoder/courselearning/serviceimpl/coupon/couponstrategy/AbstractCouponStrategy.java

@@ -1,11 +1,11 @@
-package cn.seecoder.courselearning.serviceimpl.couponstrategy;
+package cn.seecoder.courselearning.serviceimpl.coupon.couponstrategy;
 
 import cn.seecoder.courselearning.mapperservice.CourseMapper;
 import cn.seecoder.courselearning.mapperservice.UserCouponMapper;
 import cn.seecoder.courselearning.po.Coupon;
 import cn.seecoder.courselearning.po.Course;
 import cn.seecoder.courselearning.po.UserCoupon;
-import cn.seecoder.courselearning.service.CouponStrategy;
+import cn.seecoder.courselearning.service.coupon.couponstrategy.CouponStrategy;
 import cn.seecoder.courselearning.vo.CourseOrderVO;
 import org.springframework.beans.factory.annotation.Autowired;
 

src/main/java/cn/seecoder/courselearning/serviceimpl/couponstrategy/CutDownCouponStrategy.java → src/main/java/cn/seecoder/courselearning/serviceimpl/coupon/couponstrategy/CutDownCouponStrategy.java

@@ -1,4 +1,4 @@
-package cn.seecoder.courselearning.serviceimpl.couponstrategy;
+package cn.seecoder.courselearning.serviceimpl.coupon.couponstrategy;
 
 import cn.seecoder.courselearning.po.Coupon;
 import cn.seecoder.courselearning.util.JSONHelper;

src/main/java/cn/seecoder/courselearning/serviceimpl/couponstrategy/DiscountCouponStrategy.java → src/main/java/cn/seecoder/courselearning/serviceimpl/coupon/couponstrategy/DiscountCouponStrategy.java

@@ -1,4 +1,4 @@
-package cn.seecoder.courselearning.serviceimpl.couponstrategy;
+package cn.seecoder.courselearning.serviceimpl.coupon.couponstrategy;
 
 import cn.seecoder.courselearning.po.Coupon;
 import cn.seecoder.courselearning.util.JSONHelper;

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

@@ -1,11 +1,11 @@
-package cn.seecoder.courselearning.serviceimpl;
+package cn.seecoder.courselearning.serviceimpl.course;
 
 import cn.seecoder.courselearning.mapperservice.CourseLikesMapper;
 import cn.seecoder.courselearning.mapperservice.CourseMapper;
 import cn.seecoder.courselearning.mapperservice.CourseOrderMapper;
 import cn.seecoder.courselearning.po.Course;
 import cn.seecoder.courselearning.po.CourseOrder;
-import cn.seecoder.courselearning.service.CourseService;
+import cn.seecoder.courselearning.service.course.CourseService;
 import cn.seecoder.courselearning.util.Constant;
 import cn.seecoder.courselearning.util.PageInfoUtil;
 import cn.seecoder.courselearning.vo.CourseVO;

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

@@ -1,10 +1,10 @@
-package cn.seecoder.courselearning.serviceimpl;
+package cn.seecoder.courselearning.serviceimpl.course;
 
 import cn.seecoder.courselearning.mapperservice.CourseOrderMapper;
 import cn.seecoder.courselearning.mapperservice.CourseWareMapper;
 import cn.seecoder.courselearning.po.CourseOrder;
 import cn.seecoder.courselearning.po.CourseWare;
-import cn.seecoder.courselearning.service.CourseWareService;
+import cn.seecoder.courselearning.service.course.CourseWareService;
 import cn.seecoder.courselearning.util.Constant;
 import cn.seecoder.courselearning.vo.CourseWareVO;
 import cn.seecoder.courselearning.vo.ResultVO;

src/main/java/cn/seecoder/courselearning/serviceimpl/FileServiceImpl.java → src/main/java/cn/seecoder/courselearning/serviceimpl/file/FileServiceImpl.java

@@ -1,7 +1,7 @@
-package cn.seecoder.courselearning.serviceimpl;
+package cn.seecoder.courselearning.serviceimpl.file;
 
 import cn.seecoder.courselearning.exception.MyException;
-import cn.seecoder.courselearning.service.FileService;
+import cn.seecoder.courselearning.service.file.FileService;
 import cn.seecoder.courselearning.util.Constant;
 import cn.seecoder.courselearning.util.FileHelper;
 import cn.seecoder.courselearning.vo.FileInfoVO;

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

@@ -1,8 +1,8 @@
-package cn.seecoder.courselearning.serviceimpl;
+package cn.seecoder.courselearning.serviceimpl.order;
 
 import cn.seecoder.courselearning.mapperservice.*;
 import cn.seecoder.courselearning.po.*;
-import cn.seecoder.courselearning.service.CourseOrderService;
+import cn.seecoder.courselearning.service.order.CourseOrderService;
 import cn.seecoder.courselearning.util.Constant;
 import cn.seecoder.courselearning.vo.CouponVO;
 import cn.seecoder.courselearning.vo.CourseOrderVO;

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

@@ -1,10 +1,10 @@
-package cn.seecoder.courselearning.serviceimpl;
+package cn.seecoder.courselearning.serviceimpl.order;
 
 import cn.seecoder.courselearning.mapperservice.RechargeOrderMapper;
 import cn.seecoder.courselearning.mapperservice.UserMapper;
 import cn.seecoder.courselearning.po.RechargeOrder;
 import cn.seecoder.courselearning.po.User;
-import cn.seecoder.courselearning.service.RechargeService;
+import cn.seecoder.courselearning.service.order.RechargeService;
 import cn.seecoder.courselearning.util.Constant;
 import cn.seecoder.courselearning.vo.RechargeOrderVO;
 import cn.seecoder.courselearning.vo.ResultVO;

src/main/java/cn/seecoder/courselearning/serviceimpl/UserServiceImpl.java → src/main/java/cn/seecoder/courselearning/serviceimpl/user/UserServiceImpl.java

@@ -1,17 +1,12 @@
-package cn.seecoder.courselearning.serviceimpl;
+package cn.seecoder.courselearning.serviceimpl.user;
 
-import cn.seecoder.courselearning.mapperservice.RechargeOrderMapper;
 import cn.seecoder.courselearning.mapperservice.UserMapper;
-import cn.seecoder.courselearning.po.RechargeOrder;
 import cn.seecoder.courselearning.po.User;
-import cn.seecoder.courselearning.service.UserService;
+import cn.seecoder.courselearning.service.user.UserService;
 import cn.seecoder.courselearning.util.Constant;
-import cn.seecoder.courselearning.vo.RechargeOrderVO;
 import cn.seecoder.courselearning.vo.ResultVO;
 import cn.seecoder.courselearning.vo.UserVO;
 import org.springframework.stereotype.Service;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.util.StringUtils;
 
 import javax.annotation.Resource;

src/test/java/cn/seecoder/courselearning/serviceImpl/UserServiceTest.java

@@ -2,10 +2,7 @@ package cn.seecoder.courselearning.serviceimpl;
 
 import cn.seecoder.courselearning.enums.UserRole;
 import cn.seecoder.courselearning.mapperservice.UserMapper;
-import cn.seecoder.courselearning.service.UserService;
-import cn.seecoder.courselearning.util.Constant;
-import cn.seecoder.courselearning.vo.RechargeOrderVO;
-import cn.seecoder.courselearning.vo.ResultVO;
+import cn.seecoder.courselearning.service.user.UserService;
 import cn.seecoder.courselearning.vo.UserVO;
 import org.junit.Assert;
 import org.junit.FixMethodOrder;