Merge remote-tracking branch 'origin/master'

edu-thirdparty/src/main/java/com/keao/edu/thirdparty/adapay/ConfigInit.java

@@ -38,7 +38,7 @@ public class ConfigInit {
         /**
          * prodMode 模式，默认为生产模式，false可以使用mock模式
          */
-        Adapay.prodMode = false;
+        Adapay.prodMode = true;
 
         /**
          *添加商户配置，一个商户只需要 添加一次，添加以后在内存中。

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

@@ -39,5 +39,5 @@ public interface StudentExamResultDao extends BaseDAO<Long, StudentExamResult> {
      * @param tenantId
      * @return
      */
-    List<Map> countExamNum(@Param("studentIds") List<Integer> studentIds, @Param("tenantId") String tenantId);
+    List<Map<Integer, Integer>> countExamNum(@Param("studentIds") List<Integer> studentIds, @Param("tenantId") String tenantId);
 }

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

@@ -137,9 +137,9 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
 		SysUser sysUser = employee.getSysUser();
 		String userType = sysUser.getUserType();
 		if(userType.contains(",SYSTEM")){
-			userType.replace(",SYSTEM","");
+			userType = userType.replace(",SYSTEM","");
 		}else if(userType.contains("SYSTEM,")){
-			userType.replace("SYSTEM,","");
+			userType = userType.replace("SYSTEM,","");
 		}else {
 			userType = "";
 		}

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

@@ -300,6 +300,7 @@ public class ExamRegistrationServiceImpl extends BaseServiceImpl<Long, ExamRegis
         orderNo = idGeneratorService.generatorId("payment") + "";
 
         order.setId(null);
+        order.setTransNo(null);
         order.setTransStatus(TransStatusEnum.ING);
         order.setOrderNo(orderNo);
         examRegistrationPaymentService.insert(order);

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

@@ -234,15 +234,13 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 			SysUser sysUser = organization.getSysUser();
 			String userType = sysUser.getUserType();
 			if(userType.contains(",SYSTEM")){
-				userType.replace(",SYSTEM","");
-				sysUser.setUserType(userType);
+				userType = userType.replace(",SYSTEM","");
 			}else if(userType.contains("SYSTEM,")){
-				userType.replace("SYSTEM,","");
-				sysUser.setUserType(userType);
+				userType = userType.replace("SYSTEM,","");
 			}else {
-				sysUser.setUserType("");
+				userType = "";
 			}
-			sysUserDao.updateUserType(sysUser.getId(),sysUser.getUserType());
+			sysUserDao.updateUserType(sysUser.getId(),userType);
 			sysUserDao.delEmployeeRole(organization.getUserId());
 			employeeDao.delete(sysUser.getId());
 			organDao.delete(id);

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

@@ -111,7 +111,7 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
         if (rows != null && rows.size() > 0) {
             List<Integer> studentIds = rows.stream().map(e -> e.getUserId()).collect(Collectors.toList());
             //获取考试次数
-            Map<Integer, Integer> examNumMap = MapUtil.convertIntegerMap(studentExamResultDao.countExamNum(studentIds, queryInfo.getTenantId()));
+            Map<Integer, Integer> examNumMap = MapUtil.convertIntegerMap(studentExamResultDao.countExamNum(studentIds, queryInfo.getTenantId()),Integer.class,Integer.class);
             rows.forEach(e -> {
                 e.setExamNum(examNumMap.get(e.getUserId()));
             });

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

@@ -132,7 +132,7 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher> implem
 			params.put("offset", pageInfo.getOffset());
 			dataList = this.getDAO().queryPage(params);
 			Set<Integer> teacherIds = dataList.stream().map(e -> e.getUserId()).collect(Collectors.toSet());
-			Map<Integer,String> subjectNames = MapUtil.convertMybatisMap(teacherDao.queryTeacherSubjectNames(teacherIds));
+			Map<Integer,String> subjectNames = MapUtil.convertIntegerMap(teacherDao.queryTeacherSubjectNames(teacherIds),Integer.class,String.class);
 			dataList.forEach(e->{
 				e.setSubjectName(subjectNames.get(e.getUserId()));
 			});
@@ -154,9 +154,9 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher> implem
 		}
 		String userType = teacher.getSysUser().getUserType();
 		if(userType.contains(",TEACHER")){
-			userType.replace(",TEACHER","");
+			userType = userType.replace(",TEACHER","");
 		}else if(userType.contains("TEACHER,")){
-			userType.replace("TEACHER,","");
+			userType = userType.replace("TEACHER,","");
 		}else {
 			userType = "";
 		}

edu-util/src/main/java/com/keao/edu/util/collection/MapUtil.java

@@ -1,19 +1,20 @@
 package com.keao.edu.util.collection;
 
-import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.ss.formula.functions.T;
-
 import java.beans.BeanInfo;
 import java.beans.IntrospectionException;
 import java.beans.Introspector;
 import java.beans.PropertyDescriptor;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Objects;
 
+import org.apache.commons.lang3.StringUtils;
+
 public class MapUtil {
 
 	private static final Object[] EMPTY_ARRAY = {};
@@ -128,24 +129,48 @@ public class MapUtil {
 	}
 
 	/**
+	 * @param <K>
 	 * @Author: Joburgess
 	 * @Date: 2019/10/12
 	 * @params [maps]
 	 * @return java.util.Map
 	 * @describe mybatis返回结果转换为Map
 	 */
-	public static Map convertIntegerMap(List<Map> maps){
+	public static <K, V> Map<K, V> convertIntegerMap(List<Map<K, V>> maps,Class keyType,Class valueType) {
 		int size = 0;
 		if(maps != null){
 			size = maps.size();
 		}
 		Map result=new HashMap(size);
-		maps.forEach(stringIntegerMap -> {
-			if(Objects.isNull(stringIntegerMap)){
-				return;
-			}
-			result.put(stringIntegerMap.get("key"),stringIntegerMap.get("value"));
-		});
+		try {
+			for (Map<K, V> stringIntegerMap : maps) {
+				if(Objects.isNull(stringIntegerMap)){
+					continue;
+				}
+				if(stringIntegerMap.get("value") == null){
+					continue;
+				}
+				K key;
+				V value;
+				if(keyType.isAssignableFrom(BigDecimal.class)){
+					key = (K) BigDecimal.class.getDeclaredConstructor(String.class).newInstance(stringIntegerMap.get("key").toString());
+				}else if(keyType.isAssignableFrom(String.class)){
+					key = (K) stringIntegerMap.get("key").toString();
+				}else{
+					key = (K) keyType.getMethod("valueOf", String.class).invoke(null,stringIntegerMap.get("key").toString());
+				}
+				if(valueType.isAssignableFrom(BigDecimal.class)){
+					value = (V) BigDecimal.class.getDeclaredConstructor(String.class).newInstance(stringIntegerMap.get("value").toString());
+				}else if(valueType.isAssignableFrom(String.class)){
+					value = (V) stringIntegerMap.get("value").toString();
+				}else{
+					value = (V) valueType.getMethod("valueOf", String.class).invoke(null,stringIntegerMap.get("value").toString());
+				}
+				result.put(key, value);
+			};
+		}catch (Exception e){
+			e.printStackTrace();
+		}
 		return result;
 	}