Merge remote-tracking branch 'origin/master'

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/org/TestController.java

@@ -5,6 +5,7 @@ import com.github.microservice.net.ResultContent;
 import com.zhongshu.card.server.core.service.TestService;
 import com.zhongshu.card.server.core.service.devices.DeviceInfoServiceImpl;
 import com.zhongshu.card.server.core.service.openAPI.OpenAPIRegisterService;
+import com.zhongshu.card.server.core.service.payment.PayCallService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
@@ -13,8 +14,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
-import java.util.Collections;
+import java.util.*;
 
 @Slf4j
 @RestController
@@ -31,15 +31,16 @@ public class TestController {
     @Autowired
     DeviceInfoServiceImpl deviceInfoService;
 
+    @Autowired
+    private PayCallService payCallService;
+
     @Operation(summary = "测试接口", description = "测试接口")
     @RequestMapping(value = "text", method = {RequestMethod.GET})
     public ResultContent text() {
 //        openAPIRegisterService.initRegisterPAIS();
         try {
-            byte[] bins = BytesUtil.longToBin(Long.parseLong("2152525002"), 4);
-//            var ret = reverse(bins);
-            String str = BytesUtil.binToHex(bins);
-            log.info("str; {}", str.toUpperCase());
+            Set<String> set = new HashSet<>(List.of("P202411191422212690001"));
+            payCallService.markOrderSettlement(set);
         } catch (Exception e) {
             e.printStackTrace();
         }

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/orgManager/AreaTypeManagerController.java

@@ -37,18 +37,20 @@ public class AreaTypeManagerController {
     @Autowired
     DictInfoService dictInfoService;
 
-    @ResourceAuth(value = "areaTypeList", type = AuthType.Platform, remark = "区域管理_类型列表_2_Menu")
-    @ResourceAuth(value = "areaTypeList", type = AuthType.Project, remark = "区域管理_类型列表_2_Menu")
-    @ResourceAuth(value = "areaTypeList", type = AuthType.School, remark = "区域管理_类型列表_2_Menu")
+    @ResourceAuth(value = "areaTypeList", type = AuthType.Platform, remark = "区域管理_区域类型_161_Menu")
+    @ResourceAuth(value = "areaTypeList", type = AuthType.Project, remark = "区域管理_区域类型_161_Menu")
+    @ResourceAuth(value = "areaTypeList", type = AuthType.School, remark = "区域管理_区域类型_161_Menu")
+    @ResourceAuth(value = "areaTypeList", type = AuthType.BusinessMain, remark = "区域管理_区域类型_161_Menu")
+    @ResourceAuth(value = "areaTypeList", type = AuthType.CommonOrg, remark = "区域管理_区域类型_161_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)
     @Operation(summary = "区域类型区域类型列表-分页查询", description = "人员区域类型列表-分页查询")
     @RequestMapping(value = {"areaTypePageManager"}, method = {RequestMethod.POST})
-    public ResultContent<Page<DictInfoParam>> areaTypePageManager(
-            @Parameter(hidden = true) @PageableDefault(page = 0, size = 10) Pageable pageable,
-            @Parameter(required = false) DictInfoSearch param) {
+    public ResultContent<Page<DictInfoParam>> areaTypePageManager(@Parameter(hidden = true) @PageableDefault(page = 0, size = 10) Pageable pageable, @Parameter(required = false) DictInfoSearch param) {
         param.setDictInfoType(DictInfoType.AreaType);
         return dictInfoService.page(param, pageable);
     }
@@ -78,8 +80,7 @@ public class AreaTypeManagerController {
     @ResourceAuth(value = "user", type = AuthType.User)
     @Operation(summary = "查询区域类型所有的数据", description = "查询区域类型所有的数据")
     @RequestMapping(value = {"findAreaTypeByOid"}, method = {RequestMethod.POST})
-    public ResultContent<List<DictInfoParam>> findAreaTypeByOid(
-            @Parameter(required = false) DictInfoSearch param) {
+    public ResultContent<List<DictInfoParam>> findAreaTypeByOid(@Parameter(required = false) DictInfoSearch param) {
         param.setDictInfoType(DictInfoType.AreaType);
         return dictInfoService.findDictInfosByOid(param);
     }

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/school/DictInfoController.java

@@ -36,18 +36,20 @@ public class DictInfoController {
     @Autowired
     DictInfoService dictInfoService;
 
-    @ResourceAuth(value = "areaManager", type = AuthType.Platform, remark = "区域类型_区域类型列表_1_Menu")
-    @ResourceAuth(value = "areaManager", type = AuthType.Project, remark = "区域类型_区域类型列表_1_Menu")
-    @ResourceAuth(value = "areaManager", type = AuthType.School, remark = "区域类型_区域类型列表_1_Menu")
+    @ResourceAuth(value = "areaPageManager", type = AuthType.Platform, remark = "区域管理_区域列表_160_Menu")
+    @ResourceAuth(value = "areaPageManager", type = AuthType.Project, remark = "区域管理_区域列表_160_Menu")
+    @ResourceAuth(value = "areaPageManager", type = AuthType.School, remark = "区域管理_区域列表_160_Menu")
+    @ResourceAuth(value = "areaPageManager", type = AuthType.BusinessMain, remark = "区域管理_区域列表_160_Menu")
+    @ResourceAuth(value = "areaPageManager", type = AuthType.CommonOrg, remark = "区域管理_区域列表_160_Menu")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.BusinessMain, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.CommonOrg, remark = "")
     @ResourceAuth(value = "user", type = AuthType.User)
     @Operation(summary = "区域列表-分页查询", description = "区域列表-分页查询")
     @RequestMapping(value = {"areaPageManager"}, method = {RequestMethod.POST})
-    public ResultContent<Page<DictInfoParam>> areaPageManager(
-            @Parameter(hidden = true) @PageableDefault(page = 0, size = 10) Pageable pageable,
-            @Parameter(required = false) DictInfoSearch param) {
+    public ResultContent<Page<DictInfoParam>> areaPageManager(@Parameter(hidden = true) @PageableDefault(page = 0, size = 10) Pageable pageable, @Parameter(required = false) DictInfoSearch param) {
         param.setDictInfoType(DictInfoType.AreaType);
         return dictInfoService.page(param, pageable);
     }
@@ -55,9 +57,7 @@ public class DictInfoController {
     @ResourceAuth(value = "user", type = AuthType.User)
     @Operation(summary = "字典列表-分页查询", description = "字典列表-分页查询")
     @RequestMapping(value = {"page"}, method = {RequestMethod.POST})
-    public ResultContent<Page<DictInfoParam>> page(
-            @Parameter(hidden = true) @PageableDefault(page = 0, size = 10) Pageable pageable,
-            @Parameter(required = false) DictInfoSearch param) {
+    public ResultContent<Page<DictInfoParam>> page(@Parameter(hidden = true) @PageableDefault(page = 0, size = 10) Pageable pageable, @Parameter(required = false) DictInfoSearch param) {
         return dictInfoService.page(param, pageable);
     }
 
@@ -85,8 +85,7 @@ public class DictInfoController {
     @ResourceAuth(value = "user", type = AuthType.User)
     @Operation(summary = "查询字典所有的数据", description = "查询字典所有的数据")
     @RequestMapping(value = {"findDictInfosByOid"}, method = {RequestMethod.POST})
-    public ResultContent<List<DictInfoParam>> findDictInfosByOid(
-            @Parameter(required = false) DictInfoSearch param) {
+    public ResultContent<List<DictInfoParam>> findDictInfosByOid(@Parameter(required = false) DictInfoSearch param) {
         return dictInfoService.findDictInfosByOid(param);
     }
 

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

@@ -215,35 +215,37 @@ public class OrgMenuController {
         return ResultContent.buildSuccess();
     }
 
-    @ResourceAuth(value = "projectAreaManager", type = AuthType.Project, remark = "区域管理_区域列表_160_Menu")
-    @ResourceAuth(value = "projectAreaManager", type = AuthType.School, remark = "区域管理_区域列表_160_Menu")
-    @ResourceAuth(value = "projectAreaManager", type = AuthType.BusinessMain, remark = "区域管理_区域列表_160_Menu")
-    @ResourceAuth(value = "projectAreaManager", type = AuthType.CommonOrg, remark = "区域管理_区域列表_160_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 = "projectAreaManager", method = {RequestMethod.GET})
-    public ResultContent projectAreaManager() {
-        return ResultContent.buildSuccess();
-    }
+    // 使用
+//    @ResourceAuth(value = "projectAreaManager", type = AuthType.Project, remark = "区域管理_区域列表_160_Menu")
+//    @ResourceAuth(value = "projectAreaManager", type = AuthType.School, remark = "区域管理_区域列表_160_Menu")
+//    @ResourceAuth(value = "projectAreaManager", type = AuthType.BusinessMain, remark = "区域管理_区域列表_160_Menu")
+//    @ResourceAuth(value = "projectAreaManager", type = AuthType.CommonOrg, remark = "区域管理_区域列表_160_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 = "projectAreaManager", method = {RequestMethod.GET})
+//    public ResultContent projectAreaManager() {
+//        return ResultContent.buildSuccess();
+//    }
 
-    @ResourceAuth(value = "projectAreaTypeManager", type = AuthType.Project, remark = "区域管理_区域类型_161_Menu")
-    @ResourceAuth(value = "projectAreaTypeManager", type = AuthType.School, remark = "区域管理_区域类型_161_Menu")
-    @ResourceAuth(value = "projectAreaTypeManager", type = AuthType.BusinessMain, remark = "区域管理_区域类型_161_Menu")
-    @ResourceAuth(value = "projectAreaTypeManager", type = AuthType.CommonOrg, remark = "区域管理_区域类型_161_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 = "projectAreaTypeManager", method = {RequestMethod.GET})
-    public ResultContent projectAreaTypeManager() {
-        return ResultContent.buildSuccess();
-    }
+    // 使用
+//    @ResourceAuth(value = "projectAreaTypeManager", type = AuthType.Project, remark = "区域管理_区域类型_161_Menu")
+//    @ResourceAuth(value = "projectAreaTypeManager", type = AuthType.School, remark = "区域管理_区域类型_161_Menu")
+//    @ResourceAuth(value = "projectAreaTypeManager", type = AuthType.BusinessMain, remark = "区域管理_区域类型_161_Menu")
+//    @ResourceAuth(value = "projectAreaTypeManager", type = AuthType.CommonOrg, remark = "区域管理_区域类型_161_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 = "projectAreaTypeManager", method = {RequestMethod.GET})
+//    public ResultContent projectAreaTypeManager() {
+//        return ResultContent.buildSuccess();
+//    }
 
     @ResourceAuth(value = "projectOpenAPIManager", type = AuthType.Project, remark = "OpenAPI_应用管理_170_Menu")
     @ResourceAuth(value = "projectOpenAPIManager", type = AuthType.School, remark = "OpenAPI_应用管理_170_Menu")

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/base/CommonService.java

@@ -69,7 +69,8 @@ public class CommonService {
         if (where != null) {
             where.forEach((key, value) -> {
                 if (value != null && value instanceof List<?>) {
-                    criteria.and(key).in(value);
+                    List<Object> _temp = (List<Object>) value;
+                    criteria.and(key).in(_temp);
                 } else {
                     criteria.and(key).is(value);
                 }

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

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