--no commit message

com.zrqx.core/src/main/java/com/zrqx/core/form/member/fg/permissions/LoginMemberInfo.java

@@ -30,5 +30,7 @@ public class LoginMemberInfo {
 	private String departmentName;
 	@ApiModelProperty("token")
 	private String token;
+	@ApiModelProperty("登录用户类型（用来区分当前登录用户是老师还是学校）0:老师  1:学生")
+	private String loginMemberType;
 	
 }

com.zrqx.core/src/main/java/com/zrqx/core/form/school/sysuser/fg/studentorder/QueryStudentOrderForm.java

@@ -23,5 +23,14 @@ public class QueryStudentOrderForm {
 	@ApiModelProperty("身份证号码")
 	private String IDNumber;
 	
+	@ApiModelProperty("经销商id")
+	private Integer supplierId;
+	
+	@ApiModelProperty("资源名称")
+	private String resName;
+	
+	@ApiModelProperty("isbn")
+	private String isbn;
+	
 
 }

com.zrqx.core/src/main/java/com/zrqx/core/model/school/studentorder/StudentOrderInfo.java

@@ -7,6 +7,7 @@ import java.math.BigDecimal;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 import com.zrqx.core.model.base.BaseModel;
 
@@ -47,5 +48,27 @@ public class StudentOrderInfo extends BaseModel{
 	
 	@ApiModelProperty("经销商id")
 	private Integer supplierId;
+	
+	
+	
+	@Transient
+	@ApiModelProperty("isbn")
+	private String isbn;
+	
+	@Transient
+	@ApiModelProperty("作者")
+	private String auther;
+	
+	@Transient
+	@ApiModelProperty("订购数量")
+	private BigDecimal orderNumber;
+	
+	
+	@Transient
+	@ApiModelProperty("订购机构数量")
+	private Integer Number;
+	
+	@ApiModelProperty("销售金额")
+	private BigDecimal payPrice;
 
 }

com.zrqx.fg.member/src/main/java/com/zrqx/fg/member/service/permissions/FgPermissionsServiceImpl.java

@@ -154,6 +154,7 @@ public class FgPermissionsServiceImpl  implements FgPermissionsService {
 			
 			
 			info = fgMemberManage.getMemberInfo(member);
+			info.setLoginMemberType("0");
 			// token修改
 			String token = MD5Util.getEncoderByMd5(member.getPhone());
 			info.setToken(token);
@@ -183,6 +184,7 @@ public class FgPermissionsServiceImpl  implements FgPermissionsService {
 			}
 			
 			info = fgMemberManage.getStudentInfo(student);
+			info.setLoginMemberType("1");
 			// token修改
 			String token = MD5Util.getEncoderByMd5(student.getIDNumber());
 			info.setToken(token);

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

@@ -58,7 +58,7 @@ public class FgStudentController {
 	
 	@ApiOperation(value = "保存",notes = "新增一个")
 	@PostMapping(value = MemberRequestPath.SAVE)
-	public CallBack<Boolean> save(@RequestBody Student form){
+	public CallBack<Boolean> save(@RequestBody Student form) throws Exception{
 		return fgStudentService.save(form) ? CallBack.success() : CallBack.fail();
 	}
 	

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/controller/studentorder/StudentOrderController.java

@@ -11,9 +11,11 @@ import com.zrqx.core.constant.school.sysuser.SchoolRequestPath;
 import com.zrqx.core.form.school.sysuser.fg.studentorder.QueryStudentOrderForm;
 import com.zrqx.core.model.member.school.School;
 import com.zrqx.core.model.member.supplier.FgSupplier;
+import com.zrqx.core.model.school.studentorder.StudentOrderInfo;
 import com.zrqx.core.util.page.PageInfo;
 import com.zrqx.core.util.page.PageParam;
 import com.zrqx.core.util.response.CallBack;
+import com.zrqx.core.vo.schoolsysuser.fg.studentorder.StudentOrderInfoVo;
 import com.zrqx.core.vo.schoolsysuser.fg.studentorder.StudentOrderVo;
 import com.zrqx.school.sysuser.service.studentorder.StudentOrderService;
 
@@ -58,7 +60,7 @@ public class StudentOrderController {
 	
 	@ApiOperation(value = "经销商账单管理",notes = "经销商账单管理")
 	@GetMapping(value =SchoolRequestPath.SUPPLIER + SchoolRequestPath.PAGE)
-	public CallBack<PageInfo<StudentOrderVo>> supplierPage(PageParam pageParam, QueryStudentOrderForm form){
+	public CallBack<PageInfo<StudentOrderInfo>> supplierPage(PageParam pageParam, QueryStudentOrderForm form){
 		return CallBack.success(studentOrderService.supplierPage(pageParam,form));
 	}
 

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/mapper/studentorder/StudentOrderMapper.java

@@ -12,6 +12,7 @@ import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.member.school.School;
 import com.zrqx.core.model.member.supplier.FgSupplier;
 import com.zrqx.core.model.school.studentorder.StudentOrder;
+import com.zrqx.core.model.school.studentorder.StudentOrderInfo;
 import com.zrqx.core.vo.schoolsysuser.fg.studentorder.StudentOrderVo;
 
 @Mapper
@@ -54,6 +55,13 @@ public interface StudentOrderMapper extends BaseMapper<StudentOrder>{
 			+ "</script>")
 	List<FgSupplier> supplierList();
 	
+	/**
+	 * 学生支付页面
+	 * @param form
+	 * @return
+	 * @auther zzg
+	 * @data 2019年9月3日 下午5:37:03
+	 */
 	@Select("<script>"
 			+ " SELECT s.orderNumber,c.`name`,c.IDNumber,s.id,c.sex,c.relationId,s.createTime,s.payment from school_student_order s LEFT JOIN me_student c  ON s.studentId = c.id  "
 			+ " where 1=1 "
@@ -65,6 +73,24 @@ public interface StudentOrderMapper extends BaseMapper<StudentOrder>{
 			+ "</script>")
 	List<StudentOrderVo> list(@Param("form") QueryStudentOrderForm form);
 	
+	/**
+	 * 经销商账单管理
+	 * @param form
+	 * @return
+	 * @auther zzg
+	 * @data 2019年9月3日 下午5:59:19
+	 */
+	
+	@Select("<script>"
+			+ " SELECT * from  school_student_order_info s  LEFT JOIN school_student_order o  ON o.id = s.orderId = o.id "
+			+ " LEFT JOIN me_student t ON o.studentId =  t.id "
+			+ " where 1=1 "
+			+ " eq(s.supplierId,query.supplierId) "
+			+ " eq(t.academicLevel,query.academicLevel) "
+			+ " like(s.resName,query.resName) "
+			+ "</script>")
+	List<StudentOrderInfo> supplierList(@Param("query") QueryStudentOrderForm form);
+	
 	
 	
 

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/service/student/FgStudentService.java

@@ -38,7 +38,7 @@ public interface FgStudentService extends BaseService<Student,Integer>{
 	 * @author zzg
 	 * @date: 2019年7月4日 下午6:16:41
 	 */
-	boolean save(Student form);
+	boolean save(Student form) throws Exception;
 	
 	 /**
 	  * 修改学生信息

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/service/student/FgStudentServiceImpl.java

@@ -23,6 +23,7 @@ import com.zrqx.core.model.member.student.Student;
 import com.zrqx.core.model.school.export.Export;
 import com.zrqx.core.service.BaseModelServiceImpl;
 import com.zrqx.core.util.bean.BeanUtils;
+import com.zrqx.core.util.encry.MD5Util;
 import com.zrqx.core.util.excelutil.ExcelUtil;
 import com.zrqx.core.util.page.PageInfo;
 import com.zrqx.core.util.page.PageParam;
@@ -93,7 +94,7 @@ public class FgStudentServiceImpl extends BaseModelServiceImpl<Student,Integer>
 	}
 
 	@Override
-	public boolean save(Student form) {
+	public boolean save(Student form) throws Exception{
 		form.setRelationId(redis.getMember().getRelationId());
 		form.setType(redis.getMember().getType());
 		// 学号验证
@@ -101,7 +102,7 @@ public class FgStudentServiceImpl extends BaseModelServiceImpl<Student,Integer>
 		// 身份证号验证
 		this.isExistIDNumber(form, null);
 		String id = form.getIDNumber();
-		form.setPassword(id.substring(id.length()-6,id.length()));
+		form.setPassword(MD5Util.getEncoderByMd5(id.substring(id.length()-6,id.length())));
 		super.insert(form);
 		return true;
 	}

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

@@ -58,6 +58,9 @@ public class StudentOrderInfoServiceImpl extends BaseModelServiceImpl<StudentOrd
 		list.forEach(price ->{
 			price.setPrice(price.getPrice().multiply(price.getDiscount().divide(new BigDecimal(10))));
 		});
+		//实际支付金额
+		BigDecimal bill = list.stream().map(cost -> cost.getPrice()).reduce((sum, cost) -> sum.add(cost)).get();
+		vo.setPayment(bill);
 		vo.setList(list);
 		//获取学生信息
 		BeanUtils.copyProperties(order, vo);

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

@@ -6,9 +6,11 @@ import com.zrqx.core.form.school.sysuser.fg.studentorder.QueryStudentOrderForm;
 import com.zrqx.core.model.member.school.School;
 import com.zrqx.core.model.member.supplier.FgSupplier;
 import com.zrqx.core.model.school.studentorder.StudentOrder;
+import com.zrqx.core.model.school.studentorder.StudentOrderInfo;
 import com.zrqx.core.service.BaseService;
 import com.zrqx.core.util.page.PageInfo;
 import com.zrqx.core.util.page.PageParam;
+import com.zrqx.core.vo.schoolsysuser.fg.studentorder.StudentOrderInfoVo;
 import com.zrqx.core.vo.schoolsysuser.fg.studentorder.StudentOrderVo;
 
 public interface StudentOrderService extends BaseService<StudentOrder,Integer>{
@@ -31,7 +33,7 @@ public interface StudentOrderService extends BaseService<StudentOrder,Integer>{
 	 * @auther zzg
 	 * @data 2019年8月22日 上午11:58:41
 	 */
-	PageInfo<StudentOrderVo> supplierPage(PageParam pageParam, QueryStudentOrderForm form);
+	PageInfo<StudentOrderInfo> supplierPage(PageParam pageParam, QueryStudentOrderForm form);
 	
 	/**
 	 * 学级列表

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

@@ -11,10 +11,12 @@ import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.member.school.School;
 import com.zrqx.core.model.member.supplier.FgSupplier;
 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.page.PageInfo;
 import com.zrqx.core.util.page.PageParam;
 import com.zrqx.core.util.response.CallBack;
+import com.zrqx.core.vo.schoolsysuser.fg.studentorder.StudentOrderInfoVo;
 import com.zrqx.core.vo.schoolsysuser.fg.studentorder.StudentOrderVo;
 import com.zrqx.school.sysuser.client.BgMemberClient;
 import com.zrqx.school.sysuser.mapper.studentorder.StudentOrderMapper;
@@ -51,9 +53,12 @@ public class StudentOrderServiceImpl extends BaseModelServiceImpl<StudentOrder,I
 	
 
 	@Override
-	public PageInfo<StudentOrderVo> supplierPage(PageParam pageParam, QueryStudentOrderForm form) {
+	public PageInfo<StudentOrderInfo> supplierPage(PageParam pageParam, QueryStudentOrderForm form) {
+		this.fmtOrderBy(pageParam);
+		startPage(pageParam);
+		List<StudentOrderInfo> list = studentOrderMapper.supplierList(form);
 		
-		return null;
+		return new PageInfo<StudentOrderInfo>(list);
 	}
 	
 	public void fmtOrderBy(PageParam pageParam){