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

mec-application/src/main/java/com/ym/mec/web/controller/HfMerchantConfigController.java

@@ -68,9 +68,9 @@ public class HfMerchantConfigController extends BaseController {
     }
 
     @ApiOperation("根据机构id查询汇付商户配置")
-    @GetMapping(value = "/queryByTenantId")
-    public HttpResponseResult<HfMerchantConfig> queryByTenantId(String payerName, Integer id) {
-        return succeed(hfMerchantConfigService.queryByTenantId(id, payerName));
+    @GetMapping(value = "/queryByTenantId/{id}")
+    public HttpResponseResult<HfMerchantConfig> queryByTenantId(@ApiParam(value = "机构id", required = true) @PathVariable Integer id) {
+        return succeed(hfMerchantConfigService.queryByTenantId(id,null));
     }
 
     @ApiOperation("分页查询汇付商户配置")

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

@@ -390,6 +390,13 @@ public class ExportServiceImpl implements ExportService {
         exportManageFuncMap.put(ExportEnum.EXPORT_BALANCED_RELATIONSHIP_STUDENT_QUIT_DETAIL, this::exportBalancedRelationshipStudentQuitDetail);
         exportManageFuncMap.put(ExportEnum.VIDEO_PLAY_STAT, this::exportVideoPlayStat);
         exportManageFuncMap.put(ExportEnum.VIDEO_PLAY_DETAIL_STAT, this::exportVideoPlayDetailStat);
+        exportManageFuncMap.put(ExportEnum.EXPORT_BALANCED_RELATIONSHIP_MUSIC_NO_COURSE, this::exportBalancedRelationshipMusicNoCourse);
+        exportManageFuncMap.put(ExportEnum.EXPORT_BALANCED_RELATIONSHIP_MUSIC_NO_COURSE_SUM, this::exportBalancedRelationshipMusicNoCourseSum);
+        exportManageFuncMap.put(ExportEnum.EXPORT_BALANCED_RELATIONSHIP_MUSIC_NO_CLASS_NO_COURSE_SUM, this::exportBalancedRelationshipMusicNoClassNoCourseSum);
+        exportManageFuncMap.put(ExportEnum.EXPORT_BALANCED_RELATIONSHIP_VIP_SUB_COURSE_DETAIL, this::exportBalancedRelationshipVipSubCourseDetail);
+        exportManageFuncMap.put(ExportEnum.EXPORT_BALANCED_RELATIONSHIP_VIP_SUB_COURSE_SUM, this::exportBalancedRelationshipVipSubCourseSum);
+        exportManageFuncMap.put(ExportEnum.EXPORT_BALANCED_RELATIONSHIP_MUSIC_COURSE_SUM, this::exportBalancedRelationshipMusicCourseSum);
+        exportManageFuncMap.put(ExportEnum.EXPORT_BALANCED_RELATIONSHIP_CLOUD_SUM, this::exportBalancedRelationshipCloudSum);
     }
 
     private HttpResponseResult<String> exportVideoPlayStat(Map<String, Object> info) {
@@ -461,10 +468,30 @@ public class ExportServiceImpl implements ExportService {
         SysUser sysUser = sysUserService.getUser();
         String organIds = organizationService.getEmployeeOrgan(sysUser.getId(), null, sysUser.getIsSuperAdmin() && sysUser.getTenantId() == -1);
         ManagerDownload managerDownload = saveManagerDownload(ExportTypeEnum.EXPORT_BALANCED_RELATIONSHIP_MUSIC_COURSE,sysUser.getId());
-        return this.asyncExport(() -> this.initExportInfo(exportDao.exportBalancedRelationshipMusicCourse(month,organIds),
+        return this.asyncExport(() -> this.initExportInfo(exportDao.exportBalancedRelationshipMusicCourse1(month,organIds),
                         managerDownload,ExportEnum.EXPORT_BALANCED_RELATIONSHIP_MUSIC_COURSE),
                 managerDownload.getName());
     }
+
+    private HttpResponseResult<String> exportBalancedRelationshipMusicCourseSum(Map<String, Object> info){
+        String month = getParam(info, "month", String.class);
+        SysUser sysUser = sysUserService.getUser();
+        String organIds = organizationService.getEmployeeOrgan(sysUser.getId(), null, sysUser.getIsSuperAdmin() && sysUser.getTenantId() == -1);
+        ManagerDownload managerDownload = saveManagerDownload(ExportTypeEnum.EXPORT_BALANCED_RELATIONSHIP_MUSIC_COURSE_SUM,sysUser.getId());
+        return this.asyncExport(() -> this.initExportInfo(musicGroupService.exportBalancedRelationshipMusicCourseSum(month,organIds),
+                        managerDownload,ExportEnum.EXPORT_BALANCED_RELATIONSHIP_MUSIC_COURSE_SUM),
+                managerDownload.getName());
+    }
+
+    private HttpResponseResult<String> exportBalancedRelationshipCloudSum(Map<String, Object> info){
+        String month = getParam(info, "month", String.class);
+        SysUser sysUser = sysUserService.getUser();
+        ManagerDownload managerDownload = saveManagerDownload(ExportTypeEnum.EXPORT_BALANCED_RELATIONSHIP_CLOUD_SUM,sysUser.getId());
+        return this.asyncExport(() -> this.initExportInfo(exportDao.exportBalancedRelationshipCloudSum(month),
+                        managerDownload,ExportEnum.EXPORT_BALANCED_RELATIONSHIP_CLOUD_SUM),
+                managerDownload.getName());
+    }
+
     private HttpResponseResult<String> exportBalancedRelationshipVipCourse(Map<String, Object> info){
         String month = getParam(info, "month", String.class);
         SysUser sysUser = sysUserService.getUser();
@@ -510,6 +537,7 @@ public class ExportServiceImpl implements ExportService {
                         managerDownload,ExportEnum.EXPORT_BALANCED_RELATIONSHIP_STUDENT_NORMAL_DETAIL),
                 managerDownload.getName());
     }
+
     private HttpResponseResult<String> exportBalancedRelationshipStudentQuitDetail(Map<String, Object> info){
         String month = getParam(info, "month", String.class);
         SysUser sysUser = sysUserService.getUser();
@@ -520,6 +548,54 @@ public class ExportServiceImpl implements ExportService {
                 managerDownload.getName());
     }
 
+    private HttpResponseResult<String> exportBalancedRelationshipMusicNoCourse(Map<String, Object> info){
+        String month = getParam(info, "month", String.class);
+        SysUser sysUser = sysUserService.getUser();
+        String organIds = organizationService.getEmployeeOrgan(sysUser.getId(), null, sysUser.getIsSuperAdmin() && sysUser.getTenantId() == -1);
+        ManagerDownload managerDownload = saveManagerDownload(ExportTypeEnum.EXPORT_BALANCED_RELATIONSHIP_MUSIC_NO_COURSE,sysUser.getId());
+        return this.asyncExport(() -> this.initExportInfo(musicGroupService.exportBalancedRelationshipMusicNoCourse(month,organIds),
+                        managerDownload,ExportEnum.EXPORT_BALANCED_RELATIONSHIP_MUSIC_NO_COURSE),
+                managerDownload.getName());
+    }
+
+    private HttpResponseResult<String> exportBalancedRelationshipMusicNoCourseSum(Map<String, Object> info){
+        String month = getParam(info, "month", String.class);
+        SysUser sysUser = sysUserService.getUser();
+        String organIds = organizationService.getEmployeeOrgan(sysUser.getId(), null, sysUser.getIsSuperAdmin() && sysUser.getTenantId() == -1);
+        ManagerDownload managerDownload = saveManagerDownload(ExportTypeEnum.EXPORT_BALANCED_RELATIONSHIP_MUSIC_NO_COURSE_SUM,sysUser.getId());
+        return this.asyncExport(() -> this.initExportInfo(musicGroupService.exportBalancedRelationshipMusicNoCourseSum(month,organIds),
+                        managerDownload,ExportEnum.EXPORT_BALANCED_RELATIONSHIP_MUSIC_NO_COURSE_SUM),
+                managerDownload.getName());
+    }
+
+    private HttpResponseResult<String> exportBalancedRelationshipMusicNoClassNoCourseSum(Map<String, Object> info){
+        String month = getParam(info, "month", String.class);
+        SysUser sysUser = sysUserService.getUser();
+        ManagerDownload managerDownload = saveManagerDownload(ExportTypeEnum.EXPORT_BALANCED_RELATIONSHIP_MUSIC_NO_CLASS_NO_COURSE_SUM,sysUser.getId());
+        return this.asyncExport(() -> this.initExportInfo(musicGroupService.exportBalancedRelationshipMusicNoClassNoCourseSum(month),
+                        managerDownload,ExportEnum.EXPORT_BALANCED_RELATIONSHIP_MUSIC_NO_CLASS_NO_COURSE_SUM),
+                managerDownload.getName());
+    }
+
+    private HttpResponseResult<String> exportBalancedRelationshipVipSubCourseDetail(Map<String, Object> info){
+        String month = getParam(info, "month", String.class);
+        SysUser sysUser = sysUserService.getUser();
+        String organIds = organizationService.getEmployeeOrgan(sysUser.getId(), null, sysUser.getIsSuperAdmin() && sysUser.getTenantId() == -1);
+        ManagerDownload managerDownload = saveManagerDownload(ExportTypeEnum.EXPORT_BALANCED_RELATIONSHIP_VIP_SUB_COURSE_DETAIL,sysUser.getId());
+        return this.asyncExport(() -> this.initExportInfo(exportDao.exportBalancedRelationshipVipSubCourseDetail(month,organIds),
+                        managerDownload,ExportEnum.EXPORT_BALANCED_RELATIONSHIP_VIP_SUB_COURSE_DETAIL),
+                managerDownload.getName());
+    }
+
+    private HttpResponseResult<String> exportBalancedRelationshipVipSubCourseSum(Map<String, Object> info){
+        String month = getParam(info, "month", String.class);
+        SysUser sysUser = sysUserService.getUser();
+        ManagerDownload managerDownload = saveManagerDownload(ExportTypeEnum.EXPORT_BALANCED_RELATIONSHIP_VIP_SUB_COURSE_SUM,sysUser.getId());
+        return this.asyncExport(() -> this.initExportInfo(exportDao.exportBalancedRelationshipVipSubCourseSum(month),
+                        managerDownload,ExportEnum.EXPORT_BALANCED_RELATIONSHIP_VIP_SUB_COURSE_SUM),
+                managerDownload.getName());
+    }
+
     private HttpResponseResult<String> exportOperatingSummaryIncome(Map<String, Object> info) {
         String month = getParam(info, "month", String.class);
         Map<String, Object> params = new HashMap<>(1);

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

@@ -134,7 +134,13 @@
 	</select>
 	
 	<select id="queryByTenantId" resultMap="HfMerchantConfig">
-		SELECT * FROM hf_merchant_config where tenant_id_ = #{tenantId} AND payer_name_ = #{payerName}
+		SELECT * FROM hf_merchant_config where tenant_id_ = #{tenantId}
+		<if test="payerName != null and payerName != ''">
+			AND payer_name_ = #{payerName}
+		</if>
+		<if test="payerName == null or payerName == ''">
+			AND payer_name_ = 'ADAPAY'
+		</if>
 	</select>
 
     <sql id="queryPageSql">