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

edu-common/src/main/java/com/keao/edu/common/page/QueryInfo.java

@@ -8,6 +8,7 @@
 package com.keao.edu.common.page;
 
 import com.keao.edu.common.tenant.TenantContextHolder;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * 查询对象基类
@@ -43,7 +44,9 @@ public class QueryInfo {
 	}
 
 	public void setSearch(String search) {
-		this.search = search;
+		if(StringUtils.isNotEmpty(search)){
+			this.search = search;
+		}
 	}
 
 	public QueryInfo(){}

edu-im/edu-im-server/src/main/java/com/keao/edu/im/service/Impl/RoomServiceImpl.java

@@ -409,7 +409,7 @@ public class RoomServiceImpl implements RoomService {
             }
         }
         userDao.deleteByUid(userId);
-        this.signOut(Long.parseLong(roomId));
+//        this.signOut(Long.parseLong(roomId));
         return true;
     }
 

edu-im/edu-im-server/src/main/resources/logback-spring.xml

@@ -27,8 +27,8 @@
 		</encoder>
 	</appender>
 
-	<logger name="com.keao.edu" level="DEBUG" />
-	<root level="DEBUG">
+	<logger name="com.keao.edu" level="INFO" />
+	<root level="INFO">
 		<appender-ref ref="stdout" />
 		<appender-ref ref="file" />
 	</root>

edu-user/edu-user-client-api/src/main/java/com/keao/edu/user/api/client/EduUserFeignService.java

@@ -35,7 +35,7 @@ public interface EduUserFeignService {
 	 * @param studentId
 	 * @return
 	 */
-	@GetMapping(value = "roomStudentRelation/get")
+	@PostMapping(value = "examRoomStudentRelation/getExamRoomStudentRelation")
 	ExamRoomStudentRelation getExamRoomStudentRelation(@RequestParam("basicId") Integer basicId, @RequestParam("roomId") String roomId, @RequestParam("studentId") Integer studentId);
 
 	@GetMapping("task/queryPaymentStatus")

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

@@ -41,7 +41,7 @@ public class ExamRoomStudentRelationController extends BaseController {
     }
 
     @ApiOperation("获取教室学员关联")
-    @GetMapping(value = "/getExamRoomStudentRelation")
+    @PostMapping(value = "/getExamRoomStudentRelation")
     public ExamRoomStudentRelation getExamRoomStudentRelation(Integer basicId, String roomId, Integer studentId) {
         return examRoomStudentRelationService.getExamRoomStudentRelation(basicId,roomId,studentId);
     }

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

@@ -24,6 +24,8 @@ public interface SysUserDao extends BaseDAO<Integer, SysUser> {
 	 */
 	SysUser queryByPhone(String phone);
 
+	Integer lockUser(@Param("userId") Integer userId);
+
 	/**
 	 * 根据手机号查询对象
 	 * @param phone
@@ -57,4 +59,11 @@ public interface SysUserDao extends BaseDAO<Integer, SysUser> {
 	 * @return
 	 */
     Set<Integer> queryRoleIds(Integer userId);
-}
+
+	/**
+	 * 修改userType
+	 * @param userId
+	 * @param userType
+	 */
+	void updateUserType(@Param("userId") Integer userId, @Param("userType") String userType);
+}

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

@@ -35,6 +35,9 @@ public class ExamOrganizationRelation {
 	@ApiModelProperty(value = "总缴费金额")
 	private BigDecimal totalPaymentAmount;
 
+	@ApiModelProperty(value = "总交易金额")
+	private BigDecimal totalTransAmount;
+
 	@ApiModelProperty(value = "链接地址")
 	private String url;
 
@@ -82,6 +85,14 @@ public class ExamOrganizationRelation {
 		this.totalRegistrationStudentNum = totalRegistrationStudentNum;
 	}
 
+	public BigDecimal getTotalTransAmount() {
+		return totalTransAmount;
+	}
+
+	public void setTotalTransAmount(BigDecimal totalTransAmount) {
+		this.totalTransAmount = totalTransAmount;
+	}
+
 	public BigDecimal getTotalPaymentAmount() {
 		return totalPaymentAmount;
 	}

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

@@ -12,7 +12,6 @@ import com.keao.edu.im.api.entity.ImUserModel;
 import com.keao.edu.user.dao.EmployeeDao;
 import com.keao.edu.user.dao.SysUserDao;
 import com.keao.edu.user.entity.Employee;
-import com.keao.edu.user.entity.ExamRegistration;
 import com.keao.edu.user.service.EmployeeService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,7 +51,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
 			if(!user.getTenantId().equals(tenantId)){
 				throw new BizException("手机号已被占用");
 			}
-			if(user.getUserType().contains("SYSTEM")){
+			if(StringUtils.isNotEmpty(user.getUserType()) && user.getUserType().contains("SYSTEM")){
 				throw new BizException("手机号已被占用");
 			}
 			Employee employee1 = employeeDao.get(user.getId());
@@ -71,13 +70,18 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
 			}else if(employee1.getDelFlag()){
 				SysUser sysUser1 = employee1.getSysUser();
 				if(StringUtils.isEmpty(sysUser1.getUserType())){
-					sysUser1.setUserType("SYSTEM");
+					sysUser.setUserType("SYSTEM");
 				}else {
-					sysUser1.setUserType(sysUser1.getUserType() + ",SYSTEM");
+					sysUser.setUserType(sysUser1.getUserType() + ",SYSTEM");
 				}
-				sysUserDao.update(sysUser1);
-				employee1.setDelFlag(false);
-				employeeDao.update(employee1);
+				if(sysUser.getRoles() != null && sysUser.getRoles().size() > 0){
+					sysUserDao.batchAddEmployeeRole(sysUser1.getId(),sysUser.getRoles());
+				}
+				sysUser.setId(sysUser1.getId());
+				sysUserDao.update(sysUser);
+				employee.setUserId(sysUser1.getId());
+				employee.setDelFlag(false);
+				employeeDao.update(employee);
 			}else{
 				throw new BizException("用户已存在");
 			}
@@ -101,6 +105,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
 	@Transactional(rollbackFor = Exception.class)
 	public void updateEmployee(Employee employee) {
 		SysUser sysUser = employee.getSysUser();
+		sysUser.setId(employee.getUserId());
 		if(null == employeeDao.get(sysUser.getId())){
 			throw new BizException("员工信息不存在");
 		}
@@ -123,7 +128,12 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void del(Integer id) {
+		SysUser queryUserInfo = sysUserFeignService.queryUserInfo();
 		Employee employee = employeeDao.get(id);
+		if(queryUserInfo.getId().equals(employee.getUserId())){
+			throw new BizException("删除失败：不支持此操作");
+		}
+
 		SysUser sysUser = employee.getSysUser();
 		String userType = sysUser.getUserType();
 		if(userType.contains(",SYSTEM")){
@@ -133,8 +143,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
 		}else {
 			sysUser.setUserType("");
 		}
-		sysUser.setUserType(userType);
-		sysUserDao.update(sysUser);
+		sysUserDao.updateUserType(sysUser.getId(),sysUser.getUserType());
 		sysUserDao.delEmployeeRole(employee.getUserId());
 		employeeDao.delete(id);
 	}

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

@@ -6,13 +6,18 @@ import com.keao.edu.common.exception.BizException;
 import com.keao.edu.common.page.PageInfo;
 import com.keao.edu.common.service.impl.BaseServiceImpl;
 import com.keao.edu.user.dao.ExamManualLedgerDao;
+import com.keao.edu.user.dao.ExamOrganizationRelationDao;
+import com.keao.edu.user.dao.SysUserDao;
 import com.keao.edu.user.dto.ExamManualLedgerStatisticsDto;
 import com.keao.edu.user.entity.ExamManualLedger;
+import com.keao.edu.user.entity.ExamOrganizationRelation;
 import com.keao.edu.user.page.ExamManualLedgerQueryInfo;
 import com.keao.edu.user.service.ExamManualLedgerService;
 import com.keao.edu.util.collection.MapUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Isolation;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
 
@@ -21,6 +26,10 @@ public class ExamManualLedgerServiceImpl extends BaseServiceImpl<Long, ExamManua
 	
 	@Autowired
 	private ExamManualLedgerDao examManualLedgerDao;
+	@Autowired
+	private SysUserDao sysUserDao;
+	@Autowired
+	private ExamOrganizationRelationDao examOrganizationRelationDao;
 
 	@Override
 	public BaseDAO<Long, ExamManualLedger> getDAO() {
@@ -28,6 +37,7 @@ public class ExamManualLedgerServiceImpl extends BaseServiceImpl<Long, ExamManua
 	}
 
 	@Override
+	@Transactional(rollbackFor = Exception.class, isolation = Isolation.READ_COMMITTED)
 	public void addExamManualLedger(ExamManualLedger examManualLedger) {
 		if(Objects.isNull(examManualLedger.getExaminationBasicId())){
 			throw new BizException("请指定考级项目");
@@ -35,6 +45,15 @@ public class ExamManualLedgerServiceImpl extends BaseServiceImpl<Long, ExamManua
 		if(Objects.isNull(examManualLedger.getAmount())){
 			throw new BizException("请指定交易金额");
 		}
+		sysUserDao.lockUser(examManualLedger.getOperatorUserId());
+		if(Objects.nonNull(examManualLedger.getOrganId())){
+			ExamOrganizationRelation examOrganizationRelation = examOrganizationRelationDao.getExamOrganizationRelation(examManualLedger.getOrganId(), examManualLedger.getOrganId());
+			if(Objects.isNull(examOrganizationRelation)){
+				throw new BizException("合作单位信息异常");
+			}
+			examOrganizationRelation.setTotalTransAmount(examOrganizationRelation.getTotalTransAmount().add(examManualLedger.getAmount()));
+			examOrganizationRelationDao.update(examOrganizationRelation);
+		}
 		examManualLedgerDao.insert(examManualLedger);
 	}
 

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

@@ -62,7 +62,7 @@ public class ExamOrganizationRelationServiceImpl extends BaseServiceImpl<Long, E
 	@Autowired
 	private SysConfigService sysConfigService;
 
-	public static final Set<ExamStatusEnum> EDIT_ABLE_EXAM_STATUS=new HashSet<>(Arrays.asList(ExamStatusEnum.SETTING,ExamStatusEnum.NOT_START,ExamStatusEnum.APPLYING));
+	public static final Set<ExamStatusEnum> EDIT_ABLE_EXAM_STATUS=new HashSet<>(Arrays.asList(ExamStatusEnum.SETTING,ExamStatusEnum.NOT_START,ExamStatusEnum.APPLYING,ExamStatusEnum.APPLIED));
 
 	@Override
 	public BaseDAO<Long, ExamOrganizationRelation> getDAO() {
@@ -145,6 +145,7 @@ public class ExamOrganizationRelationServiceImpl extends BaseServiceImpl<Long, E
 			og.setShareProfitAmount(organization.getShareProfitAmount());
 			og.setTotalRegistrationStudentNum(BigDecimal.ZERO.intValue());
 			og.setTotalPaymentAmount(BigDecimal.ZERO);
+			og.setTotalTransAmount(BigDecimal.ZERO);
 			organizationRelations.add(og);
 		}
 		examOrganizationRelationDao.batchInsert(organizationRelations);
@@ -173,6 +174,9 @@ public class ExamOrganizationRelationServiceImpl extends BaseServiceImpl<Long, E
 		if(Objects.isNull(examinationBasic)){
 			throw new BizException("考级项目不存在");
 		}
+		if(!ExamStatusEnum.CLOSE.equals(examinationBasic.getStatus())){
+			throw new BizException("考级项目已关闭");
+		}
 
 		SysConfig baseUrlConfig = sysConfigService.findByParamName(SysConfigService.BASE_API_URL);
 		String baseUrl="";

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

@@ -11,10 +11,10 @@ import com.keao.edu.common.page.PageInfo;
 import com.keao.edu.common.service.impl.BaseServiceImpl;
 import com.keao.edu.common.tenant.TenantContextHolder;
 import com.keao.edu.user.api.entity.ExamRoom;
+import com.keao.edu.user.api.enums.ExamModeEnum;
 import com.keao.edu.user.dao.*;
 import com.keao.edu.user.dto.ExamRoomDto;
 import com.keao.edu.user.dto.ExamRoomStatisticsDto;
-import com.keao.edu.user.api.enums.ExamModeEnum;
 import com.keao.edu.user.entity.ExamRegistration;
 import com.keao.edu.user.entity.ExaminationBasic;
 import com.keao.edu.user.page.ExamRoomQueryInfo;

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

@@ -17,6 +17,7 @@ import com.keao.edu.util.collection.MapUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.math.BigDecimal;
@@ -175,6 +176,19 @@ public class ExaminationBasicServiceImpl extends BaseServiceImpl<Long, Examinati
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int update(ExaminationBasic examinationBasic) {
+        if(Objects.isNull(examinationBasic.getId())){
+            throw new BizException("请指定考级项目");
+        }
+        ExaminationBasic existsExam = examinationBasicDao.get(examinationBasic.getId().longValue());
+        if(Objects.isNull(existsExam)){
+            throw new BizException("考级项目不存在");
+        }
+        return examinationBasicDao.update(examinationBasic);
+    }
+
+    @Override
     public void closeExam(Integer examId, String reason) {
         if (Objects.isNull(examId)) {
             throw new BizException("请指定考级项目");

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

@@ -9,9 +9,11 @@ import com.keao.edu.common.service.impl.BaseServiceImpl;
 import com.keao.edu.im.api.client.ImFeignService;
 import com.keao.edu.im.api.entity.ImResult;
 import com.keao.edu.im.api.entity.ImUserModel;
+import com.keao.edu.user.dao.EmployeeDao;
 import com.keao.edu.user.dao.ExamOrganizationRelationDao;
 import com.keao.edu.user.dao.OrganizationDao;
 import com.keao.edu.user.dao.SysUserDao;
+import com.keao.edu.user.entity.Employee;
 import com.keao.edu.user.entity.Organization;
 import com.keao.edu.user.enums.YesOrNoEnum;
 import com.keao.edu.user.service.OrganizationService;
@@ -37,6 +39,8 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 	@Autowired
 	private SysUserDao sysUserDao;
 	@Autowired
+	private EmployeeDao employeeDao;
+	@Autowired
 	private ExamOrganizationRelationDao examOrganizationRelationDao;
 
 	@Override
@@ -68,7 +72,7 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 			if(!user.getTenantId().equals(tenantId)){
 				throw new BizException("手机号已被占用");
 			}
-			if(user.getUserType().contains("SYSTEM")){
+			if(StringUtils.isNotEmpty(user.getUserType()) && user.getUserType().contains("SYSTEM")){
 				throw new BizException("手机号已被占用");
 			}
 			Organization organization = organDao.get(user.getId());
@@ -92,13 +96,21 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 			}else if(organization.getDelFlag() == YesOrNoEnum.YES){
 				SysUser sysUser1 = organization.getSysUser();
 				if(StringUtils.isEmpty(sysUser1.getUserType())){
-					sysUser1.setUserType("SYSTEM");
+					sysUser.setUserType("SYSTEM");
 				}else {
-					sysUser1.setUserType(sysUser1.getUserType() + ",SYSTEM");
+					sysUser.setUserType(sysUser1.getUserType() + ",SYSTEM");
+				}
+				sysUser.setId(sysUser1.getId());
+				sysUserDao.update(sysUser);
+				if(sysUser.getRoles() != null && sysUser.getRoles().size() > 0){
+					sysUserDao.batchAddEmployeeRole(sysUser.getId(),sysUser.getRoles());
 				}
-				sysUserDao.update(sysUser1);
-				organization.setDelFlag(YesOrNoEnum.NO);
-				organDao.update(organization);
+				Employee employee = employeeDao.get(sysUser.getId());
+				employee.setDelFlag(false);
+				employeeDao.update(employee);
+				organ.setDelFlag(YesOrNoEnum.NO);
+				organ.setId(organization.getId());
+				organDao.update(organ);
 			}else{
 				throw new BizException("用户已存在");
 			}
@@ -118,6 +130,12 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 		if(sysUser.getRoles() != null && sysUser.getRoles().size() > 0){
 			sysUserDao.batchAddEmployeeRole(sysUser.getId(),sysUser.getRoles());
 		}
+		Employee employee = new Employee();
+		employee.setOrganId(organ.getId());
+		employee.setUserId(sysUser.getId());
+		employee.setTenantId(tenantId);
+		employeeDao.insert(employee);
+
 		ImResult imResult = imFeignService.register(new ImUserModel(sysUser.getId().toString(), sysUser.getRealName(),null));
         sysUser.setImToken(imResult.getToken());
 		sysUserDao.update(sysUser);
@@ -127,10 +145,11 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 	@Transactional(rollbackFor = Exception.class)
 	public void updateOrganization(Organization organization) {
 		SysUser sysUser = organization.getSysUser();
-		sysUser.setId(organization.getUserId());
-		if(null == organDao.get(sysUser.getId())){
+		Organization organization1 = organDao.get(organization.getId());
+		if(null == organization1){
 			throw new BizException("合作商信息不存在");
 		}
+		sysUser.setId(organization1.getUserId());
 //		organization.setId(sysUser.getId());
 		if(StringUtils.isNotEmpty(sysUser.getPhone())){
 			SysUser queryByPhone = sysUserDao.queryByPhone(sysUser.getPhone());
@@ -205,22 +224,27 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void del(Integer id) {
-		Integer count = examOrganizationRelationDao.findByOrganId(id);
 		Organization organization = organDao.get(id);
+		SysUser queryUserInfo = sysUserFeignService.queryUserInfo();
+		if(queryUserInfo.getId().equals(organization.getUserId())){
+			throw new BizException("删除失败：不支持此操作");
+		}
+		Integer count = examOrganizationRelationDao.findByOrganId(id);
 		if(count == null || count == 0){
 			SysUser sysUser = organization.getSysUser();
 			String userType = sysUser.getUserType();
 			if(userType.contains(",SYSTEM")){
 				userType.replace(",SYSTEM","");
+				sysUser.setUserType(userType);
 			}else if(userType.contains("SYSTEM,")){
 				userType.replace("SYSTEM,","");
+				sysUser.setUserType(userType);
 			}else {
 				sysUser.setUserType("");
 			}
-			sysUser.setUserType(userType);
-			sysUserDao.update(sysUser);
-
+			sysUserDao.updateUserType(sysUser.getId(),sysUser.getUserType());
 			sysUserDao.delEmployeeRole(organization.getUserId());
+			employeeDao.delete(sysUser.getId());
 			organDao.delete(id);
 		}else {
 			throw new BizException("删除失败：存在考试项目,无法删除");

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

@@ -94,6 +94,9 @@
             <if test="organId != null">
                 organ_id_=#{organId},
             </if>
+			<if test="delFlag != null">
+				del_flag_ = #{delFlag},
+			</if>
             update_time_ = NOW()
         </set> WHERE user_id_ = #{userId}
 	</update>

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

@@ -14,6 +14,7 @@
 		<result column="share_profit_amount_" property="shareProfitAmount" />
 		<result column="total_registration_student_num_" property="totalRegistrationStudentNum"/>
 		<result column="total_payment_amount_" property="totalPaymentAmount"/>
+		<result column="total_trans_amount_" property="totalTransAmount" />
 		<result column="url_" property="url" />
 		<result column="send_url_flag_" property="sendUrlFlag" typeHandler="com.keao.edu.common.dal.CustomEnumTypeHandler" />
 		<result column="is_allow_arrange_exam_" property="isAllowArrangeExam" typeHandler="com.keao.edu.common.dal.CustomEnumTypeHandler" />
@@ -38,15 +39,29 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.keao.edu.user.entity.ExamOrganizationRelation" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO exam_organization_relation (examination_basic_id_,organ_id_,settlement_type_,share_profit_amount_,total_registration_student_num_,total_payment_amount_,url_,send_url_flag_,is_allow_arrange_exam_,create_time_,update_time_,tenant_id_)
-		VALUES(#{examinationBasicId},#{organId},#{settlementType,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},#{shareProfitAmount},#{totalRegistrationStudentNum},#{totalPaymentAmount},#{url},#{sendUrlFlag,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},#{isAllowArrangeExam,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},NOW(),NOW(),#{tenantId})
+		INSERT INTO exam_organization_relation (examination_basic_id_,organ_id_,settlement_type_,share_profit_amount_,total_registration_student_num_,
+		total_payment_amount_,url_,send_url_flag_,is_allow_arrange_exam_,total_trans_amount_,
+		create_time_,update_time_,tenant_id_)
+		VALUES(#{examinationBasicId},#{organId},#{settlementType,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},#{shareProfitAmount},
+		#{totalRegistrationStudentNum},#{totalPaymentAmount},#{url},#{sendUrlFlag,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},
+		#{isAllowArrangeExam,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},totalTransAmount,
+		NOW(),NOW(),#{tenantId})
 	</insert>
 
     <insert id="batchInsert" parameterType="com.keao.edu.user.entity.ExamOrganizationRelation" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO exam_organization_relation (examination_basic_id_,organ_id_,settlement_type_,share_profit_amount_,total_registration_student_num_,total_payment_amount_,url_,send_url_flag_,is_allow_arrange_exam_,create_time_,update_time_,tenant_id_)
+		INSERT INTO exam_organization_relation (examination_basic_id_,organ_id_,settlement_type_,share_profit_amount_,total_registration_student_num_,
+		total_payment_amount_,url_,send_url_flag_,is_allow_arrange_exam_,total_trans_amount_,
+		create_time_,update_time_,tenant_id_)
 		VALUES
 		<foreach collection="examOrganizationRelations" item="examOrganizationRelation" separator=",">
-			(#{examOrganizationRelation.examinationBasicId},#{examOrganizationRelation.organId},#{examOrganizationRelation.settlementType,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},#{examOrganizationRelation.shareProfitAmount},#{examOrganizationRelation.totalRegistrationStudentNum},#{examOrganizationRelation.totalPaymentAmount},#{examOrganizationRelation.url},#{examOrganizationRelation.sendUrlFlag,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},#{examOrganizationRelation.isAllowArrangeExam,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},NOW(),NOW(),#{examOrganizationRelation.tenantId})
+			(#{examOrganizationRelation.examinationBasicId},#{examOrganizationRelation.organId},
+			#{examOrganizationRelation.settlementType,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},
+			#{examOrganizationRelation.shareProfitAmount},#{examOrganizationRelation.totalRegistrationStudentNum},
+			#{examOrganizationRelation.totalPaymentAmount},#{examOrganizationRelation.url},
+			#{examOrganizationRelation.sendUrlFlag,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},
+			#{examOrganizationRelation.isAllowArrangeExam,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},
+			#{examOrganizationRelation.totalTransAmount},
+			NOW(),NOW(),#{examOrganizationRelation.tenantId})
 		</foreach>
 	</insert>
 
@@ -57,9 +72,6 @@
 			<if test="examinationBasicId != null">
 				examination_basic_id_ = #{examinationBasicId},
 			</if>
-			<if test="id != null">
-				id_ = #{id},
-			</if>
 			<if test="sendUrlFlag != null">
 				send_url_flag_ = #{sendUrlFlag,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},
 			</if>
@@ -81,6 +93,9 @@
 			<if test="totalPaymentAmount != null">
 				total_payment_amount_ = #{totalPaymentAmount},
 			</if>
+			<if test="totalTransAmount != null">
+				total_trans_amount_ = #{totalTransAmount},
+			</if>
 			<if test="organId != null">
 				organ_id_ = #{organId},
 			</if>
@@ -119,6 +134,9 @@
 				<if test="eo.totalPaymentAmount != null">
 					total_payment_amount_ = #{eo.totalPaymentAmount},
 				</if>
+				<if test="eo.totalTransAmount != null">
+					total_trans_amount_ = #{eo.totalTransAmount},
+				</if>
 				<if test="eo.organId != null">
 					organ_id_ = #{eo.organId},
 				</if>

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

@@ -140,11 +140,15 @@
                 real_name_ = #{realName},
             </if>
             <if test="isSuperAdmin != null">
-                is_super_admin_ = #{isSuperAdmin}
+                is_super_admin_ = #{isSuperAdmin},
             </if>
+            update_time_ = NOW()
         </set>
         WHERE id_ = #{id}
     </update>
+    <update id="updateUserType">
+        UPDATE sys_user SET user_type_ = #{userType},update_time_ = NOW() WHERE id_ = #{userId}
+    </update>
     <!-- 根据主键删除一条记录 -->
     <delete id="delete">
 		UPDATE sys_user SET del_flag_ = 1 WHERE id_ = #{id}
@@ -171,6 +175,10 @@
     <select id="queryByPhone" resultMap="SysUser">
 		select * from sys_user where phone_ = #{phone} OR username_ = #{phone} LIMIT 1 FOR UPDATE
 	</select>
+
+    <select id="lockUser" resultType="int">
+        SELECT id_ FROM sys_user WHERE id_=#{userId}
+    </select>
     
     <select id="queryByStatus" resultMap="SysUser">
         select * from sys_user where lock_flag_ = #{status}

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

@@ -19,7 +19,7 @@
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
 		<result column="tenant_id_" property="tenantId" />
-		<association property="sysUser" columnPrefix="sys_user_" resultMap="com.keao.edu.user.dao.SysUserDao.SysUser"/>
+		<association property="sysUser" resultMap="com.keao.edu.user.dao.SysUserDao.SysUser"/>
 	</resultMap>
 
 	<resultMap id="TeacherDto" type="com.keao.edu.user.dto.TeacherDto" extends="Teacher">

edu-user/edu-user-server/src/main/resources/logback-spring.xml

@@ -27,10 +27,10 @@
 		</encoder>
 	</appender>
 
-	<logger name="com.keao.edu" level="DEBUG" />
+	<logger name="com.keao.edu" level="INFO" />
 
 	<!--开发环境:打印控制台 -->
-		<root level="DEBUG">
+		<root level="INFO">
 			<appender-ref ref="stdout" />
 			<appender-ref ref="file" />
 		</root>