--no commit message

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/controller/student/FgStudentController.java

@@ -15,6 +15,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
+
+import com.zrqx.core.commons.redis.FgRedisManage;
 import com.zrqx.core.constant.member.MemberRequestPath;
 import com.zrqx.core.enums.ResponseCodeEnum;
 import com.zrqx.core.enums.member.member.MemberSexEnum;
@@ -46,6 +48,8 @@ public class FgStudentController {
 	private FgStudentService fgStudentService;
 	@Autowired
 	private ExportService exportService;
+	@Autowired
+	private FgRedisManage redis;
 	
 	@ApiOperation(value = "学生列表",notes = "分页查询")
 	@GetMapping(value = MemberRequestPath.PAGE)
@@ -131,6 +135,13 @@ public class FgStudentController {
 		return CallBack.success(fgStudentService.listAcademicLevel(form));
 	}
 	
+	@ApiOperation(value = "学级列表", notes = "去重之后的学级列表")
+	@GetMapping(value = MemberRequestPath.INFO)
+	public CallBack<Student> student() {
+		Student student = redis.getStudent();
+		return CallBack.success(student);
+	}
+	
 	
 	
 	

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/service/order/FgOrderServiceImpl.java

@@ -77,7 +77,7 @@ public class FgOrderServiceImpl extends BaseModelServiceImpl<Order,Integer> impl
 			//保存订单详情
 			orderInfoManage.save(form, order.getId());
 		}
-		if(form.getVariety().equals(OrderVarietyEnum.FACT_ORDER.getCode())){
+		if(form.getVariety().equals(OrderVarietyEnum.FACT_ORDER.getCode()) || form.getVariety().equals(OrderVarietyEnum.TRAIN_ORDER.getCode())){
 			//保存订单详情
 			orderInfoManage.saveFast(form, order.getId());
 		}