Merge branch 'feature-operating-report' of http://git.dayaedu.com/yonge/mec into feature-operating-report

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

@@ -1454,8 +1454,13 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			}
 		}
 		Set<Integer> currentCourseLeaveStudentIds = courseLeaveStudentIdsMap.get(courseSchedule.getId());
-		Set<Integer> currentCourseStudentIds = courseStudentIdsMap.get(courseSchedule.getId())
-												.stream().filter(id->Objects.nonNull(currentCourseLeaveStudentIds)&&!currentCourseLeaveStudentIds.contains(id)).collect(Collectors.toSet());
+		Set<Integer> currentCourseStudentIds;
+		if(null!=currentCourseLeaveStudentIds){
+			currentCourseStudentIds = courseStudentIdsMap.get(courseSchedule.getId())
+					.stream().filter(id->Objects.nonNull(currentCourseLeaveStudentIds)&&!currentCourseLeaveStudentIds.contains(id)).collect(Collectors.toSet());
+		}else{
+			currentCourseStudentIds = courseStudentIdsMap.get(courseSchedule.getId());
+		}
 
 		boolean isRepeat = false;
 		List<CourseSchedule> repeatCourses = new ArrayList<>();
@@ -1482,9 +1487,14 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 
 			Set<Integer> csLeaveStudentIds = courseLeaveStudentIdsMap.get(cs.getId());
 			Set<Integer> repeatStudentIds = new HashSet<>();
+			Set<Integer> csStudentIds;
 			if(null!=csLeaveStudentIds){
-				Set<Integer> csStudentIds = courseStudentIdsMap.get(cs.getId()).stream()
+				csStudentIds = courseStudentIdsMap.get(cs.getId()).stream()
 						.filter(id->Objects.nonNull(csLeaveStudentIds)&&!csLeaveStudentIds.contains(id)).collect(Collectors.toSet());
+			}else{
+				csStudentIds = courseStudentIdsMap.get(cs.getId());
+			}
+			if(null!=csStudentIds){
 				repeatStudentIds = csStudentIds.stream().filter(id -> currentCourseStudentIds.contains(id)).collect(Collectors.toSet());
 			}
 
@@ -1507,9 +1517,14 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 
 				Set<Integer> csLeaveStudentIds = courseLeaveStudentIdsMap.get(cs.getId());
 				Set<Integer> repeatStudentIds = new HashSet<>();
+				Set<Integer> csStudentIds;
 				if(null!=csLeaveStudentIds){
-					Set<Integer> csStudentIds = courseStudentIdsMap.get(cs.getId()).stream()
+					csStudentIds = courseStudentIdsMap.get(cs.getId()).stream()
 							.filter(id->Objects.nonNull(csLeaveStudentIds)&&!csLeaveStudentIds.contains(id)).collect(Collectors.toSet());
+				}else{
+					csStudentIds = courseStudentIdsMap.get(cs.getId());
+				}
+				if(null!=csStudentIds){
 					repeatStudentIds = csStudentIds.stream().filter(id -> currentCourseStudentIds.contains(id)).collect(Collectors.toSet());
 				}
 

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

@@ -172,7 +172,8 @@ public class PayServiceImpl implements PayService {
         List<AmountChannelDto> amountChannelDtoList = JSON.parseArray(amountChannel, AmountChannelDto.class);
         for (AmountChannelDto amountChannelDto : amountChannelDtoList) {
             if (amountChannelDto.getOrganId().equals(organId) &&
-                    amount.compareTo(amountChannelDto.getAmount()) == 0 &&
+                    //0的时候不限定金额
+                    (amountChannelDto.getAmount().compareTo(BigDecimal.ZERO) == 0 || amount.compareTo(amountChannelDto.getAmount()) == 0) &&
                     receiver.equals(amountChannelDto.getType())
             ) {
                 routeOrganId = amountChannelDto.getRouteOrganId();

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

@@ -407,7 +407,7 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
 
         Integer userId = studentPaymentOrder.getUserId();
 
-        Map<Integer, String> map = new HashMap();
+        Map<Integer, String> map = new HashMap<>();
         map.put(userId, userId.toString());
 
         if (studentPaymentOrder.getStatus() == DealStatusEnum.SUCCESS) {
@@ -453,6 +453,7 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
                 rechargeDetail.setPerAmount(studentPaymentOrder.getPerAmount().negate());
             }
             sysUserCashAccountDetailService.insert(paymentDetail);
+            //
 
             String imContent = repairInfo.getStudentName() + "学员您好，您的乐器维修已受理，我们会尽快完成保养维修";
 

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

@@ -41,7 +41,7 @@ public class SellOrderController extends BaseController {
     @Autowired
     private EmployeeDao employeeDao;
 
-    @ApiOperation("获取维修列表")
+    @ApiOperation("销售列表")
     @GetMapping(value = "/queryPage")
     @PreAuthorize("@pcs.hasPermissions('sellOrder/queryPage')")
     public HttpResponseResult<PageInfo<SellOrder>> queryPage(SellOrderQueryInfo queryInfo) {
@@ -71,9 +71,9 @@ public class SellOrderController extends BaseController {
     @ApiOperation("更新")
     @PostMapping(value = "/update")
     @PreAuthorize("@pcs.hasPermissions('sellOrder/update')")
-    public SellOrder update(SellOrder sellOrder) {
+    public HttpResponseResult<SellOrder> update(SellOrder sellOrder) {
         sellOrderService.update(sellOrder);
-        return sellOrder;
+        return succeed(sellOrder);
     }
 
 }