tubinyan преди 5 години
родител
ревизия
64c2e247f0

+ 7 - 1
src/main/java/cn/seecoder/courselearning/controller/NotifyController.java

@@ -14,8 +14,14 @@ public class NotifyController {
     @Resource
     SendNotifyService sendNotifyService;
 
+    /**
+     * 发送
+     * @param uid
+     * @param courseId
+     * @return
+     */
     @PostMapping("/course_order_success")
-    public ResultVO<String> sendSimpleNotify(@RequestParam String uid, @RequestParam Integer courseId) {
+    public ResultVO<String> sendCourseOrderSuccessNotify(@RequestParam String uid, @RequestParam Integer courseId) {
         try {
             sendNotifyService.sendCourseBuySuccessNotify(uid, courseId);
         } catch (HuaweiMessagingException e) {

+ 3 - 0
src/main/java/cn/seecoder/courselearning/service/CourseOrderService.java

@@ -6,7 +6,10 @@ import cn.seecoder.courselearning.vo.ResultVO;
 import java.util.List;
 
 public interface CourseOrderService {
+    // 创建订单
     ResultVO<CourseOrderVO> insertCourseOrder(CourseOrderVO orderVO);
+    // 更新订单
     ResultVO<CourseOrderVO> updateCourseOrder(Integer orderId, Integer orderStatus);
+    // 根据用户id获取该用户的所有订单
     List<CourseOrderVO> getCourseOrders(String uid);
 }

+ 1 - 0
src/main/java/cn/seecoder/courselearning/service/CourseWareService.java

@@ -5,5 +5,6 @@ import cn.seecoder.courselearning.vo.CourseWareVO;
 import java.util.List;
 
 public interface CourseWareService {
+    // 获取课件信息
     List<CourseWareVO> getCourseWare(String uid, Integer courseId);
 }

+ 1 - 0
src/main/java/cn/seecoder/courselearning/service/SendNotifyService.java

@@ -3,5 +3,6 @@ package cn.seecoder.courselearning.service;
 import cn.seecoder.courselearning.exception.HuaweiMessagingException;
 
 public interface SendNotifyService{
+    // 发送课程购买成功的推送信息
     void sendCourseBuySuccessNotify(String uid, Integer courseId) throws HuaweiMessagingException;
 }

+ 3 - 0
src/main/java/cn/seecoder/courselearning/service/UserService.java

@@ -5,7 +5,10 @@ import cn.seecoder.courselearning.vo.ResultVO;
 import cn.seecoder.courselearning.vo.UserVO;
 
 public interface UserService {
+    // 注册用户
     UserVO userLogin(UserVO user);
+    // 根据id查找用户
     UserVO getUser(String uid);
+    // 账号充值
     ResultVO<UserVO> rechargeAccount(RechargeOrderVO rechargeOrderVO);
 }

+ 1 - 0
src/main/java/cn/seecoder/courselearning/service/UserTokenService.java

@@ -1,5 +1,6 @@
 package cn.seecoder.courselearning.service;
 
 public interface UserTokenService {
+    // 更新用户的Token
     void refreshToken(String uid, String token);
 }

+ 11 - 5
src/main/java/cn/seecoder/courselearning/service/impl/CourseOrderServiceImpl.java

@@ -12,7 +12,6 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 @Service
@@ -27,16 +26,23 @@ public class CourseOrderServiceImpl implements CourseOrderService {
         CourseOrder order = new CourseOrder(orderVO);
         try{
             Integer status = order.getStatus();
-            if(status.equals(Constant.ORDER_STATUS_SUCCESS) || status.equals(Constant.ORDER_STATUS_WAIT)){
-                // 当订单状态为支付成功时,需扣除用户余额
+            if(status.equals(Constant.ORDER_STATUS_UNPAID)){
+                // 当订单状态为未支付时,检查用户余额是否足够
                 User user = userMapper.selectByPrimaryKey(order.getUserId());
                 if(user.getBalance()>=orderVO.getCost()){
                     userMapper.decreaseBalance(user.getUid(), order.getCost());
+                    // 支付成功,将订单存入数据库
+                    order.setStatus(Constant.ORDER_STATUS_SUCCESS);
                     orderMapper.insert(order);
-                }else
+                }else {
+                    // 若用户余额不足,则不保存订单,返回失败信息
                     return new ResultVO<>(Constant.REQUEST_FAIL, "用户余额不足");
-            }else if(status.equals(Constant.ORDER_STATUS_UNPAID))
+                }
+            }else if(status.equals(Constant.ORDER_STATUS_SUCCESS) || status.equals(Constant.ORDER_STATUS_WAIT)) {
+                // 若订单状态为已支付,则直接存入数据库
                 orderMapper.insert(order);
+                return new ResultVO<>(Constant.REQUEST_SUCCESS, "订单保存成功");
+            }
         }catch (Exception e){
             return new ResultVO<>(Constant.REQUEST_FAIL, e.toString());
         }

+ 0 - 3
src/main/java/cn/seecoder/courselearning/service/impl/SendNotifyServiceImpl.java

@@ -1,13 +1,10 @@
 package cn.seecoder.courselearning.service.impl;
 
 import cn.seecoder.courselearning.android.*;
-import cn.seecoder.courselearning.enums.Importance;
-import cn.seecoder.courselearning.enums.Visibility;
 import cn.seecoder.courselearning.exception.HuaweiMessagingException;
 import cn.seecoder.courselearning.mapper.UserTokenMapper;
 import cn.seecoder.courselearning.message.AndroidConfig;
 import cn.seecoder.courselearning.message.Message;
-import cn.seecoder.courselearning.message.Notification;
 import cn.seecoder.courselearning.messaging.HuaweiApp;
 import cn.seecoder.courselearning.messaging.HuaweiMessaging;
 import cn.seecoder.courselearning.enums.Urgency;