--no commit message

com.zrqx.core/src/main/java/com/zrqx/core/form/member/fg/basicteachingplan/QueryAcademicLevelForm.java

@@ -18,5 +18,8 @@ public class QueryAcademicLevelForm {
 	private Integer majorId;
 	@ApiModelProperty("部门id")
 	private Integer departmentId;
+	@ApiModelProperty("分担管理页面：1   快速订单页面2")
+	private String status;
+	
 
 }

com.zrqx.core/src/main/java/com/zrqx/core/vo/schoolsysuser/fg/studentorder/StudentOrderInfoVo.java

@@ -2,6 +2,7 @@ package com.zrqx.core.vo.schoolsysuser.fg.studentorder;
 
 import java.util.List;
 
+import com.zrqx.core.model.school.studentorder.StudentOrder;
 import com.zrqx.core.model.school.studentorder.StudentOrderInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -9,7 +10,7 @@ import lombok.Data;
 
 @Data
 @ApiModel(value = "StudentOrderInfoVo",description = "学生订单支付vo")
-public class StudentOrderInfoVo extends StudentOrderInfo{
+public class StudentOrderInfoVo extends StudentOrder{
 	
 	@ApiModelProperty("学号")
 	private String stuNumber;

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/service/publiclesson/FgPublicBasicRelationServiceImpl.java

@@ -198,8 +198,10 @@ public class FgPublicBasicRelationServiceImpl extends BaseServiceImpl<PublicBasi
 		form.setRelationId(redis.getMember().getRelationId());
 		form.setType(redis.getMember().getType());
 		CycleStatusAndFlowCodeVo vo = biddingFlowService.getBiddingConfig();
-		if(!vo.getFlowCode().equals("1")){
-			form.setDepartmentId(redis.getMember().getDepartmentId());
+		if(form.getStatus().equals("1")){
+			if(!vo.getFlowCode().equals("1")){
+				form.setDepartmentId(redis.getMember().getDepartmentId());
+			}
 		}
 		List<Integer> list = fgPublicBasicRelationMapper.listAcademicLevel(form);
 		return list;
@@ -210,8 +212,10 @@ public class FgPublicBasicRelationServiceImpl extends BaseServiceImpl<PublicBasi
 		form.setRelationId(redis.getMember().getRelationId());
 		form.setType(redis.getMember().getType());
 		CycleStatusAndFlowCodeVo vo = biddingFlowService.getBiddingConfig();
-		if(!vo.getFlowCode().equals("1")){
-			form.setDepartmentId(redis.getMember().getDepartmentId());
+		if(form.getStatus().equals("1")){
+			if(!vo.getFlowCode().equals("1")){
+				form.setDepartmentId(redis.getMember().getDepartmentId());
+			}
 		}
 		List<RecommendMajorVo> list = fgPublicBasicRelationMapper.listMajor(form);
 		return list;
@@ -222,8 +226,10 @@ public class FgPublicBasicRelationServiceImpl extends BaseServiceImpl<PublicBasi
 		form.setRelationId(redis.getMember().getRelationId());
 		form.setType(redis.getMember().getType());
 		CycleStatusAndFlowCodeVo vo = biddingFlowService.getBiddingConfig();
-		if(!vo.getFlowCode().equals("1")){
-			form.setDepartmentId(redis.getMember().getDepartmentId());
+		if(form.getStatus().equals("1")){
+			if(!vo.getFlowCode().equals("1")){
+				form.setDepartmentId(redis.getMember().getDepartmentId());
+			}
 		}
 		List<RecommendPlanVo> list = fgPublicBasicRelationMapper.listPlan(form);
 		return list;

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/service/studentorder/StudentOrderInfoServiceImpl.java

 package com.zrqx.school.sysuser.service.studentorder;
 
+import java.math.BigDecimal;
 import java.util.List;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
 import com.zrqx.core.commons.redis.FgRedisManage;
-import com.zrqx.core.enums.BooleanStatusEnum;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.member.classmanagement.ClassManagement;
 import com.zrqx.core.model.member.major.Major;
@@ -14,6 +12,7 @@ import com.zrqx.core.model.member.student.Student;
 import com.zrqx.core.model.school.studentorder.StudentOrder;
 import com.zrqx.core.model.school.studentorder.StudentOrderInfo;
 import com.zrqx.core.service.BaseModelServiceImpl;
+import com.zrqx.core.util.bean.BeanUtils;
 import com.zrqx.core.util.response.CallBack;
 import com.zrqx.core.vo.member.department.DepartmentMemberVo;
 import com.zrqx.core.vo.schoolsysuser.fg.studentorder.StudentOrderInfoVo;
@@ -22,7 +21,6 @@ import com.zrqx.school.sysuser.manage.studentorder.StudentOrderManage;
 import com.zrqx.school.sysuser.mapper.classmanagement.FgClassManagementMapper;
 import com.zrqx.school.sysuser.mapper.major.FgMajorMapper;
 import com.zrqx.school.sysuser.mapper.studentorder.StudentOrderInfoMapper;
-import com.zrqx.school.sysuser.mapper.studentorder.StudentOrderMapper;
 
 @Service
 public class StudentOrderInfoServiceImpl extends BaseModelServiceImpl<StudentOrderInfo,Integer> implements StudentOrderInfoService{
@@ -56,10 +54,13 @@ public class StudentOrderInfoServiceImpl extends BaseModelServiceImpl<StudentOrd
 		StudentOrderInfo info = new StudentOrderInfo();
 		info.setOrderId(order.getId());
 		List<StudentOrderInfo> list = super.select(info);
+		//计算价格
+		list.forEach(price ->{
+			price.setPrice(price.getPrice().multiply(price.getDiscount().divide(new BigDecimal(10))));
+		});
 		vo.setList(list);
 		//获取学生信息
-		vo.setStuNumber(student.getIDNumber());
-		vo.setName(student.getName());
+		BeanUtils.copyProperties(order, vo);
 		//获取班级名称
 		ClassManagement cm = fgClassManagementMapper.selectByPrimaryKey(student.getClassId());
 		vo.setClassName(cm.getName());