更新！

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/tempMenus/OrgMenuController.java

@@ -13,356 +13,340 @@ import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 @RequestMapping("orgMenu")
-@Tag(name = "机构的菜单配置")
+@Tag(name = "项目里的菜单配置")
 @Hidden
 public class OrgMenuController {
 
-    @ResourceAuth(value = "orgBaseManager", type = AuthType.Project, remark = "项目配置_基本信息_0_Menu")
-    @ResourceAuth(value = "orgBaseManager", type = AuthType.School, remark = "项目配置_基本信息_0_Menu")
-    @ResourceAuth(value = "orgBaseManager", type = AuthType.BusinessMain, remark = "项目配置_基本信息_0_Menu")
-    @ResourceAuth(value = "orgBaseManager", type = AuthType.CommonOrg, remark = "项目配置_基本信息_0_Menu")
+
+    @ResourceAuth(value = "projectOrgManager", type = AuthType.Project, remark = "机构管理_机构管理_10_Menu")
+    @ResourceAuth(value = "projectOrgManager", type = AuthType.School, remark = "机构管理_机构管理_10_Menu")
+    @ResourceAuth(value = "projectOrgManager", type = AuthType.BusinessMain, remark = "机构管理_机构管理_10_Menu")
+    @ResourceAuth(value = "projectOrgManager", type = AuthType.CommonOrg, remark = "机构管理_机构管理_10_Menu")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.BusinessMain, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.CommonOrg, remark = "")
     @ResourceAuth(value = "user", type = AuthType.User)
-    @RequestMapping(value = "orgBaseManager", method = {RequestMethod.GET})
-    public ResultContent orgBaseManager() {
+    @RequestMapping(value = "projectOrgManager", method = {RequestMethod.GET})
+    public ResultContent projectOrgManager() {
         return ResultContent.buildSuccess();
     }
 
-    @ResourceAuth(value = "orgPayManager", type = AuthType.Project, remark = "项目配置_支付配置_1_Menu")
-    @ResourceAuth(value = "orgPayManager", type = AuthType.School, remark = "项目配置_支付配置_1_Menu")
-    @ResourceAuth(value = "orgPayManager", type = AuthType.BusinessMain, remark = "项目配置_支付配置_1_Menu")
-    @ResourceAuth(value = "orgPayManager", type = AuthType.CommonOrg, remark = "项目配置_支付配置_1_Menu")
+    @ResourceAuth(value = "projectUserManager", type = AuthType.Project, remark = "用户管理_用户列表_20_Menu")
+    @ResourceAuth(value = "projectUserManager", type = AuthType.School, remark = "用户管理_用户列表_20_Menu")
+    @ResourceAuth(value = "projectUserManager", type = AuthType.BusinessMain, remark = "用户管理_用户列表_20_Menu")
+    @ResourceAuth(value = "projectUserManager", type = AuthType.CommonOrg, remark = "用户管理_用户列表_20_Menu")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.BusinessMain, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.CommonOrg, remark = "")
     @ResourceAuth(value = "user", type = AuthType.User)
-    @RequestMapping(value = "orgPayManager", method = {RequestMethod.GET})
-    public ResultContent orgPayManager() {
+    @RequestMapping(value = "projectUserManager", method = {RequestMethod.GET})
+    public ResultContent projectUserManager() {
         return ResultContent.buildSuccess();
     }
 
-    @ResourceAuth(value = "orgWechatSettingManager", type = AuthType.Project, remark = "项目配置_小程序配置_2_Menu")
-    @ResourceAuth(value = "orgWechatSettingManager", type = AuthType.School, remark = "项目配置_小程序配置_2_Menu")
-    @ResourceAuth(value = "orgWechatSettingManager", type = AuthType.BusinessMain, remark = "项目配置_小程序配置_2_Menu")
-    @ResourceAuth(value = "orgWechatSettingManager", type = AuthType.CommonOrg, remark = "项目配置_小程序配置_2_Menu")
+    @ResourceAuth(value = "projectPostionManager", type = AuthType.Project, remark = "用户管理_职位管理_21_Menu")
+    @ResourceAuth(value = "projectPostionManager", type = AuthType.School, remark = "用户管理_职位管理_21_Menu")
+    @ResourceAuth(value = "projectPostionManager", type = AuthType.BusinessMain, remark = "用户管理_职位管理_21_Menu")
+    @ResourceAuth(value = "projectPostionManager", type = AuthType.CommonOrg, remark = "用户管理_职位管理_21_Menu")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.BusinessMain, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.CommonOrg, remark = "")
     @ResourceAuth(value = "user", type = AuthType.User)
-    @RequestMapping(value = "orgWechatSettingManager", method = {RequestMethod.GET})
-    public ResultContent orgWechatSettingManager() {
+    @RequestMapping(value = "projectPostionManager", method = {RequestMethod.GET})
+    public ResultContent projectPostionManager() {
         return ResultContent.buildSuccess();
     }
 
-    @ResourceAuth(value = "orgAccessKeyManager", type = AuthType.Project, remark = "项目配置_AccessKey配置_3_Menu")
-    @ResourceAuth(value = "orgAccessKeyManager", type = AuthType.School, remark = "项目配置_AccessKey配置_3_Menu")
-    @ResourceAuth(value = "orgAccessKeyManager", type = AuthType.BusinessMain, remark = "项目配置_AccessKey配置_3_Menu")
-    @ResourceAuth(value = "orgAccessKeyManager", type = AuthType.CommonOrg, remark = "项目配置_AccessKey配置_3_Menu")
+    @ResourceAuth(value = "projectRoleManager", type = AuthType.Project, remark = "用户管理_角色列表_22_Menu")
+    @ResourceAuth(value = "projectRoleManager", type = AuthType.School, remark = "用户管理_角色列表_22_Menu")
+    @ResourceAuth(value = "projectRoleManager", type = AuthType.BusinessMain, remark = "用户管理_角色列表_22_Menu")
+    @ResourceAuth(value = "projectRoleManager", type = AuthType.CommonOrg, remark = "用户管理_角色列表_22_Menu")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.BusinessMain, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.CommonOrg, remark = "")
     @ResourceAuth(value = "user", type = AuthType.User)
-    @RequestMapping(value = "orgAccessKeyManager", method = {RequestMethod.GET})
-    public ResultContent orgAccessKeyManager() {
+    @RequestMapping(value = "projectRoleManager", method = {RequestMethod.GET})
+    public ResultContent projectRoleManager() {
         return ResultContent.buildSuccess();
     }
 
-    @ResourceAuth(value = "orgTemplateManager", type = AuthType.Project, remark = "项目配置_模版配置_4_Menu")
-    @ResourceAuth(value = "orgTemplateManager", type = AuthType.School, remark = "项目配置_模版配置_4_Menu")
-    @ResourceAuth(value = "orgTemplateManager", type = AuthType.BusinessMain, remark = "项目配置_模版配置_4_Menu")
-    @ResourceAuth(value = "orgTemplateManager", type = AuthType.CommonOrg, remark = "项目配置_模版配置_4_Menu")
+    @ResourceAuth(value = "projectDepartmentManager", type = AuthType.Project, remark = "用户管理_部门管理_23_Menu")
+    @ResourceAuth(value = "projectDepartmentManager", type = AuthType.School, remark = "用户管理_部门管理_23_Menu")
+    @ResourceAuth(value = "projectDepartmentManager", type = AuthType.BusinessMain, remark = "用户管理_部门管理_23_Menu")
+    @ResourceAuth(value = "projectDepartmentManager", type = AuthType.CommonOrg, remark = "用户管理_部门管理_23_Menu")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.BusinessMain, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.CommonOrg, remark = "")
     @ResourceAuth(value = "user", type = AuthType.User)
-    @RequestMapping(value = "orgTemplateManager", method = {RequestMethod.GET})
-    public ResultContent orgTemplateManager() {
+    @RequestMapping(value = "projectDepartmentManager", method = {RequestMethod.GET})
+    public ResultContent projectDepartmentManager() {
         return ResultContent.buildSuccess();
     }
 
-
-    @ResourceAuth(value = "orgProtocolManager", type = AuthType.Project, remark = "项目配置_协议配置_5_Menu")
-    @ResourceAuth(value = "orgProtocolManager", type = AuthType.School, remark = "项目配置_协议配置_5_Menu")
-    @ResourceAuth(value = "orgProtocolManager", type = AuthType.BusinessMain, remark = "项目配置_协议配置_5_Menu")
-    @ResourceAuth(value = "orgProtocolManager", type = AuthType.CommonOrg, remark = "项目配置_协议配置_5_Menu")
+    @ResourceAuth(value = "projectCardManager", type = AuthType.Project, remark = "卡片管理_卡片列表_30_Menu")
+    @ResourceAuth(value = "projectCardManager", type = AuthType.School, remark = "卡片管理_卡片列表_30_Menu")
+    @ResourceAuth(value = "projectCardManager", type = AuthType.BusinessMain, remark = "卡片管理_卡片列表_30_Menu")
+    @ResourceAuth(value = "projectCardManager", type = AuthType.CommonOrg, remark = "卡片管理_卡片列表_30_Menu")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.BusinessMain, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.CommonOrg, remark = "")
     @ResourceAuth(value = "user", type = AuthType.User)
-    @RequestMapping(value = "orgProtocolManager", method = {RequestMethod.GET})
-    public ResultContent orgProtocolManager() {
+    @RequestMapping(value = "projectCardManager", method = {RequestMethod.GET})
+    public ResultContent projectCardManager() {
         return ResultContent.buildSuccess();
     }
 
-    @ResourceAuth(value = "orgCommonSettingManager", type = AuthType.Project, remark = "项目配置_通用配置_6_Menu")
-    @ResourceAuth(value = "orgCommonSettingManager", type = AuthType.School, remark = "项目配置_通用配置_6_Menu")
-    @ResourceAuth(value = "orgCommonSettingManager", type = AuthType.BusinessMain, remark = "项目配置_通用配置_6_Menu")
-    @ResourceAuth(value = "orgCommonSettingManager", type = AuthType.CommonOrg, remark = "项目配置_通用配置_6_Menu")
+    @ResourceAuth(value = "projectCardPoolManager", type = AuthType.Project, remark = "卡片管理_卡片资源库_31_Menu")
+    @ResourceAuth(value = "projectCardPoolManager", type = AuthType.School, remark = "卡片管理_卡片资源库_31_Menu")
+    @ResourceAuth(value = "projectCardPoolManager", type = AuthType.BusinessMain, remark = "卡片管理_卡片资源库_31_Menu")
+    @ResourceAuth(value = "projectCardPoolManager", type = AuthType.CommonOrg, remark = "卡片管理_卡片资源库_31_Menu")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.BusinessMain, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.CommonOrg, remark = "")
     @ResourceAuth(value = "user", type = AuthType.User)
-    @RequestMapping(value = "orgCommonSettingManager", method = {RequestMethod.GET})
-    public ResultContent orgCommonSettingManager() {
+    @RequestMapping(value = "projectCardPoolManager", method = {RequestMethod.GET})
+    public ResultContent projectCardPoolManager() {
         return ResultContent.buildSuccess();
     }
 
-    @ResourceAuth(value = "orgOrgManager", type = AuthType.Project, remark = "机构管理_机构列表_1_Menu")
-    @ResourceAuth(value = "orgOrgManager", type = AuthType.School, remark = "机构管理_机构列表_1_Menu")
-    @ResourceAuth(value = "orgOrgManager", type = AuthType.BusinessMain, remark = "机构管理_机构列表_1_Menu")
-    @ResourceAuth(value = "orgOrgManager", type = AuthType.CommonOrg, remark = "机构管理_机构列表_1_Menu")
+    @ResourceAuth(value = "projectDeviceManager", type = AuthType.Project, remark = "设备管理_设备列表_40_Menu")
+    @ResourceAuth(value = "projectDeviceManager", type = AuthType.School, remark = "设备管理_设备列表_40_Menu")
+    @ResourceAuth(value = "projectDeviceManager", type = AuthType.BusinessMain, remark = "设备管理_设备列表_40_Menu")
+    @ResourceAuth(value = "projectDeviceManager", type = AuthType.CommonOrg, remark = "设备管理_设备列表_40_Menu")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.BusinessMain, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.CommonOrg, remark = "")
     @ResourceAuth(value = "user", type = AuthType.User)
-    @RequestMapping(value = "orgOrgManager", method = {RequestMethod.GET})
-    public ResultContent orgOrgManager() {
+    @RequestMapping(value = "projectDeviceManager", method = {RequestMethod.GET})
+    public ResultContent projectDeviceManager() {
         return ResultContent.buildSuccess();
     }
 
-    @ResourceAuth(value = "orgAreaManager", type = AuthType.Project, remark = "区域管理_区域列表_1_Menu")
-    @ResourceAuth(value = "orgAreaManager", type = AuthType.School, remark = "区域管理_区域列表_1_Menu")
-    @ResourceAuth(value = "orgAreaManager", type = AuthType.BusinessMain, remark = "区域管理_区域列表_1_Menu")
-    @ResourceAuth(value = "orgAreaManager", type = AuthType.CommonOrg, remark = "区域管理_区域列表_1_Menu")
+
+    @ResourceAuth(value = "projectDevicePermissManager", type = AuthType.Project, remark = "设备管理_设备权限_41_Menu")
+    @ResourceAuth(value = "projectDevicePermissManager", type = AuthType.School, remark = "设备管理_设备权限_41_Menu")
+    @ResourceAuth(value = "projectDevicePermissManager", type = AuthType.BusinessMain, remark = "设备管理_设备权限_41_Menu")
+    @ResourceAuth(value = "projectDevicePermissManager", type = AuthType.CommonOrg, remark = "设备管理_设备权限_41_Menu")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.BusinessMain, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.CommonOrg, remark = "")
     @ResourceAuth(value = "user", type = AuthType.User)
-    @RequestMapping(value = "orgAreaManager", method = {RequestMethod.GET})
-    public ResultContent orgAreaManager() {
+    @RequestMapping(value = "projectDevicePermissManager", method = {RequestMethod.GET})
+    public ResultContent projectDevicePermissManager() {
         return ResultContent.buildSuccess();
     }
 
-    @ResourceAuth(value = "orgUserManager", type = AuthType.Project, remark = "用户管理_用户列表_1_Menu")
-    @ResourceAuth(value = "orgUserManager", type = AuthType.School, remark = "用户管理_用户列表_1_Menu")
-    @ResourceAuth(value = "orgUserManager", type = AuthType.BusinessMain, remark = "用户管理_用户列表_1_Menu")
-    @ResourceAuth(value = "orgUserManager", type = AuthType.CommonOrg, remark = "用户管理_用户列表_1_Menu")
+
+    @ResourceAuth(value = "projectFundManager", type = AuthType.Project, remark = "资金管理_资金概况_50_Menu")
+    @ResourceAuth(value = "projectFundManager", type = AuthType.School, remark = "资金管理_资金概况_50_Menu")
+    @ResourceAuth(value = "projectFundManager", type = AuthType.BusinessMain, remark = "资金管理_资金概况_50_Menu")
+    @ResourceAuth(value = "projectFundManager", type = AuthType.CommonOrg, remark = "资金管理_资金概况_50_Menu")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.BusinessMain, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.CommonOrg, remark = "")
     @ResourceAuth(value = "user", type = AuthType.User)
-    @RequestMapping(value = "orgUserManager", method = {RequestMethod.GET})
-    public ResultContent orgUserManager() {
+    @RequestMapping(value = "projectFundManager", method = {RequestMethod.GET})
+    public ResultContent projectFundManager() {
         return ResultContent.buildSuccess();
     }
 
-    @ResourceAuth(value = "orgUserGroupManager", type = AuthType.Project, remark = "用户管理_用户分组_2_Menu")
-    @ResourceAuth(value = "orgUserGroupManager", type = AuthType.School, remark = "用户管理_用户分组_2_Menu")
-    @ResourceAuth(value = "orgUserGroupManager", type = AuthType.BusinessMain, remark = "用户管理_用户分组_2_Menu")
-    @ResourceAuth(value = "orgUserGroupManager", type = AuthType.CommonOrg, remark = "用户管理_用户分组_2_Menu")
+    @ResourceAuth(value = "projectPayOrderManager", type = AuthType.Project, remark = "资金管理_支付订单_51_Menu")
+    @ResourceAuth(value = "projectPayOrderManager", type = AuthType.School, remark = "资金管理_支付订单_51_Menu")
+    @ResourceAuth(value = "projectPayOrderManager", type = AuthType.BusinessMain, remark = "资金管理_支付订单_51_Menu")
+    @ResourceAuth(value = "projectPayOrderManager", type = AuthType.CommonOrg, remark = "资金管理_支付订单_51_Menu")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.BusinessMain, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.CommonOrg, remark = "")
     @ResourceAuth(value = "user", type = AuthType.User)
-    @RequestMapping(value = "orgUserGroupManager", method = {RequestMethod.GET})
-    public ResultContent orgUserGroupManager() {
+    @RequestMapping(value = "projectPayOrderManager", method = {RequestMethod.GET})
+    public ResultContent projectPayOrderManager() {
         return ResultContent.buildSuccess();
     }
 
-    @ResourceAuth(value = "orgPosManager", type = AuthType.Project, remark = "用户管理_职位管理_3_Menu")
-    @ResourceAuth(value = "orgPosManager", type = AuthType.School, remark = "用户管理_职位管理_3_Menu")
-    @ResourceAuth(value = "orgPosManager", type = AuthType.BusinessMain, remark = "用户管理_职位管理_3_Menu")
-    @ResourceAuth(value = "orgPosManager", type = AuthType.CommonOrg, remark = "用户管理_职位管理_3_Menu")
+    @ResourceAuth(value = "projectPayShareManager", type = AuthType.Project, remark = "资金管理_分账单_52_Menu")
+    @ResourceAuth(value = "projectPayShareManager", type = AuthType.School, remark = "资金管理_分账单_52_Menu")
+    @ResourceAuth(value = "projectPayShareManager", type = AuthType.BusinessMain, remark = "资金管理_分账单_52_Menu")
+    @ResourceAuth(value = "projectPayShareManager", type = AuthType.CommonOrg, remark = "资金管理_分账单_52_Menu")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.BusinessMain, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.CommonOrg, remark = "")
     @ResourceAuth(value = "user", type = AuthType.User)
-    @RequestMapping(value = "orgPosManager", method = {RequestMethod.GET})
-    public ResultContent orgPosManager() {
+    @RequestMapping(value = "projectPayShareManager", method = {RequestMethod.GET})
+    public ResultContent projectPayShareManager() {
         return ResultContent.buildSuccess();
     }
 
-    @ResourceAuth(value = "orgRoleManager", type = AuthType.Project, remark = "用户管理_角色列表_4_Menu")
-    @ResourceAuth(value = "orgRoleManager", type = AuthType.School, remark = "用户管理_角色列表_4_Menu")
-    @ResourceAuth(value = "orgRoleManager", type = AuthType.BusinessMain, remark = "用户管理_角色列表_4_Menu")
-    @ResourceAuth(value = "orgRoleManager", type = AuthType.CommonOrg, remark = "用户管理_角色列表_4_Menu")
+    @ResourceAuth(value = "projectPayReconManager", type = AuthType.Project, remark = "资金管理_对账单_53_Menu")
+    @ResourceAuth(value = "projectPayReconManager", type = AuthType.School, remark = "资金管理_对账单_53_Menu")
+    @ResourceAuth(value = "projectPayReconManager", type = AuthType.BusinessMain, remark = "资金管理_对账单_53_Menu")
+    @ResourceAuth(value = "projectPayReconManager", type = AuthType.CommonOrg, remark = "资金管理_对账单_53_Menu")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.BusinessMain, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.CommonOrg, remark = "")
     @ResourceAuth(value = "user", type = AuthType.User)
-    @RequestMapping(value = "orgRoleManager", method = {RequestMethod.GET})
-    public ResultContent orgRoleManager() {
+    @RequestMapping(value = "projectPayReconManager", method = {RequestMethod.GET})
+    public ResultContent projectPayReconManager() {
         return ResultContent.buildSuccess();
     }
 
-    @ResourceAuth(value = "orgCardManager", type = AuthType.Project, remark = "卡片管理_卡片列表_1_Menu")
-    @ResourceAuth(value = "orgCardManager", type = AuthType.School, remark = "卡片管理_卡片列表_1_Menu")
-    @ResourceAuth(value = "orgCardManager", type = AuthType.BusinessMain, remark = "卡片管理_卡片列表_1_Menu")
-    @ResourceAuth(value = "orgCardManager", type = AuthType.CommonOrg, remark = "卡片管理_卡片列表_1_Menu")
+    @ResourceAuth(value = "projectAreaManager", type = AuthType.Project, remark = "区域管理_区域列表_60_Menu")
+    @ResourceAuth(value = "projectAreaManager", type = AuthType.School, remark = "区域管理_区域列表_60_Menu")
+    @ResourceAuth(value = "projectAreaManager", type = AuthType.BusinessMain, remark = "区域管理_区域列表_60_Menu")
+    @ResourceAuth(value = "projectAreaManager", type = AuthType.CommonOrg, remark = "区域管理_区域列表_60_Menu")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.BusinessMain, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.CommonOrg, remark = "")
     @ResourceAuth(value = "user", type = AuthType.User)
-    @RequestMapping(value = "orgCardManager", method = {RequestMethod.GET})
-    public ResultContent orgCardManager() {
+    @RequestMapping(value = "projectAreaManager", method = {RequestMethod.GET})
+    public ResultContent projectAreaManager() {
         return ResultContent.buildSuccess();
     }
 
-    @ResourceAuth(value = "orgCardPoolManager", type = AuthType.Project, remark = "卡片管理_卡片资源库_2_Menu")
-    @ResourceAuth(value = "orgCardPoolManager", type = AuthType.School, remark = "卡片管理_卡片资源库_2_Menu")
-    @ResourceAuth(value = "orgCardPoolManager", type = AuthType.BusinessMain, remark = "卡片管理_卡片资源库_2_Menu")
-    @ResourceAuth(value = "orgCardPoolManager", type = AuthType.CommonOrg, remark = "卡片管理_卡片资源库_2_Menu")
+    @ResourceAuth(value = "projectAreaTypeManager", type = AuthType.Project, remark = "区域管理_区域类型_61_Menu")
+    @ResourceAuth(value = "projectAreaTypeManager", type = AuthType.School, remark = "区域管理_区域类型_61_Menu")
+    @ResourceAuth(value = "projectAreaTypeManager", type = AuthType.BusinessMain, remark = "区域管理_区域类型_61_Menu")
+    @ResourceAuth(value = "projectAreaTypeManager", type = AuthType.CommonOrg, remark = "区域管理_区域类型_61_Menu")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.BusinessMain, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.CommonOrg, remark = "")
     @ResourceAuth(value = "user", type = AuthType.User)
-    @RequestMapping(value = "orgCardPoolManager", method = {RequestMethod.GET})
-    public ResultContent orgCardPoolManager() {
+    @RequestMapping(value = "projectAreaTypeManager", method = {RequestMethod.GET})
+    public ResultContent projectAreaTypeManager() {
         return ResultContent.buildSuccess();
     }
 
-    @ResourceAuth(value = "orgDeviceManager", type = AuthType.Project, remark = "设备管理_设备列表_1_Menu")
-    @ResourceAuth(value = "orgDeviceManager", type = AuthType.School, remark = "设备管理_设备列表_1_Menu")
-    @ResourceAuth(value = "orgDeviceManager", type = AuthType.BusinessMain, remark = "设备管理_设备列表_1_Menu")
-    @ResourceAuth(value = "orgDeviceManager", type = AuthType.CommonOrg, remark = "设备管理_设备列表_1_Menu")
+    @ResourceAuth(value = "projectOpenAPIManager", type = AuthType.Project, remark = "OpenAPI_应用管理_70_Menu")
+    @ResourceAuth(value = "projectOpenAPIManager", type = AuthType.School, remark = "OpenAPI_应用管理_70_Menu")
+    @ResourceAuth(value = "projectOpenAPIManager", type = AuthType.BusinessMain, remark = "OpenAPI_应用管理_70_Menu")
+    @ResourceAuth(value = "projectOpenAPIManager", type = AuthType.CommonOrg, remark = "OpenAPI_应用管理_70_Menu")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.BusinessMain, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.CommonOrg, remark = "")
     @ResourceAuth(value = "user", type = AuthType.User)
-    @RequestMapping(value = "orgDeviceManager", method = {RequestMethod.GET})
-    public ResultContent orgDeviceManager() {
+    @RequestMapping(value = "projectOpenAPIManager", method = {RequestMethod.GET})
+    public ResultContent projectOpenAPIManager() {
         return ResultContent.buildSuccess();
     }
 
-    @ResourceAuth(value = "orgDeviceGroupManager", type = AuthType.Project, remark = "设备管理_设备分组_2_Menu")
-    @ResourceAuth(value = "orgDeviceGroupManager", type = AuthType.School, remark = "设备管理_设备分组_2_Menu")
-    @ResourceAuth(value = "orgDeviceGroupManager", type = AuthType.BusinessMain, remark = "设备管理_设备分组_2_Menu")
-    @ResourceAuth(value = "orgDeviceGroupManager", type = AuthType.CommonOrg, remark = "设备管理_设备分组_2_Menu")
+    @ResourceAuth(value = "projectOpenAPILogManager", type = AuthType.Project, remark = "OpenAPI_日志管理_71_Menu")
+    @ResourceAuth(value = "projectOpenAPILogManager", type = AuthType.School, remark = "OpenAPI_日志管理_71_Menu")
+    @ResourceAuth(value = "projectOpenAPILogManager", type = AuthType.BusinessMain, remark = "OpenAPI_日志管理_71_Menu")
+    @ResourceAuth(value = "projectOpenAPILogManager", type = AuthType.CommonOrg, remark = "OpenAPI_日志管理_71_Menu")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.BusinessMain, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.CommonOrg, remark = "")
     @ResourceAuth(value = "user", type = AuthType.User)
-    @RequestMapping(value = "orgDeviceGroupManager", method = {RequestMethod.GET})
-    public ResultContent orgDeviceGroupManager() {
+    @RequestMapping(value = "projectOpenAPILogManager", method = {RequestMethod.GET})
+    public ResultContent projectOpenAPILogManager() {
         return ResultContent.buildSuccess();
     }
 
-    @ResourceAuth(value = "orgDevicePermissManager", type = AuthType.Project, remark = "设备管理_设备权限_3_Menu")
-    @ResourceAuth(value = "orgDevicePermissManager", type = AuthType.School, remark = "设备管理_设备权限_3_Menu")
-    @ResourceAuth(value = "orgDevicePermissManager", type = AuthType.BusinessMain, remark = "设备管理_设备权限_3_Menu")
-    @ResourceAuth(value = "orgDevicePermissManager", type = AuthType.CommonOrg, remark = "设备管理_设备权限_3_Menu")
+    @ResourceAuth(value = "projectConfigBaseManager", type = AuthType.Project, remark = "项目配置_基本信息_80_Menu")
+    @ResourceAuth(value = "projectConfigBaseManager", type = AuthType.School, remark = "项目配置_基本信息_80_Menu")
+    @ResourceAuth(value = "projectConfigBaseManager", type = AuthType.BusinessMain, remark = "项目配置_基本信息_80_Menu")
+    @ResourceAuth(value = "projectConfigBaseManager", type = AuthType.CommonOrg, remark = "项目配置_基本信息_80_Menu")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.BusinessMain, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.CommonOrg, remark = "")
     @ResourceAuth(value = "user", type = AuthType.User)
-    @RequestMapping(value = "orgDevicePermissManager", method = {RequestMethod.GET})
-    public ResultContent orgDevicePermissManager() {
+    @RequestMapping(value = "projectConfigBaseManager", method = {RequestMethod.GET})
+    public ResultContent projectConfigBaseManager() {
         return ResultContent.buildSuccess();
     }
 
-    @ResourceAuth(value = "orgFundManager", type = AuthType.Project, remark = "资金管理_资金概况_1_Menu")
-    @ResourceAuth(value = "orgFundManager", type = AuthType.School, remark = "资金管理_资金概况_1_Menu")
-    @ResourceAuth(value = "orgFundManager", type = AuthType.BusinessMain, remark = "资金管理_资金概况_1_Menu")
-    @ResourceAuth(value = "orgFundManager", type = AuthType.CommonOrg, remark = "资金管理_资金概况_1_Menu")
+    @ResourceAuth(value = "projectConfigPayManager", type = AuthType.Project, remark = "项目配置_支付配置_81_Menu")
+    @ResourceAuth(value = "projectConfigPayManager", type = AuthType.School, remark = "项目配置_支付配置_81_Menu")
+    @ResourceAuth(value = "projectConfigPayManager", type = AuthType.BusinessMain, remark = "项目配置_支付配置_81_Menu")
+    @ResourceAuth(value = "projectConfigPayManager", type = AuthType.CommonOrg, remark = "项目配置_支付配置_81_Menu")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.BusinessMain, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.CommonOrg, remark = "")
     @ResourceAuth(value = "user", type = AuthType.User)
-    @RequestMapping(value = "orgFundManager", method = {RequestMethod.GET})
-    public ResultContent orgFundManager() {
+    @RequestMapping(value = "projectConfigPayManager", method = {RequestMethod.GET})
+    public ResultContent projectConfigPayManager() {
         return ResultContent.buildSuccess();
     }
 
-    @ResourceAuth(value = "orgFundOrderManager", type = AuthType.Project, remark = "资金管理_支付订单_2_Menu")
-    @ResourceAuth(value = "orgFundOrderManager", type = AuthType.School, remark = "资金管理_支付订单_2_Menu")
-    @ResourceAuth(value = "orgFundOrderManager", type = AuthType.BusinessMain, remark = "资金管理_支付订单_2_Menu")
-    @ResourceAuth(value = "orgFundOrderManager", type = AuthType.CommonOrg, remark = "资金管理_支付订单_2_Menu")
+    @ResourceAuth(value = "projectConfigXcxManager", type = AuthType.Project, remark = "项目配置_小程序配置_82_Menu")
+    @ResourceAuth(value = "projectConfigXcxManager", type = AuthType.School, remark = "项目配置_小程序配置_82_Menu")
+    @ResourceAuth(value = "projectConfigXcxManager", type = AuthType.BusinessMain, remark = "项目配置_小程序配置_82_Menu")
+    @ResourceAuth(value = "projectConfigXcxManager", type = AuthType.CommonOrg, remark = "项目配置_小程序配置_82_Menu")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.BusinessMain, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.CommonOrg, remark = "")
     @ResourceAuth(value = "user", type = AuthType.User)
-    @RequestMapping(value = "orgFundOrderManager", method = {RequestMethod.GET})
-    public ResultContent orgFundOrderManager() {
+    @RequestMapping(value = "projectConfigXcxManager", method = {RequestMethod.GET})
+    public ResultContent projectConfigXcxManager() {
         return ResultContent.buildSuccess();
     }
 
-
-    @ResourceAuth(value = "orgFundSeparateManager", type = AuthType.Project, remark = "资金管理_分账单_3_Menu")
-    @ResourceAuth(value = "orgFundSeparateManager", type = AuthType.School, remark = "资金管理_分账单_3_Menu")
-    @ResourceAuth(value = "orgFundSeparateManager", type = AuthType.BusinessMain, remark = "资金管理_分账单_3_Menu")
-    @ResourceAuth(value = "orgFundSeparateManager", type = AuthType.CommonOrg, remark = "资金管理_分账单_3_Menu")
+    @ResourceAuth(value = "projectConfigAccessKeyManager", type = AuthType.Project, remark = "项目配置_AccessKey_83_Menu")
+    @ResourceAuth(value = "projectConfigAccessKeyManager", type = AuthType.School, remark = "项目配置_AccessKey_83_Menu")
+    @ResourceAuth(value = "projectConfigAccessKeyManager", type = AuthType.BusinessMain, remark = "项目配置_AccessKey_83_Menu")
+    @ResourceAuth(value = "projectConfigAccessKeyManager", type = AuthType.CommonOrg, remark = "项目配置_AccessKey_83_Menu")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.BusinessMain, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.CommonOrg, remark = "")
     @ResourceAuth(value = "user", type = AuthType.User)
-    @RequestMapping(value = "orgFundSeparateManager", method = {RequestMethod.GET})
-    public ResultContent orgFundSeparateManager() {
+    @RequestMapping(value = "projectConfigAccessKeyManager", method = {RequestMethod.GET})
+    public ResultContent projectConfigAccessKeyManager() {
         return ResultContent.buildSuccess();
     }
 
-
-    @ResourceAuth(value = "orgFundReconciliationManager", type = AuthType.Project, remark = "资金管理_对账单_4_Menu")
-    @ResourceAuth(value = "orgFundReconciliationManager", type = AuthType.School, remark = "资金管理_对账单_4_Menu")
-    @ResourceAuth(value = "orgFundReconciliationManager", type = AuthType.BusinessMain, remark = "资金管理_对账单_4_Menu")
-    @ResourceAuth(value = "orgFundReconciliationManager", type = AuthType.CommonOrg, remark = "资金管理_对账单_4_Menu")
+    @ResourceAuth(value = "projectConfigCommonManager", type = AuthType.Project, remark = "项目配置_通用配置_84_Menu")
+    @ResourceAuth(value = "projectConfigCommonManager", type = AuthType.School, remark = "项目配置_通用配置_84_Menu")
+    @ResourceAuth(value = "projectConfigCommonManager", type = AuthType.BusinessMain, remark = "项目配置_通用配置_84_Menu")
+    @ResourceAuth(value = "projectConfigCommonManager", type = AuthType.CommonOrg, remark = "项目配置_通用配置_84_Menu")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.BusinessMain, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.CommonOrg, remark = "")
     @ResourceAuth(value = "user", type = AuthType.User)
-    @RequestMapping(value = "orgFundReconciliationManager", method = {RequestMethod.GET})
-    public ResultContent orgFundReconciliationManager() {
-        return ResultContent.buildSuccess();
-    }
-
-
-    @ResourceAuth(value = "openapi", type = AuthType.Project, remark = "OpenAPI权限_OpenAPI调用_1_Menu")
-    @ResourceAuth(value = "openapi", type = AuthType.School, remark = "OpenAPI权限_OpenAPI调用_1_Menu")
-    @ResourceAuth(value = "openapi", type = AuthType.BusinessMain, remark = "OpenAPI权限_OpenAPI调用_1_Menu")
-    @ResourceAuth(value = "openapi", type = AuthType.CommonOrg, remark = "OpenAPI权限_OpenAPI调用_1_Menu")
-//    @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
-//    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
-//    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
-//    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.BusinessMain, remark = "")
-//    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.CommonOrg, remark = "")
-    @ResourceAuth(value = "user", type = AuthType.User)
-    @RequestMapping(value = "openapi", method = {RequestMethod.GET})
-    public ResultContent openapi() {
+    @RequestMapping(value = "projectConfigCommonManager", method = {RequestMethod.GET})
+    public ResultContent projectConfigCommonManager() {
         return ResultContent.buildSuccess();
     }
 

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/payment/PayCallService.java

@@ -654,6 +654,7 @@ public class PayCallService extends SuperService {
      * @param orderNoSet
      */
     private void markOrderSettlement(Set<String> orderNoSet) {
+        log.info("orderNoSet: {}", orderNoSet);
         if (orderNoSet != null && !orderNoSet.isEmpty()) {
             List<String> orderNoList = new ArrayList<>(orderNoSet);
             Map<String, Object> where = new HashMap<>();