Merge branch 'master' of http://git.dayaedu.com/yonge/edu-saas

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/ExamAgencyRelationController.java

@@ -3,12 +3,14 @@ package com.keao.edu.user.controller;
 import com.keao.edu.common.controller.BaseController;
 import com.keao.edu.common.entity.HttpResponseResult;
 import com.keao.edu.common.page.PageInfo;
+import com.keao.edu.user.entity.Agency;
 import com.keao.edu.user.entity.ExamAgencyRelation;
 import com.keao.edu.user.page.ExamAgencyRelationQueryInfo;
 import com.keao.edu.user.service.ExamAgencyRelationService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 /**

edu-user/edu-user-server/src/main/java/com/keao/edu/user/dao/ExamCertificationDao.java

@@ -0,0 +1,9 @@
+package com.keao.edu.user.dao;
+
+import com.keao.edu.common.dal.BaseDAO;
+import com.keao.edu.user.entity.ExamCertification;
+
+public interface ExamCertificationDao extends BaseDAO<Long, ExamCertification> {
+
+	
+}

edu-user/edu-user-server/src/main/java/com/keao/edu/user/dao/ExamRegistrationDao.java

@@ -0,0 +1,10 @@
+package com.keao.edu.user.dao;
+
+
+import com.keao.edu.common.dal.BaseDAO;
+import com.keao.edu.user.entity.ExamRegistration;
+
+public interface ExamRegistrationDao extends BaseDAO<Long, ExamRegistration> {
+
+	
+}

edu-user/edu-user-server/src/main/java/com/keao/edu/user/dao/ExamRegistrationPaymentDao.java

@@ -0,0 +1,9 @@
+package com.keao.edu.user.dao;
+
+import com.keao.edu.common.dal.BaseDAO;
+import com.keao.edu.user.entity.ExamRegistrationPayment;
+
+public interface ExamRegistrationPaymentDao extends BaseDAO<Long, ExamRegistrationPayment> {
+
+	
+}

edu-user/edu-user-server/src/main/java/com/keao/edu/user/entity/ExamAgencyRelation.java

@@ -5,6 +5,8 @@ import com.keao.edu.user.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import java.math.BigDecimal;
+
 /**
  * 对应数据库表(exam_agency_relation):
  */
@@ -12,6 +14,9 @@ public class ExamAgencyRelation {
 
 	private Long id;
 
+	@ApiModelProperty(value = "代理商基本信息")
+	private Agency agency;
+
 	@ApiModelProperty(value = "考试编号")
 	private Integer examinationBasicId;
 
@@ -24,6 +29,12 @@ public class ExamAgencyRelation {
 	@ApiModelProperty(value = "分润金额")
 	private java.math.BigDecimal shareProfitAmount;
 
+	@ApiModelProperty(value = "总报名人数")
+	private Integer totalRegistrationStudentNum;
+
+	@ApiModelProperty(value = "总缴费金额")
+	private BigDecimal totalPaymentAmount;
+
 	@ApiModelProperty(value = "链接地址")
 	private String url;
 
@@ -43,7 +54,15 @@ public class ExamAgencyRelation {
 	public Long getId(){
 		return this.id;
 	}
-			
+
+	public Agency getAgency() {
+		return agency;
+	}
+
+	public void setAgency(Agency agency) {
+		this.agency = agency;
+	}
+
 	public void setExaminationBasicId(Integer examinationBasicId){
 		this.examinationBasicId = examinationBasicId;
 	}
@@ -51,7 +70,23 @@ public class ExamAgencyRelation {
 	public Integer getExaminationBasicId(){
 		return this.examinationBasicId;
 	}
-			
+
+	public Integer getTotalRegistrationStudentNum() {
+		return totalRegistrationStudentNum;
+	}
+
+	public void setTotalRegistrationStudentNum(Integer totalRegistrationStudentNum) {
+		this.totalRegistrationStudentNum = totalRegistrationStudentNum;
+	}
+
+	public BigDecimal getTotalPaymentAmount() {
+		return totalPaymentAmount;
+	}
+
+	public void setTotalPaymentAmount(BigDecimal totalPaymentAmount) {
+		this.totalPaymentAmount = totalPaymentAmount;
+	}
+
 	public void setAgencyId(Integer agencyId){
 		this.agencyId = agencyId;
 	}

edu-user/edu-user-server/src/main/java/com/keao/edu/user/entity/ExamCertification.java

@@ -0,0 +1,144 @@
+package com.keao.edu.user.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+/**
+ * 对应数据库表(exam_certification):
+ */
+public class ExamCertification {
+
+	private Long id;
+
+	@ApiModelProperty(value = "考级项目编号")
+	private Integer examinationBasicId;
+
+	@ApiModelProperty(value = "学生编号")
+	private Integer studentId;
+
+	@ApiModelProperty(value = "证件号")
+	private String cardNo;
+
+	@ApiModelProperty(value = "专业编号")
+	private Integer subjectId;
+
+	@ApiModelProperty(value = "报考级别")
+	private Integer level;
+
+	@ApiModelProperty(value = "考试开始时间")
+	private java.util.Date examStartTime;
+
+	@ApiModelProperty(value = "考试结束时间")
+	private java.util.Date examEndTime;
+
+	@ApiModelProperty(value = "考试地址")
+	private String examAddress;
+
+	private java.util.Date createTime;
+
+	private java.util.Date updateTime;
+
+	private String tenantId;
+	
+	public void setId(Long id){
+		this.id = id;
+	}
+	
+	public Long getId(){
+		return this.id;
+	}
+			
+	public void setExaminationBasicId(Integer examinationBasicId){
+		this.examinationBasicId = examinationBasicId;
+	}
+	
+	public Integer getExaminationBasicId(){
+		return this.examinationBasicId;
+	}
+			
+	public void setStudentId(Integer studentId){
+		this.studentId = studentId;
+	}
+	
+	public Integer getStudentId(){
+		return this.studentId;
+	}
+			
+	public void setCardNo(String cardNo){
+		this.cardNo = cardNo;
+	}
+	
+	public String getCardNo(){
+		return this.cardNo;
+	}
+			
+	public void setSubjectId(Integer subjectId){
+		this.subjectId = subjectId;
+	}
+	
+	public Integer getSubjectId(){
+		return this.subjectId;
+	}
+			
+	public void setLevel(Integer level){
+		this.level = level;
+	}
+	
+	public Integer getLevel(){
+		return this.level;
+	}
+			
+	public void setExamStartTime(java.util.Date examStartTime){
+		this.examStartTime = examStartTime;
+	}
+	
+	public java.util.Date getExamStartTime(){
+		return this.examStartTime;
+	}
+			
+	public void setExamEndTime(java.util.Date examEndTime){
+		this.examEndTime = examEndTime;
+	}
+	
+	public java.util.Date getExamEndTime(){
+		return this.examEndTime;
+	}
+			
+	public void setExamAddress(String examAddress){
+		this.examAddress = examAddress;
+	}
+	
+	public String getExamAddress(){
+		return this.examAddress;
+	}
+			
+	public void setCreateTime(java.util.Date createTime){
+		this.createTime = createTime;
+	}
+	
+	public java.util.Date getCreateTime(){
+		return this.createTime;
+	}
+			
+	public void setUpdateTime(java.util.Date updateTime){
+		this.updateTime = updateTime;
+	}
+	
+	public java.util.Date getUpdateTime(){
+		return this.updateTime;
+	}
+			
+	public void setTenantId(String tenantId){
+		this.tenantId = tenantId;
+	}
+	
+	public String getTenantId(){
+		return this.tenantId;
+	}
+			
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+}

edu-user/edu-user-server/src/main/java/com/keao/edu/user/entity/ExamRegistration.java

@@ -0,0 +1,212 @@
+package com.keao.edu.user.entity;
+
+import com.keao.edu.auth.api.entity.SysUser;
+import com.keao.edu.user.enums.StudentRegistrationStatusEnum;
+import io.swagger.annotations.ApiModelProperty;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+/**
+ * 对应数据库表(exam_registration):
+ */
+public class ExamRegistration {
+
+	private Long id;
+	
+	@ApiModelProperty(value = "考级项目编号")
+	private Integer examinationBasicId;
+	
+	@ApiModelProperty(value = "学员编号")
+	private Integer studentId;
+
+	@ApiModelProperty(value = "学员基本信息")
+	private SysUser sysUser;
+
+	@ApiModelProperty(value = "代理商编号")
+	private Integer agencyId;
+	
+	@ApiModelProperty(value = "专业编号")
+	private Integer subjectId;
+
+	@ApiModelProperty(value = "专业信息")
+	private Subject subject;
+	
+	@ApiModelProperty(value = "报考级别")
+	private Integer level;
+	
+	@ApiModelProperty(value = "考试内容")
+	private String songJson;
+	
+	@ApiModelProperty(value = "上次报考级别")
+	private Integer lastExamLevel;
+	
+	@ApiModelProperty(value = "上次报考证书")
+	private String lastExamCertificateUrl;
+	
+	@ApiModelProperty(value = "指导老师姓名")
+	private String adviserName;
+	
+	@ApiModelProperty(value = "指导老师电话")
+	private String adviserPhone;
+
+	@ApiModelProperty(value = "证件号")
+	private String cardNo;
+
+	@ApiModelProperty(value = "报名状态")
+	private StudentRegistrationStatusEnum status;
+
+	private java.util.Date createTime;
+
+	private java.util.Date updateTime;
+
+	private String tenantId;
+	
+	public void setId(Long id){
+		this.id = id;
+	}
+	
+	public Long getId(){
+		return this.id;
+	}
+
+	public StudentRegistrationStatusEnum getStatus() {
+		return status;
+	}
+
+	public void setStatus(StudentRegistrationStatusEnum status) {
+		this.status = status;
+	}
+
+	public SysUser getSysUser() {
+		return sysUser;
+	}
+
+	public void setSysUser(SysUser sysUser) {
+		this.sysUser = sysUser;
+	}
+
+	public Subject getSubject() {
+		return subject;
+	}
+
+	public void setSubject(Subject subject) {
+		this.subject = subject;
+	}
+
+	public void setExaminationBasicId(Integer examinationBasicId){
+		this.examinationBasicId = examinationBasicId;
+	}
+	
+	public Integer getExaminationBasicId(){
+		return this.examinationBasicId;
+	}
+			
+	public void setStudentId(Integer studentId){
+		this.studentId = studentId;
+	}
+	
+	public Integer getStudentId(){
+		return this.studentId;
+	}
+			
+	public void setAgencyId(Integer agencyId){
+		this.agencyId = agencyId;
+	}
+	
+	public Integer getAgencyId(){
+		return this.agencyId;
+	}
+			
+	public void setSubjectId(Integer subjectId){
+		this.subjectId = subjectId;
+	}
+	
+	public Integer getSubjectId(){
+		return this.subjectId;
+	}
+			
+	public void setLevel(Integer level){
+		this.level = level;
+	}
+	
+	public Integer getLevel(){
+		return this.level;
+	}
+			
+	public void setSongJson(String songJson){
+		this.songJson = songJson;
+	}
+	
+	public String getSongJson(){
+		return this.songJson;
+	}
+			
+	public void setLastExamLevel(Integer lastExamLevel){
+		this.lastExamLevel = lastExamLevel;
+	}
+	
+	public Integer getLastExamLevel(){
+		return this.lastExamLevel;
+	}
+			
+	public void setLastExamCertificateUrl(String lastExamCertificateUrl){
+		this.lastExamCertificateUrl = lastExamCertificateUrl;
+	}
+	
+	public String getLastExamCertificateUrl(){
+		return this.lastExamCertificateUrl;
+	}
+			
+	public void setAdviserName(String adviserName){
+		this.adviserName = adviserName;
+	}
+	
+	public String getAdviserName(){
+		return this.adviserName;
+	}
+			
+	public void setAdviserPhone(String adviserPhone){
+		this.adviserPhone = adviserPhone;
+	}
+	
+	public String getAdviserPhone(){
+		return this.adviserPhone;
+	}
+
+	public String getCardNo() {
+		return cardNo;
+	}
+
+	public void setCardNo(String cardNo) {
+		this.cardNo = cardNo;
+	}
+
+	public void setCreateTime(java.util.Date createTime){
+		this.createTime = createTime;
+	}
+	
+	public java.util.Date getCreateTime(){
+		return this.createTime;
+	}
+			
+	public void setUpdateTime(java.util.Date updateTime){
+		this.updateTime = updateTime;
+	}
+	
+	public java.util.Date getUpdateTime(){
+		return this.updateTime;
+	}
+			
+	public void setTenantId(String tenantId){
+		this.tenantId = tenantId;
+	}
+	
+	public String getTenantId(){
+		return this.tenantId;
+	}
+			
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+}

edu-user/edu-user-server/src/main/java/com/keao/edu/user/entity/ExamRegistrationPayment.java

@@ -0,0 +1,144 @@
+package com.keao.edu.user.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+/**
+ * 对应数据库表(exam_registration_payment):
+ */
+public class ExamRegistrationPayment {
+
+	private Long id;
+	
+	@ApiModelProperty(value = "学员报考编号")
+	private Long examRegistrationId;
+
+	@ApiModelProperty(value = "学员编号")
+	private Integer studentId;
+
+	@ApiModelProperty(value = "报考项目编号")
+	private Integer examinationBasicId;
+
+	@ApiModelProperty(value = "订单号（系统自动生成）")
+	private String orderNo;
+
+	@ApiModelProperty(value = "交易流水号（由第三方返回）")
+	private String transNo;
+
+	@ApiModelProperty(value = "交易金额")
+	private java.math.BigDecimal transAmount;
+
+	@ApiModelProperty(value = "交易状态")
+	private String transStatus;
+
+	@ApiModelProperty(value = "交易成功时间")
+	private java.util.Date transSuccessedTime;
+
+	private java.util.Date createTime;
+
+	private java.util.Date updateTime;
+
+	private String tenantId;
+	
+	public void setId(Long id){
+		this.id = id;
+	}
+	
+	public Long getId(){
+		return this.id;
+	}
+			
+	public void setExamRegistrationId(Long examRegistrationId){
+		this.examRegistrationId = examRegistrationId;
+	}
+	
+	public Long getExamRegistrationId(){
+		return this.examRegistrationId;
+	}
+			
+	public void setStudentId(Integer studentId){
+		this.studentId = studentId;
+	}
+	
+	public Integer getStudentId(){
+		return this.studentId;
+	}
+			
+	public void setExaminationBasicId(Integer examinationBasicId){
+		this.examinationBasicId = examinationBasicId;
+	}
+	
+	public Integer getExaminationBasicId(){
+		return this.examinationBasicId;
+	}
+			
+	public void setOrderNo(String orderNo){
+		this.orderNo = orderNo;
+	}
+	
+	public String getOrderNo(){
+		return this.orderNo;
+	}
+			
+	public void setTransNo(String transNo){
+		this.transNo = transNo;
+	}
+	
+	public String getTransNo(){
+		return this.transNo;
+	}
+			
+	public void setTransAmount(java.math.BigDecimal transAmount){
+		this.transAmount = transAmount;
+	}
+	
+	public java.math.BigDecimal getTransAmount(){
+		return this.transAmount;
+	}
+			
+	public void setTransStatus(String transStatus){
+		this.transStatus = transStatus;
+	}
+	
+	public String getTransStatus(){
+		return this.transStatus;
+	}
+			
+	public void setTransSuccessedTime(java.util.Date transSuccessedTime){
+		this.transSuccessedTime = transSuccessedTime;
+	}
+	
+	public java.util.Date getTransSuccessedTime(){
+		return this.transSuccessedTime;
+	}
+			
+	public void setCreateTime(java.util.Date createTime){
+		this.createTime = createTime;
+	}
+	
+	public java.util.Date getCreateTime(){
+		return this.createTime;
+	}
+			
+	public void setUpdateTime(java.util.Date updateTime){
+		this.updateTime = updateTime;
+	}
+	
+	public java.util.Date getUpdateTime(){
+		return this.updateTime;
+	}
+			
+	public void setTenantId(String tenantId){
+		this.tenantId = tenantId;
+	}
+	
+	public String getTenantId(){
+		return this.tenantId;
+	}
+			
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+}

edu-user/edu-user-server/src/main/java/com/keao/edu/user/enums/StudentRegistrationStatusEnum.java

@@ -0,0 +1,40 @@
+package com.keao.edu.user.enums;
+
+import com.keao.edu.common.enums.BaseEnum;
+
+/**
+ * @Author Joburgess
+ * @Date 2020.06.23
+ */
+public enum  StudentRegistrationStatusEnum implements BaseEnum<String, StudentRegistrationStatusEnum> {
+    AUDIT_WAIT("AUDIT_WAIT", "等待审核"),
+    AUDIT_PASS("AUDIT_PASS","通过"),
+    AUDIT_REJECT("AUDIT_REJECT", "拒绝"),
+    REFUNDED("REFUNDED", "已退款");
+
+    private String code;
+
+    private String msg;
+
+    StudentRegistrationStatusEnum(String code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    @Override
+    public String getCode() {
+        return null;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+}

edu-user/edu-user-server/src/main/java/com/keao/edu/user/page/ExamRegistrationQueryInfo.java

@@ -0,0 +1,67 @@
+package com.keao.edu.user.page;
+
+import com.keao.edu.common.page.QueryInfo;
+import com.keao.edu.user.enums.StudentRegistrationStatusEnum;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @Author Joburgess
+ * @Date 2020.06.23
+ */
+public class ExamRegistrationQueryInfo extends QueryInfo {
+
+    @ApiModelProperty(value = "考试项目编号")
+    private Integer examId;
+
+    @ApiModelProperty(value = "机构编号")
+    private Integer agencyId;
+
+    @ApiModelProperty(value = "专业编号")
+    private Integer subjectId;
+
+    @ApiModelProperty(value = "报考级别")
+    private Integer level;
+
+    @ApiModelProperty(value = "学员状态")
+    private StudentRegistrationStatusEnum status;
+
+    public Integer getExamId() {
+        return examId;
+    }
+
+    public void setExamId(Integer examId) {
+        this.examId = examId;
+    }
+
+    public Integer getAgencyId() {
+        return agencyId;
+    }
+
+    public void setAgencyId(Integer agencyId) {
+        this.agencyId = agencyId;
+    }
+
+    public Integer getSubjectId() {
+        return subjectId;
+    }
+
+    public void setSubjectId(Integer subjectId) {
+        this.subjectId = subjectId;
+    }
+
+    public Integer getLevel() {
+        return level;
+    }
+
+    public void setLevel(Integer level) {
+        this.level = level;
+    }
+
+    public StudentRegistrationStatusEnum getStatus() {
+        return status;
+    }
+
+    public void setStatus(StudentRegistrationStatusEnum status) {
+        this.status = status;
+    }
+}

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/ExamAgencyRelationService.java

@@ -24,4 +24,6 @@ public interface ExamAgencyRelationService extends BaseService<Long, ExamAgencyR
      */
     void sendUrl(Integer examId, String agencyIds);
 
+
+
 }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/ExamRegistrationPaymentService.java

@@ -0,0 +1,8 @@
+package com.keao.edu.user.service;
+
+import com.keao.edu.common.service.BaseService;
+import com.keao.edu.user.entity.ExamRegistrationPayment;
+
+public interface ExamRegistrationPaymentService extends BaseService<Long, ExamRegistrationPayment> {
+
+}

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/ExamRegistrationService.java

@@ -0,0 +1,9 @@
+package com.keao.edu.user.service;
+
+
+import com.keao.edu.common.service.BaseService;
+import com.keao.edu.user.entity.ExamRegistration;
+
+public interface ExamRegistrationService extends BaseService<Long, ExamRegistration> {
+
+}

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExamAgencyRelationServiceImpl.java

@@ -1,7 +1,5 @@
 package com.keao.edu.user.service.impl;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.keao.edu.common.dal.BaseDAO;
 import com.keao.edu.common.exception.BizException;
 import com.keao.edu.common.service.impl.BaseServiceImpl;
@@ -20,6 +18,7 @@ import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -46,6 +45,9 @@ public class ExamAgencyRelationServiceImpl extends BaseServiceImpl<Long, ExamAge
 			throw new BizException("请指定代理商");
 		}
 		examAgencyRelation.setTenantId(TenantContextHolder.getTenantId().toString());
+		examAgencyRelation.setShareProfitAmount(BigDecimal.ZERO);
+		examAgencyRelation.setTotalRegistrationStudentNum(BigDecimal.ZERO.intValue());
+		examAgencyRelation.setTotalPaymentAmount(BigDecimal.ZERO);
 		Set<Integer> agencyIds = examAgencyRelationDao.getAgencyIdsWithExam(examAgencyRelation.getExaminationBasicId());
 		if(agencyIds.contains(examAgencyRelation.getAgencyId())){
 			examAgencyRelationDao.update(examAgencyRelation);
@@ -76,6 +78,7 @@ public class ExamAgencyRelationServiceImpl extends BaseServiceImpl<Long, ExamAge
 			examAgencyRelation.setExaminationBasicId(examId);
 			examAgencyRelation.setAgencyId(agencyId);
 			examAgencyRelation.setSendUrlFlag(YesOrNoEnum.YES);
+			examAgencyRelation.setTenantId(TenantContextHolder.getTenantId().toString());
 			examAgencyRelations.add(examAgencyRelation);
 		}
 		ExaminationBasic examinationBasic = examinationBasicDao.get(examId.longValue());

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExamRegistrationPaymentServiceImpl.java

@@ -0,0 +1,22 @@
+package com.keao.edu.user.service.impl;
+
+import com.keao.edu.common.dal.BaseDAO;
+import com.keao.edu.common.service.impl.BaseServiceImpl;
+import com.keao.edu.user.dao.ExamRegistrationPaymentDao;
+import com.keao.edu.user.entity.ExamRegistrationPayment;
+import com.keao.edu.user.service.ExamRegistrationPaymentService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class ExamRegistrationPaymentServiceImpl extends BaseServiceImpl<Long, ExamRegistrationPayment> implements ExamRegistrationPaymentService {
+	
+	@Autowired
+	private ExamRegistrationPaymentDao examRegistrationPaymentDao;
+
+	@Override
+	public BaseDAO<Long, ExamRegistrationPayment> getDAO() {
+		return examRegistrationPaymentDao;
+	}
+	
+}

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExamRegistrationServiceImpl.java

@@ -0,0 +1,23 @@
+package com.keao.edu.user.service.impl;
+
+
+import com.keao.edu.common.dal.BaseDAO;
+import com.keao.edu.common.service.impl.BaseServiceImpl;
+import com.keao.edu.user.dao.ExamRegistrationDao;
+import com.keao.edu.user.entity.ExamRegistration;
+import com.keao.edu.user.service.ExamRegistrationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class ExamRegistrationServiceImpl extends BaseServiceImpl<Long, ExamRegistration> implements ExamRegistrationService {
+	
+	@Autowired
+	private ExamRegistrationDao examRegistrationDao;
+
+	@Override
+	public BaseDAO<Long, ExamRegistration> getDAO() {
+		return examRegistrationDao;
+	}
+	
+}

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ShortUrlServiceImpl.java

@@ -1,7 +1,6 @@
 package com.keao.edu.user.service.impl;
 
 import com.keao.edu.common.dal.BaseDAO;
-import com.keao.edu.common.exception.BizException;
 import com.keao.edu.common.service.impl.BaseServiceImpl;
 import com.keao.edu.user.dao.ShortUrlDao;
 import com.keao.edu.user.entity.ShortUrl;
@@ -26,7 +25,7 @@ public class ShortUrlServiceImpl extends BaseServiceImpl<Long, ShortUrl> impleme
 	@Transactional(rollbackFor = Exception.class)
 	public String createShortUrl(String sourceUrl) {
 		if(StringUtils.isBlank(sourceUrl)){
-			return null;
+			return sourceUrl;
 		}
 		ShortUrl shortUrl=new ShortUrl(sourceUrl);
 		shortUrlDao.insert(shortUrl);

edu-user/edu-user-server/src/main/resources/config/mybatis/ExamAgencyRelationMapper.xml

@@ -8,10 +8,13 @@
 	
 	<resultMap type="com.keao.edu.user.entity.ExamAgencyRelation" id="ExamAgencyRelation">
 		<result column="id_" property="id" />
+
 		<result column="examination_basic_id_" property="examinationBasicId" />
 		<result column="agency_id_" property="agencyId" />
 		<result column="settlement_type_" property="settlementType" typeHandler="com.keao.edu.common.dal.CustomEnumTypeHandler" />
 		<result column="share_profit_amount_" property="shareProfitAmount" />
+		<result column="total_registration_student_num_" property="totalRegistrationStudentNum"/>
+		<result column="total_payment_amount_" property="totalPaymentAmount"/>
 		<result column="url_" property="url" />
 		<result column="send_url_flag_" property="sendUrlFlag" typeHandler="com.keao.edu.common.dal.CustomEnumTypeHandler" />
 		<result column="create_time_" property="createTime" />
@@ -35,15 +38,15 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.keao.edu.user.entity.ExamAgencyRelation" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO exam_agency_relation (examination_basic_id_,agency_id_,settlement_type_,share_profit_amount_,url_,send_url_flag_,create_time_,update_time_,tenant_id_)
-		VALUES(#{examinationBasicId},#{agencyId},#{settlementType,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},#{shareProfitAmount},#{url},#{sendUrlFlag,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},NOW(),NOW(),#{tenantId})
+		INSERT INTO exam_agency_relation (examination_basic_id_,agency_id_,settlement_type_,share_profit_amount_,total_registration_student_num_,total_payment_amount_,url_,send_url_flag_,create_time_,update_time_,tenant_id_)
+		VALUES(#{examinationBasicId},#{agencyId},#{settlementType,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},#{shareProfitAmount},#{totalRegistrationStudentNum},#{totalPaymentAmount},#{url},#{sendUrlFlag,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},NOW(),NOW(),#{tenantId})
 	</insert>
 
     <insert id="batchInsert" parameterType="com.keao.edu.user.entity.ExamAgencyRelation" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO exam_agency_relation (examination_basic_id_,agency_id_,settlement_type_,share_profit_amount_,url_,send_url_flag_,create_time_,update_time_,tenant_id_)
+		INSERT INTO exam_agency_relation (examination_basic_id_,agency_id_,settlement_type_,share_profit_amount_,total_registration_student_num_,total_payment_amount_,url_,send_url_flag_,create_time_,update_time_,tenant_id_)
 		VALUES
 		<foreach collection="examAgencyRelations" item="examAgencyRelation" separator=",">
-			(#{examAgencyRelation.examinationBasicId},#{examAgencyRelation.agencyId},#{examAgencyRelation.settlementType,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},#{examAgencyRelation.shareProfitAmount},#{examAgencyRelation.url},#{examAgencyRelation.sendUrlFlag,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},NOW(),NOW(),#{examAgencyRelation.tenantId})
+			(#{examAgencyRelation.examinationBasicId},#{examAgencyRelation.agencyId},#{examAgencyRelation.settlementType,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},#{examAgencyRelation.shareProfitAmount},#{examAgencyRelation.totalRegistrationStudentNum},#{examAgencyRelation.totalPaymentAmount},#{examAgencyRelation.url},#{examAgencyRelation.sendUrlFlag,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},NOW(),NOW(),#{examAgencyRelation.tenantId})
 		</foreach>
 	</insert>
 
@@ -72,6 +75,12 @@
 			<if test="shareProfitAmount != null">
 			share_profit_amount_ = #{shareProfitAmount},
 			</if>
+			<if test="totalRegistrationStudentNum != null">
+				total_registration_student_num_ = #{totalRegistrationStudentNum},
+			</if>
+			<if test="totalPaymentAmount != null">
+				total_payment_amount_ = #{totalPaymentAmount},
+			</if>
 			<if test="agencyId != null">
 			agency_id_ = #{agencyId},
 			</if>

edu-user/edu-user-server/src/main/resources/config/mybatis/ExamCertificationMapper.xml

@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!--
+这个文件是自动生成的。
+不要修改此文件。所有改动将在下次重新自动生成时丢失。
+-->
+<mapper namespace="com.keao.edu.user.dao.ExamCertificationDao">
+	
+	<resultMap type="com.keao.edu.user.entity.ExamCertification" id="ExamCertification">
+		<result column="id_" property="id" />
+		<result column="examination_basic_id_" property="examinationBasicId" />
+		<result column="student_id_" property="studentId" />
+		<result column="card_no_" property="cardNo" />
+		<result column="subject_id_" property="subjectId" />
+		<result column="level_" property="level" />
+		<result column="exam_start_time_" property="examStartTime" />
+		<result column="exam_end_time_" property="examEndTime" />
+		<result column="exam_address_" property="examAddress" />
+		<result column="create_time_" property="createTime" />
+		<result column="update_time_" property="updateTime" />
+		<result column="tenant_id_" property="tenantId" />
+	</resultMap>
+	
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="ExamCertification" >
+		SELECT * FROM exam_certification WHERE id_ = #{id} 
+	</select>
+	
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="ExamCertification">
+		SELECT * FROM exam_certification ORDER BY id_
+	</select>
+	
+	<!-- 向数据库增加一条记录 -->
+	<insert id="insert" parameterType="com.keao.edu.user.entity.ExamCertification" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+		<!--
+		<selectKey resultClass="int" keyProperty="id" > 
+		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
+		</selectKey>
+		-->
+		INSERT INTO exam_certification (id_,examination_basic_id_,student_id_,card_no_,subject_id_,level_,exam_start_time_,exam_end_time_,exam_address_,create_time_,update_time_,tenant_id_)
+		VALUES(#{id},#{examinationBasicId},#{studentId},#{cardNo},#{subjectId},#{level},#{examStartTime},#{examEndTime},#{examAddress},NOW(),NOW(),#{tenantId})
+	</insert>
+	
+	<!-- 根据主键查询一条记录 -->
+	<update id="update" parameterType="com.keao.edu.user.entity.ExamCertification">
+		UPDATE exam_certification
+		<set>
+			<if test="examinationBasicId != null">
+				examination_basic_id_ = #{examinationBasicId},
+			</if>
+			<if test="subjectId != null">
+				subject_id_ = #{subjectId},
+			</if>
+			<if test="examEndTime != null">
+				exam_end_time_ = #{examEndTime},
+			</if>
+			<if test="id != null">
+				id_ = #{id},
+			</if>
+			<if test="examStartTime != null">
+				exam_start_time_ = #{examStartTime},
+			</if>
+			<if test="tenantId != null">
+				tenant_id_ = #{tenantId},
+			</if>
+			<if test="cardNo != null">
+				card_no_ = #{cardNo},
+			</if>
+			<if test="studentId != null">
+				student_id_ = #{studentId},
+			</if>
+			<if test="level != null">
+				level_ = #{level},
+			</if>
+			<if test="examAddress != null">
+				exam_address_ = #{examAddress},
+			</if>
+			update_time_ = NOW()
+		</set> WHERE id_ = #{id}
+	</update>
+	
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete" >
+		DELETE FROM exam_certification WHERE id_ = #{id} 
+	</delete>
+	
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="ExamCertification" parameterType="map">
+		SELECT * FROM exam_certification ORDER BY id_ <include refid="global.limit"/>
+	</select>
+	
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM exam_certification
+	</select>
+</mapper>

edu-user/edu-user-server/src/main/resources/config/mybatis/ExamRegistrationMapper.xml

@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!--
+这个文件是自动生成的。
+不要修改此文件。所有改动将在下次重新自动生成时丢失。
+-->
+<mapper namespace="com.keao.edu.user.dao.ExamRegistrationDao">
+	
+	<resultMap type="com.keao.edu.user.entity.ExamRegistration" id="ExamRegistration">
+		<result column="id_" property="id" />
+		<result column="examination_basic_id_" property="examinationBasicId" />
+		<result column="student_id_" property="studentId" />
+		<association property="sysUser" columnPrefix="sys_user_" resultMap="com.keao.edu.user.dao.SysUserDao.SysUser"/>
+		<result column="agency_id_" property="agencyId" />
+		<result column="subject_id_" property="subjectId" />
+		<association property="subject" columnPrefix="subject_" resultMap="com.keao.edu.user.dao.SubjectDao.Subject"/>
+		<result column="level_" property="level" />
+		<result column="song_json_" property="songJson" />
+		<result column="last_exam_level_" property="lastExamLevel" />
+		<result column="last_exam_certificate_url_" property="lastExamCertificateUrl" />
+		<result column="adviser_name_" property="adviserName" />
+		<result column="adviser_phone_" property="adviserPhone" />
+		<result column="card_no_" property="cardNo" />
+		<result column="status_" property="status" typeHandler="com.keao.edu.common.dal.CustomEnumTypeHandler"/>
+		<result column="create_time_" property="createTime" />
+		<result column="update_time_" property="updateTime" />
+		<result column="tenant_id_" property="tenantId" />
+	</resultMap>
+	
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="ExamRegistration" >
+		SELECT * FROM exam_registration WHERE id_ = #{id} 
+	</select>
+	
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="ExamRegistration">
+		SELECT * FROM exam_registration ORDER BY id_
+	</select>
+	
+	<!-- 向数据库增加一条记录 -->
+	<insert id="insert" parameterType="com.keao.edu.user.entity.ExamRegistration" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+		INSERT INTO exam_registration (id_,examination_basic_id_,student_id_,agency_id_,subject_id_,level_,song_json_,last_exam_level_,last_exam_certificate_url_,adviser_name_,adviser_phone_,card_no_,status_,create_time_,update_time_,tenant_id_)
+		VALUES(#{id},#{examinationBasicId},#{studentId},#{agencyId},#{subjectId},#{level},#{songJson},#{lastExamLevel},#{lastExamCertificateUrl},#{adviserName},#{adviserPhone},#{cardNo},#{status,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},NOW(), NOW(),#{tenantId})
+	</insert>
+	
+	<!-- 根据主键查询一条记录 -->
+	<update id="update" parameterType="com.keao.edu.user.entity.ExamRegistration">
+		UPDATE exam_registration
+		<set>
+			<if test="examinationBasicId != null">
+				examination_basic_id_ = #{examinationBasicId},
+			</if>
+			<if test="subjectId != null">
+				subject_id_ = #{subjectId},
+			</if>
+			<if test="adviserPhone != null">
+				adviser_phone_ = #{adviserPhone},
+			</if>
+			<if test="lastExamLevel != null">
+				last_exam_level_ = #{lastExamLevel},
+			</if>
+			<if test="id != null">
+				id_ = #{id},
+			</if>
+			<if test="tenantId != null">
+				tenant_id_ = #{tenantId},
+			</if>
+			<if test="level != null">
+				level_ = #{level},
+			</if>
+			<if test="agencyId != null">
+				agency_id_ = #{agencyId},
+			</if>
+			<if test="songJson != null">
+				song_json_ = #{songJson},
+			</if>
+			<if test="adviserName != null">
+				adviser_name_ = #{adviserName},
+			</if>
+			<if test="studentId != null">
+				student_id_ = #{studentId},
+			</if>
+			<if test="lastExamCertificateUrl != null">
+				last_exam_certificate_url_ = #{lastExamCertificateUrl},
+			</if>
+			<if test="cardNo!=null">
+				card_no_ =#{cardNo},
+			</if>
+			<if test="status!=null">
+				status_ = #{status,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},
+			</if>
+				update_time_ = NOW()
+		</set> WHERE id_ = #{id}
+	</update>
+	
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete" >
+		DELETE FROM exam_registration WHERE id_ = #{id} 
+	</delete>
+
+	<sql id="queryCondition">
+		<where>
+			<if test="examId!=null">
+				AND er.examination_basic_id_ = #{examId}
+			</if>
+			<if test="agencyId!=null">
+				AND er.agency_id_ = #{agencyId}
+			</if>
+			<if test="subjectId!=null">
+				AND er.subject_id_ = #{subjectId}
+			</if>
+			<if test="level!=null">
+				AND er.level_ = #{level}
+			</if>
+			<if test="status!=null">
+				AND er.status_ = #{status,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler}
+			</if>
+		</where>
+	</sql>
+	
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="ExamRegistration" parameterType="map">
+		SELECT
+			er.id_,
+			er.card_no_,
+			er.student_id_,
+			su.real_name_,
+			er.agency_id_,
+			er.subject_id_,
+			er.level_,
+			erp.trans_amount_,
+			er.status_
+		FROM
+			exam_registration er
+			LEFT JOIN sys_user su ON er.student_id_ = su.id_
+			LEFT JOIN exam_registration_payment erp ON er.id_ = erp.exam_registration_id_
+		<include refid="queryCondition"/>
+		ORDER BY er.id_
+		<include refid="global.limit"/>
+	</select>
+	
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM exam_registration
+		<include refid="queryCondition"/>
+	</select>
+</mapper>

edu-user/edu-user-server/src/main/resources/config/mybatis/ExamRegistrationPaymentMapper.xml

@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!--
+这个文件是自动生成的。
+不要修改此文件。所有改动将在下次重新自动生成时丢失。
+-->
+<mapper namespace="com.keao.edu.user.dao.ExamRegistrationPaymentDao">
+	
+	<resultMap type="com.keao.edu.user.entity.ExamRegistrationPayment" id="ExamRegistrationPayment">
+		<result column="id_" property="id" />
+		<result column="exam_registration_id_" property="examRegistrationId" />
+		<result column="student_id_" property="studentId" />
+		<result column="examination_basic_id_" property="examinationBasicId" />
+		<result column="order_no_" property="orderNo" />
+		<result column="trans_no_" property="transNo" />
+		<result column="trans_amount_" property="transAmount" />
+		<result column="trans_status_" property="transStatus" />
+		<result column="trans_successed_time_" property="transSuccessedTime" />
+		<result column="create_time_" property="createTime" />
+		<result column="update_time_" property="updateTime" />
+		<result column="tenant_id_" property="tenantId" />
+	</resultMap>
+	
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="ExamRegistrationPayment" >
+		SELECT * FROM exam_registration_payment WHERE id_ = #{id} 
+	</select>
+	
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="ExamRegistrationPayment">
+		SELECT * FROM exam_registration_payment ORDER BY id_
+	</select>
+	
+	<!-- 向数据库增加一条记录 -->
+	<insert id="insert" parameterType="com.keao.edu.user.entity.ExamRegistrationPayment" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+		<!--
+		<selectKey resultClass="int" keyProperty="id" > 
+		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
+		</selectKey>
+		-->
+		INSERT INTO exam_registration_payment (id_,exam_registration_id_,student_id_,examination_basic_id_,order_no_,trans_no_,trans_amount_,trans_status_,trans_successed_time_,create_time_,update_time_,tenant_id_)
+		VALUES(#{id},#{examRegistrationId},#{studentId},#{examinationBasicId},#{orderNo},#{transNo},#{transAmount},#{transStatus},#{transSuccessedTime},NOW(),NOW(),#{tenantId})
+	</insert>
+	
+	<!-- 根据主键查询一条记录 -->
+	<update id="update" parameterType="com.keao.edu.user.entity.ExamRegistrationPayment">
+		UPDATE exam_registration_payment
+		<set>
+			<if test="examinationBasicId != null">
+			examination_basic_id_ = #{examinationBasicId},
+			</if>
+			<if test="orderNo != null">
+			order_no_ = #{orderNo},
+			</if>
+			<if test="id != null">
+			id_ = #{id},
+			</if>
+			<if test="tenantId != null">
+			tenant_id_ = #{tenantId},
+			</if>
+			<if test="examRegistrationId != null">
+			exam_registration_id_ = #{examRegistrationId},
+			</if>
+			<if test="studentId != null">
+			student_id_ = #{studentId},
+			</if>
+			<if test="transSuccessedTime != null">
+			trans_successed_time_ = #{transSuccessedTime},
+			</if>
+			<if test="transNo != null">
+			trans_no_ = #{transNo},
+			</if>
+			<if test="transStatus != null">
+			trans_status_ = #{transStatus},
+			</if>
+			<if test="transAmount != null">
+			trans_amount_ = #{transAmount},
+			</if>
+				update_time_ = NOW()
+		</set> WHERE id_ = #{id}
+	</update>
+	
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete" >
+		DELETE FROM exam_registration_payment WHERE id_ = #{id} 
+	</delete>
+	
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="ExamRegistrationPayment" parameterType="map">
+		SELECT * FROM exam_registration_payment ORDER BY id_ <include refid="global.limit"/>
+	</select>
+	
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM exam_registration_payment
+	</select>
+</mapper>