Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into zx_saas_12-07

mec-biz/src/main/java/com/ym/mec/biz/service/TempTestService.java

@@ -23,4 +23,11 @@ public interface TempTestService extends BaseService<Long, TempTest> {
 	 * @return
 	 */
 	boolean processBiz(List<Map<String, Object>> datas);
+	
+	/**
+	 * 业务逻辑处理
+	 * @param datas
+	 * @return
+	 */
+	boolean processBiz1(List<Map<String, Object>> datas);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TempTestServiceImpl.java

@@ -120,6 +120,74 @@ public class TempTestServiceImpl extends BaseServiceImpl<Long, TempTest> impleme
 		return true;
 	}
 
+	@Override
+	public boolean processBiz1(List<Map<String, Object>> datas) {
+
+		String mobile, idCard, realName, orderNo;
+		SysUser user = null;
+		Integer userId = null;
+		Date classDate = null;
+		
+		BigDecimal courseFee = null;
+		
+		List<UserSalary> userSalaryList = new ArrayList<UserSalary>();
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
+		UserSalary userSalary = null;
+		
+		//数据整合
+		for (Map<String, Object> row : datas) {
+			realName = row.get("收款人姓名").toString();
+			courseFee = new BigDecimal(row.get("收款金额").toString());
+			classDate = DateUtil.stringToDate(row.get("月份").toString(), "yyyy/MM/dd");
+			classDate = DateUtil.addMonths(classDate, -1);
+			
+			user = teacherDao.getUserWithRealName(realName);
+			
+			if(user == null){
+				System.out.println("[" + realName + "]用户找不到");
+				continue;
+			}
+			
+			userSalary = new UserSalary(null, user, sdf.format(classDate), courseFee, null);
+			userSalaryList.add(userSalary);
+		}
+		
+		Map<String,UserSalary> userSalaryMap = new HashMap<String, UserSalary>();
+		
+		for(UserSalary us : userSalaryList){
+			if(userSalaryMap.containsKey(us.getBatchNo())){
+				userSalary = userSalaryMap.get(us.getBatchNo());
+				userSalary.setCourseFee(userSalary.getCourseFee().add(us.getCourseFee()));
+
+				userSalaryMap.put(us.getBatchNo(), userSalary);
+			}else{
+				userSalaryMap.put(us.getBatchNo(), us);
+			}
+		}
+		
+		
+		
+		for (Entry<String, UserSalary> entry : userSalaryMap.entrySet()) {
+
+			userSalary = entry.getValue();
+			userId = userSalary.getUserId();
+			
+			//查询课程，优先vip课
+			List<TempTest> tempTestList = tempTestDao.queryCourseScheduleInfo(userId, userSalary.getClassMonth());
+			
+			tempTestList = extractCourseSchedule(tempTestList, userSalary.getCourseFee());
+			if(tempTestList.size() > 0){
+				try{
+					tempTestDao.batchInsert(tempTestList);
+				}catch(Exception e){
+					System.out.println("userId:" + userId + "  mobile:" + entry.getValue().getMobile() + " month:" + entry.getValue().getClassMonth() + " message:" + e.getMessage());
+				}
+			}
+			
+		}
+		return true;
+	}
+
 	private List<TempTest> extractCourseSchedule(List<TempTest> srcTempTestList, BigDecimal limitSalary){
 		
 		BigDecimal courseSalary = BigDecimal.ZERO;

mec-biz/src/main/resources/config/mybatis/SysExamSongMapper.xml

@@ -74,7 +74,7 @@
 	</update>
 	<sql id="queryPageSql">
 		<where>
-			ses.del_flag_ = 0 and ses.tenant_id_ = #{tenantId}
+			ses.del_flag_ = 0
 			<if test="search != null and search != ''">
 				AND (ses.id_ = #{search} OR ses.name_ LIKE CONCAT('%',#{search},'%'))
 			</if>

mec-biz/src/main/resources/config/mybatis/SysMusicScoreMapper.xml

@@ -68,8 +68,10 @@
 				client_type_ = #{clientType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
 			</if>
 				ext_config_json_ = #{extConfigJson},
-				ext_style_config_json_ = #{extStyleConfigJson},
 				rank_ids_ = #{rankIds},
+			<if test="extStyleConfigJson != null and extStyleConfigJson != ''">
+				ext_style_config_json_ = #{extStyleConfigJson},
+			</if>
 			<if test="renderFrom != null">
 				render_from_ = #{renderFrom},
 			</if>

mec-web/src/main/java/com/ym/mec/web/controller/TempController.java

@@ -43,7 +43,7 @@ public class TempController extends BaseController {
 
 			Map<String, List<Map<String, Object>>> sheetMap = POIUtil.importExcel(file, 2);
 			
-			tempTestService.processBiz(sheetMap.get("Sheet1"));
+			tempTestService.processBiz1(sheetMap.get("Sheet1"));
 
 		} catch (IOException e) {
 			e.printStackTrace();