Merge branch 'master' of http://git.dayaedu.com/yonge/mec

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentServeServiceImpl.java

@@ -73,7 +73,8 @@ public class StudentServeServiceImpl implements StudentServeService {
         }
         for (Integer beServeStudentId : beServeStudentIds) {
             List<StudentServeCourseDto> studentServeCourseDtos = studentTimesMap.get(beServeStudentId);
-            if(CollectionUtils.isEmpty(studentServeCourseDtos)){
+            if(CollectionUtils.isEmpty(studentServeCourseDtos)
+                    ||Objects.isNull(studentServeCourseDtos.get(0).getServiceTagUpdateTime())){
                 serveStudentIds.add(beServeStudentId);
                 continue;
             }

mec-biz/src/main/resources/config/mybatis/StudentMapper.xml

@@ -75,6 +75,7 @@
                 subject_id_list_ = #{subjectIdList},
             </if>
             <if test="serviceTag != null">
+                service_tag_update_time_=IF(service_tag_ = #{serviceTag}, service_tag_update_time_, NOW()),
                 service_tag_ = #{serviceTag},
             </if>
             <if test="operatingTag != null">
@@ -86,8 +87,7 @@
             <if test="teacherId != null">
                 teacher_id_=#{teacherId},
             </if>
-                update_time_ = NOW(),
-                service_tag_update_time_=IF(service_tag_ = #{serviceTag}, service_tag_update_time_, NOW())
+                update_time_ = NOW()
         </set>
         WHERE user_id_ = #{userId}
     </update>
@@ -190,10 +190,10 @@
         UPDATE student
         <set>
             <if test="serviceTag != null">
+                service_tag_update_time_ = IF(service_tag_=#{serviceTag}, service_tag_update_time_, NOW()),
                 service_tag_ = #{serviceTag},
             </if>
-            update_time_ = NOW(),
-            service_tag_update_time_ = IF(service_tag_=#{serviceTag}, service_tag_update_time_, NOW())
+            update_time_ = NOW()
         </set>
         WHERE
             service_tag_=0

mec-student/src/main/java/com/ym/mec/student/controller/StudentOrderController.java

@@ -662,4 +662,11 @@ public class StudentOrderController extends BaseController {
         practice4Organs = practice4Organs.stream().sorted(Comparator.comparingDouble(Practice4OrganDto::getScale).reversed()).collect(Collectors.toList());
         return succeed(practice4Organs);
     }
+
+    @GetMapping("/getIngOrderByGroupType")
+    public HttpResponseResult getIngOrderByGroupType(Integer userId,String musicGroupId,GroupType groupType){
+        List<StudentPaymentOrder> userGroupOrders = studentPaymentOrderDao.findUserGroupOrders(userId, musicGroupId, groupType, DealStatusEnum.ING);
+        return succeed(userGroupOrders);
+
+    }
 }