Merge remote-tracking branch 'origin/master'

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

@@ -1799,7 +1799,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 throw new BizException("{}课程类型暂无剩余课程时长", classGroup4MixDto.getCourseType().getMsg());
             }
             Integer totalMinutes = courseTypeMinutesMap.get(classGroup4MixDto.getCourseType().getCode());
-            classGroup4MixDto.setCourseTimes(totalMinutes/(int)courseDuration);
+//            classGroup4MixDto.setCourseTimes(totalMinutes/(int)courseDuration);
 
             if(classGroup4MixDto.getCourseTimes()<=0){
                 throw new BizException("{}课程类型剩余课程时长不足", classGroup4MixDto.getCourseType().getMsg());
@@ -1914,7 +1914,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                         //课堂课课酬改为按分钟数计算，并且时长占比向下取整
                         if (courseSchedule.getType().equals(CourseSchedule.CourseScheduleType.CLASSROOM)){
                             baseSalary = classGroupTeacherMapper.getTeacherRole().equals(TeachTypeEnum.BISHOP) ? teacherDefaultMusicGroupSalary.getMainTeacher30MinSalary() : teacherDefaultMusicGroupSalary.getAssistantTeacher30MinSalary();
-                            classTimeDuty = new BigDecimal(classCourseDuration).divide(new BigDecimal(40), BigDecimal.ZERO.intValue(), BigDecimal.ROUND_DOWN);
+                            classTimeDuty = new BigDecimal(classCourseDuration).divide(new BigDecimal(40), CommonConstants.DECIMAL_PLACE, BigDecimal.ROUND_DOWN);
                         }
 
                         salary = baseSalary.multiply(classTimeDuty).setScale(2, BigDecimal.ROUND_HALF_UP);
@@ -2278,7 +2278,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                     //课堂课课酬改为按分钟数计算，并且时长占比向下取整
                     if (courseSchedule.getType().equals(CourseSchedule.CourseScheduleType.CLASSROOM)){
                         baseSalary = classGroupTeacherMapper.getTeacherRole().equals(TeachTypeEnum.BISHOP) ? teacherDefaultMusicGroupSalary.getMainTeacher30MinSalary() : teacherDefaultMusicGroupSalary.getAssistantTeacher30MinSalary();
-                        classTimeDuty = new BigDecimal(classCourseDuration).divide(new BigDecimal(40), BigDecimal.ZERO.intValue(), BigDecimal.ROUND_DOWN);
+                        classTimeDuty = new BigDecimal(classCourseDuration).divide(new BigDecimal(40), CommonConstants.DECIMAL_PLACE, BigDecimal.ROUND_DOWN);
                     }
 
                     salary = baseSalary.multiply(classTimeDuty).setScale(2, BigDecimal.ROUND_HALF_UP);
@@ -2473,7 +2473,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             long courseDuration = Duration.between(LocalDateTime.parse(classGroup4MixDto.getStartDate() + " " + classGroup4MixDto.getCourseTimeDtoList().get(0).getStartClassTime() + ":00", formatter),
                     LocalDateTime.parse(classGroup4MixDto.getStartDate() + " " + classGroup4MixDto.getCourseTimeDtoList().get(0).getEndClassTime() + ":00", formatter))
                     .toMinutes();
-            classGroup4MixDto.setCourseTimes(totalMinutes/(int)courseDuration);
+//            classGroup4MixDto.setCourseTimes(totalMinutes/(int)courseDuration);
 
             if(classGroup4MixDto.getCourseTimes()<=0){
                 throw new BizException("{}课程类型剩余课程时长不足", classGroup4MixDto.getCourseType().getMsg());
@@ -2586,7 +2586,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                         //课堂课课酬改为按分钟数计算，并且时长占比向下取整
                         if (courseSchedule.getType().equals(CourseSchedule.CourseScheduleType.CLASSROOM)){
                             baseSalary = classGroupTeacherMapper.getTeacherRole().equals(TeachTypeEnum.BISHOP) ? teacherDefaultMusicGroupSalary.getMainTeacher30MinSalary() : teacherDefaultMusicGroupSalary.getAssistantTeacher30MinSalary();
-                            classTimeDuty = new BigDecimal(classCourseDuration).divide(new BigDecimal(40), BigDecimal.ZERO.intValue(), BigDecimal.ROUND_DOWN);
+                            classTimeDuty = new BigDecimal(classCourseDuration).divide(new BigDecimal(40), CommonConstants.DECIMAL_PLACE, BigDecimal.ROUND_DOWN);
                         }
 
                         salary = baseSalary.multiply(classTimeDuty).setScale(2, BigDecimal.ROUND_HALF_UP);
@@ -2775,7 +2775,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             long courseDuration = Duration.between(LocalDateTime.parse(classGroup4MixDto.getStartDate() + " " + classGroup4MixDto.getCourseTimeDtoList().get(0).getStartClassTime() + ":00", formatter),
                     LocalDateTime.parse(classGroup4MixDto.getStartDate() + " " + classGroup4MixDto.getCourseTimeDtoList().get(0).getEndClassTime() + ":00", formatter))
                     .toMinutes();
-            classGroup4MixDto.setCourseTimes(totalMinutes/(int)courseDuration);
+//            classGroup4MixDto.setCourseTimes(totalMinutes/(int)courseDuration);
 
             if(classGroup4MixDto.getCourseTimes()<=0){
                 throw new BizException("{}课程类型剩余课程时长不足", classGroup4MixDto.getCourseType().getMsg());
@@ -2890,7 +2890,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                         //课堂课课酬改为按分钟数计算，并且时长占比向下取整
                         if (courseSchedule.getType().equals(CourseSchedule.CourseScheduleType.CLASSROOM)){
                             baseSalary = classGroupTeacherMapper.getTeacherRole().equals(TeachTypeEnum.BISHOP) ? teacherDefaultMusicGroupSalary.getMainTeacher30MinSalary() : teacherDefaultMusicGroupSalary.getAssistantTeacher30MinSalary();
-                            classTimeDuty = new BigDecimal(classCourseDuration).divide(new BigDecimal(40), BigDecimal.ZERO.intValue(), BigDecimal.ROUND_DOWN);
+                            classTimeDuty = new BigDecimal(classCourseDuration).divide(new BigDecimal(40), CommonConstants.DECIMAL_PLACE, BigDecimal.ROUND_DOWN);
                         }
 
                         salary = baseSalary.multiply(classTimeDuty).setScale(2, BigDecimal.ROUND_HALF_UP);

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

@@ -589,7 +589,7 @@ public class ClassGroupTeacherMapperServiceImpl extends BaseServiceImpl<Long, Cl
         //课堂课课酬改为按分钟数计算，并且时长占比向下取整
         if (courseSchedule.getType().equals(CourseSchedule.CourseScheduleType.CLASSROOM)){
             teacherDefaultSalary = teachType.equals(TeachTypeEnum.BISHOP) ? teacherDefaultMusicGroupSalaryWithTeacherId.getMainTeacher30MinSalary() : teacherDefaultMusicGroupSalaryWithTeacherId.getAssistantTeacher30MinSalary();
-            classTimeDuty = new BigDecimal(duration).divide(new BigDecimal(40), BigDecimal.ZERO.intValue(), BigDecimal.ROUND_DOWN);
+            classTimeDuty = new BigDecimal(duration).divide(new BigDecimal(40), CommonConstants.DECIMAL_PLACE, BigDecimal.ROUND_DOWN);
         }
         teacherSalary = teacherDefaultSalary.multiply(classTimeDuty).setScale(2, BigDecimal.ROUND_HALF_UP);
 

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

@@ -1084,7 +1084,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
             //课堂课课酬改为按分钟数计算，并且时长占比向下取整
             if (courseSchedule.getType().equals(CourseSchedule.CourseScheduleType.CLASSROOM)){
                 baseSalary = courseScheduleTeacherSalary.getTeacherRole().equals(TeachTypeEnum.BISHOP) ? teacherDefaultMusicGroupSalary.getMainTeacher30MinSalary() : teacherDefaultMusicGroupSalary.getAssistantTeacher30MinSalary();
-                classTimeDuty = new BigDecimal(classCourseDuration).divide(new BigDecimal(40), BigDecimal.ZERO.intValue(), BigDecimal.ROUND_DOWN);
+                classTimeDuty = new BigDecimal(classCourseDuration).divide(new BigDecimal(40), CommonConstants.DECIMAL_PLACE, BigDecimal.ROUND_DOWN);
             }
 
             salary = baseSalary.multiply(classTimeDuty).setScale(2, BigDecimal.ROUND_HALF_UP);

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

@@ -519,9 +519,9 @@ public class GoodsServiceImpl extends BaseServiceImpl<Integer, Goods>  implement
 
 				goods.setSellCount(new AtomicInteger(goods.getSellCount()).incrementAndGet());
 
-				goodsDao.update(goods);
+//				goodsDao.update(goods);
 				if(Objects.nonNull(goodsProcurement)){
-					goodsProcurementDao.update(goodsProcurement);
+//					goodsProcurementDao.update(goodsProcurement);
 				}else{
 					goodsProcurement = new GoodsProcurement(goods.getId());
 				}
@@ -634,8 +634,8 @@ public class GoodsServiceImpl extends BaseServiceImpl<Integer, Goods>  implement
 			}
 			goods.setSellCount(new AtomicInteger(goods.getSellCount()).addAndGet(-sellOrder.getNum()));
 
-			goodsDao.update(goods);
-			goodsProcurementDao.update(goodsProcurement);
+//			goodsDao.update(goods);
+//			goodsProcurementDao.update(goodsProcurement);
 		}
 	}
 

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

@@ -461,11 +461,9 @@ public class StudentPaymentRouteOrderServiceImpl extends BaseServiceImpl<Long, S
                         continue;
                     }
                     if (columnValue.equals("calenderId")) {
-                        if (StringUtils.isEmpty(row.get(s).toString())) {
-                            sb.append("第" + rowNum).append("行数据导入失败：学校缴费项id不可为空;");
-                            continue valueIsNull;
-                        } else if (!schoolCalender.containsKey(row.get(s).toString())) {
+                        if (StringUtils.isNotBlank(row.get(s).toString()) && !schoolCalender.containsKey(row.get(s).toString())) {
                             sb.append("第" + rowNum).append("行数据导入失败：学校缴费项id不存在;");
+                            continue valueIsNull;
                         } else {
                             objectMap.put("calenderId", row.get(s));
                         }
@@ -494,16 +492,14 @@ public class StudentPaymentRouteOrderServiceImpl extends BaseServiceImpl<Long, S
                     if (goodsIdList.size() != goodsNumList.size()) {
                         throw new BizException("导入失败：商品编号和商品数量不一致");
                     }
-                    JSONArray goodsJSON = new JSONArray();
+                    JSONObject goodsJSON = new JSONObject();
                     for (int i = 0; i < goodsIdList.size(); i++) {
                         if (!goodsDao.findByIdAndStatus(goodsIdList.get(i), 1)) {
                             throw new BizException("导入失败：商品编号{}不存在", goodsIdList.get(i));
                         }
                         try {
                             int goodsNum = Integer.parseInt(goodsNumList.get(i));
-                            JSONObject jsonObject = new JSONObject();
-                            jsonObject.put(goodsIdList.get(i), goodsNum);
-                            goodsJSON.add(jsonObject);
+                            goodsJSON.put(goodsIdList.get(i), goodsNum);
                         } catch (Exception e1) {
                             throw new BizException("导入失败：商品数量{}填写错误", goodsNumList.get(i));
                         }