Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into master_saas

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

@@ -3711,7 +3711,16 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             }
             //退用户余额
             if (userReBack.compareTo(BigDecimal.ZERO) > 0) {
-                sysUserCashAccountService.updateBalance(musicGroupReg.getUserId(), userReBack, PlatformCashAccountDetailTypeEnum.REFUNDS, "关闭乐团");
+                SysUserCashAccountLog sysUserCashAccountLog = new SysUserCashAccountLog();
+                sysUserCashAccountLog.setGroupType(GroupType.MUSIC);
+                sysUserCashAccountLog.setUserId(musicGroupReg.getUserId());
+                sysUserCashAccountLog.setOrganId(musicGroup.getOrganId());
+                sysUserCashAccountLog.setGroupId(musicGroup.getId());
+                sysUserCashAccountLog.setAmount(userReBack);
+                sysUserCashAccountLog.setReturnFeeType(ReturnFeeEnum.MUSIC);
+                sysUserCashAccountLog.setComment("关闭乐团");
+                sysUserCashAccountLogDao.insert(sysUserCashAccountLog);
+//                sysUserCashAccountService.updateBalance(musicGroupReg.getUserId(), userReBack, PlatformCashAccountDetailTypeEnum.REFUNDS, "关闭乐团");
             }
             //清除剩余课程费用
             if (musicGroupReg.getSurplusCourseFee().compareTo(BigDecimal.ZERO) > 0) {

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

@@ -62,7 +62,9 @@ public class StudentPaymentRouteOrderController extends BaseController {
     @GetMapping("/finance")
     @PreAuthorize("@pcs.hasPermissions('routeOrder/finance')")
     public HttpResponseResult<PageInfo<StudentPaymentRouteOrderDto>> queryOrderPage(StudentPaymentOrderQueryInfo queryInfo) {
-        queryInfo.setOrganId(organizationService.getEmployeeOrgan(queryInfo.getOrganId()));
+    	if(StringUtils.isBlank(queryInfo.getRoutingOrganId())){
+    		queryInfo.setRoutingOrganId(organizationService.getEmployeeOrgan(null));
+    	}
         if (StringUtils.isNotBlank(queryInfo.getSearch())) {
             List<BasicUserDto> users = studentPaymentOrderDao.getUsers(queryInfo.getSearch());
             List<Integer> userIds = users.stream().map(BasicUserDto::getUserId).collect(Collectors.toList());