fix:merge

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/UserOrderServiceImpl.java

@@ -976,7 +976,7 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
             platformCashAccountRecordService.save(platformCashAccountRecord);
 
             //卖家不能分润自己 买家和分润人相同，不分润
-            if (null != orderDetailVo.getRecomUserId()
+            if (null != orderDetailVo.getRecomUserId() && orderDetailVo.getRecomUserId() != 0
                     && !orderDetailVo.getRecomUserId().equals(orderDetailVo.getMerchId())
                     && !orderDetailVo.getUserId().equals(orderDetailVo.getRecomUserId())) {
                 //获取分润收益费率

cooleshow-user/user-biz/src/main/resources/config/mybatis/CourseScheduleMapper.xml

@@ -790,7 +790,7 @@
         WHERE p.course_id_ IN (SELECT id_ FROM course_schedule  WHERE class_date_=#{today} AND lock_=0 AND type_='PRACTICE')
         GROUP BY p.user_id_;
     </select>
-    <select id="countReplies" resultType="java.lang.Integer" parameterType="java.lang.Integer">
+    <select id="countReplies" resultType="java.lang.Integer">
         SELECT COUNT(1)
         FROM course_schedule_replied
         WHERE student_id_=#{studentId}

service.md

@@ -2,7 +2,7 @@
 - [ ] auth-server
 - [x] admin-server
 - [x] teacher-server
-- [ ] student-server
+- [x] student-server
 - [ ] website-server
 - [ ] task-server
 - [ ] websocket-server