Merge branch 'feature/coupon' into correct

# Conflicts:
#	src/main/java/cn/seecoder/courselearning/controller/CourseOrderController.java

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

@@ -30,6 +30,12 @@ public class CourseOrderController {
         return orderService.getCourseOrders(uid);
     }
 
+    @GetMapping("/orderId/{orderId}")
+    public ResultVO<CourseOrderVO> getCourseOrderById(@PathVariable Integer orderId){
+        return orderService.getCourseOrderById(orderId);
+    }
+
+
     @PostMapping("/update")
     public ResultVO<CourseOrderVO> updateCourseOrderStatus(@RequestParam Integer orderId, @RequestParam Integer orderStatus){
         return orderService.updateCourseOrder(orderId, orderStatus);

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

@@ -18,4 +18,6 @@ public interface CourseOrderService {
     ResultVO<Boolean> useCoupon(CourseOrderVO orderVO, Integer couponId);
     // 取消使用优惠券/活动
     ResultVO<Boolean> cancelCoupon(CourseOrderVO orderVO, Integer couponId);
+
+    ResultVO<CourseOrderVO> getCourseOrderById(Integer orderId);
 }

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

@@ -4,10 +4,13 @@ import cn.seecoder.courselearning.mapperservice.*;
 import cn.seecoder.courselearning.po.*;
 import cn.seecoder.courselearning.service.order.CourseOrderService;
 import cn.seecoder.courselearning.util.Constant;
+import cn.seecoder.courselearning.util.JSONHelper;
 import cn.seecoder.courselearning.vo.CouponVO;
 import cn.seecoder.courselearning.vo.CourseOrderVO;
 import cn.seecoder.courselearning.vo.ResultVO;
+import com.fasterxml.jackson.databind.util.BeanUtil;
 import org.omg.CORBA.IntHolder;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -188,6 +191,14 @@ public class CourseOrderServiceImpl implements CourseOrderService {
         return new ResultVO<>(Constant.REQUEST_SUCCESS, "取消使用成功！");
     }
 
+    @Override
+    public ResultVO<CourseOrderVO> getCourseOrderById(Integer orderId) {
+        CourseOrder order = orderMapper.selectByPrimaryKey(orderId);
+        CourseOrderVO orderVO = new CourseOrderVO();
+        BeanUtils.copyProperties(order,orderVO);
+        return new ResultVO<>(Constant.REQUEST_SUCCESS,"获取订单信息成功",orderVO);
+    }
+
     public void updateBestCost(CourseOrderVO orderVO) {
         List<Coupon> usedCoupons = couponMapper.selectByOrderId(orderVO.getId());
         boolean[] used = new boolean[usedCoupons.size()];