yonge 5 years ago
parent
commit
ae05f9022b

+ 6 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/dao/VipGroupDao.java

@@ -303,4 +303,10 @@ public interface VipGroupDao extends BaseDAO<Long, VipGroup> {
 	 * @return com.ym.mec.biz.dal.dto.VipBuyResultDto
 	 */
 	VipBuyResultDto getVipBuyResultInfo(@Param("vipGroupId") Integer vipGroupId);
+	
+	/**
+	 * 查询需要结束的对象列表
+	 * @return
+	 */
+	List<VipGroup> queryRequiredOverList();
 }

+ 9 - 1
mec-biz/src/main/java/com/ym/mec/biz/service/impl/VipGroupServiceImpl.java

@@ -1665,7 +1665,15 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 
 	@Override
 	public void updateVipGroupStatusToFinished() {
-		
+		List<VipGroup> vipGroupList = vipGroupDao.queryRequiredOverList();
+		if (vipGroupList != null && vipGroupList.size() > 0) {
+			Date date = new Date();
+			for (VipGroup vipGroup : vipGroupList) {
+				vipGroup.setStatus(VipGroupStatusEnum.FINISHED);
+				vipGroup.setUpdateTime(date);
+			}
+			vipGroupDao.batchUpdate(vipGroupList);
+		}
 	}
 
 	@Override

+ 4 - 0
mec-biz/src/main/resources/config/mybatis/VipGroupMapper.xml

@@ -864,4 +864,8 @@
 	        WHERE id_ = #{item.id}
         </foreach>
     </update>
+    
+    <select id="queryRequiredOverList" resultMap="VipGroup">
+    	select vg.* from vip_group vg left join class_group cg on vg.id_ = cg.music_group_id_ where vg.status_ = 2 and cg.total_class_times_ = cg.current_class_times_ and cg.total_class_times_ &gt; 0
+    </select>
 </mapper>

+ 4 - 0
mec-client-api/src/main/java/com/ym/mec/task/TaskRemoteService.java

@@ -56,4 +56,8 @@ public interface TaskRemoteService {
 	@GetMapping("task/queryOrderStatus")
 	// 订单状态查询
 	public void queryOrderStatus();
+
+	@GetMapping("task/updateVipGroupToFinishedStatus")
+	// 更新VIP课程状态至已结束
+	public void updateVipGroupToFinishedStatus();
 }

+ 25 - 0
mec-task/src/main/java/com/ym/mec/task/jobs/UpdateVipGroupToFinishedStatusTask.java

@@ -0,0 +1,25 @@
+package com.ym.mec.task.jobs;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.ym.mec.task.TaskRemoteService;
+import com.ym.mec.task.core.BaseTask;
+import com.ym.mec.task.core.TaskException;
+
+
+/**
+ * 更新VIP课程状态至已结束
+ */
+@Service
+public class UpdateVipGroupToFinishedStatusTask extends BaseTask {
+
+	@Autowired
+	private TaskRemoteService taskRemoteService;
+
+	@Override
+	public void execute() throws TaskException {
+		taskRemoteService.updateVipGroupToFinishedStatus();
+	}
+
+}

+ 6 - 0
mec-web/src/main/java/com/ym/mec/web/controller/TaskController.java

@@ -60,6 +60,12 @@ public class TaskController extends BaseController {
 		courseScheduleService.updateCourseScheduleToOverStatus();
 	}
 
+	@GetMapping("/updateVipGroupToFinishedStatus")
+	// 更新VIP课程状态至已结束
+	public void updateVipGroupToFinishedStatus() {
+		vipGroupService.updateVipGroupStatusToFinished();
+	}
+
 	@GetMapping("/pushNoSignOutMessage")
 	// 推送未签退消息提醒
 	public void pushNoSignOutMessage() {