更新！

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/openAPI/DevicePermissOpenApiController.java

@@ -1,7 +1,5 @@
 package com.zhongshu.card.server.core.controller.openAPI;
 
-import com.github.microservice.auth.security.annotations.ResourceAuth;
-import com.github.microservice.auth.security.type.AuthType;
 import com.github.microservice.net.ResultContent;
 import com.zhongshu.card.client.openApi.model.DeviceInfoOpenApiModel;
 import com.zhongshu.card.client.openApi.model.DevicePermissOpenApiModel;
@@ -31,56 +29,48 @@ public class DevicePermissOpenApiController {
     @Autowired
     private DevicePermissOpenApiService devicePermissOpenApiService;
 
-    @ResourceAuth(value = "user", type = AuthType.User)
     @Operation(summary = "设备列表-分页查询", description = "设备列表-分页查询")
     @RequestMapping(value = {"page"}, method = {RequestMethod.POST})
     public ResultContent<Page<DeviceInfoOpenApiModel>> page(@RequestBody DeviceInfoOpenApiSearch param) {
         return devicePermissOpenApiService.page(param);
     }
 
-    @ResourceAuth(value = "user", type = AuthType.User)
     @Operation(summary = "设备详情--根据设备ID查询", description = "设备详情-根据设备ID查询")
     @RequestMapping(value = {"getDetailByDeviceId"}, method = {RequestMethod.POST})
     public ResultContent<DeviceInfoOpenApiModel> getDetailByDeviceId(@RequestBody DeviceIdParam param) {
         return devicePermissOpenApiService.getDetailByDeviceId(param);
     }
 
-    @ResourceAuth(value = "user", type = AuthType.User)
     @Operation(summary = "查询设备的权限", description = "查询设备的权限")
     @RequestMapping(value = {"getDevicePermissByDeviceId"}, method = {RequestMethod.POST})
     public ResultContent<List<DevicePermissOpenApiModel>> getDevicePermissByDeviceId(@RequestBody DeviceIdAndProjectCodeParam param) {
         return devicePermissOpenApiService.getDevicePermissByDeviceId(param);
     }
 
-    @ResourceAuth(value = "user", type = AuthType.User)
     @Operation(summary = "查询用户的设备权限", description = "查询用户的设备权限")
     @RequestMapping(value = {"getDevicePermissByUserId"}, method = {RequestMethod.POST})
     public ResultContent<List<DevicePermissOpenApiModel>> getDevicePermissByUserId(@RequestBody UserOpenApiParam param) {
         return devicePermissOpenApiService.getDevicePermissByUserId(param);
     }
 
-    @ResourceAuth(value = "user", type = AuthType.User)
     @Operation(summary = "启用权限", description = "启用权限")
     @RequestMapping(value = {"enablePermiss"}, method = {RequestMethod.POST})
     public ResultContent enablePermiss(@RequestBody PermissChangeOpenApiParam param) {
         return devicePermissOpenApiService.changePermissState(param, DataState.Enable);
     }
 
-    @ResourceAuth(value = "user", type = AuthType.User)
     @Operation(summary = "禁用权限", description = "禁用权限")
     @RequestMapping(value = {"disablePermiss"}, method = {RequestMethod.POST})
     public ResultContent disablePermiss(@RequestBody PermissChangeOpenApiParam param) {
         return devicePermissOpenApiService.changePermissState(param, DataState.Disable);
     }
 
-    @ResourceAuth(value = "user", type = AuthType.User)
     @Operation(summary = "移除设备权限", description = "移除设备权限")
     @RequestMapping(value = {"deletePermiss"}, method = {RequestMethod.POST})
     public ResultContent deletePermiss(@RequestBody PermissChangeOpenApiParam param) {
         return devicePermissOpenApiService.deletePermiss(param);
     }
 
-    @ResourceAuth(value = "user", type = AuthType.User)
     @Operation(summary = "添加用户设备权限", description = "添加用户设备权限")
     @RequestMapping(value = {"addPermiss"}, method = {RequestMethod.POST})
     public ResultContent addPermiss(@RequestBody PermissChangeOpenApiParam param) {

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/openAPI/ExpenseFlowOpenApiController.java

@@ -40,21 +40,18 @@ public class ExpenseFlowOpenApiController {
     @Autowired
     private ExpenseFlowOpenApiService expenseFlowOpenApiService;
 
-    @ResourceAuth(value = "user", type = AuthType.User)
     @Operation(summary = "订单列表-分页查询", description = "订单列表-分页查询")
     @RequestMapping(value = {"page"}, method = {RequestMethod.POST})
     public ResultContent<Page<ExpenseFlowOpenApiModel>> page(@RequestBody ExpenseFlowOpenApiSearch param) {
         return expenseFlowOpenApiService.page(param);
     }
 
-    @ResourceAuth(value = "user", type = AuthType.User)
     @Operation(summary = "订单详情", description = "订单详情")
     @RequestMapping(value = {"getDetailByPaymentNo"}, method = {RequestMethod.POST})
     public ResultContent<ExpenseFlowOpenApiModel> getDetailByPaymentNo(@RequestBody PaymentNoParam param) {
         return expenseFlowOpenApiService.getDetailByPaymentNo(param);
     }
 
-    @ResourceAuth(value = "user", type = AuthType.User)
     @Operation(summary = "关闭订单", description = "关闭订单")
     @RequestMapping(value = {"closeOrder"}, method = {RequestMethod.POST})
     public ResultContent<ExpenseFlowOpenApiModel> closeOrder(@RequestBody PaymentNoParam param) {

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/openAPI/OrganizationUserOpenApiController.java

@@ -28,14 +28,12 @@ public class OrganizationUserOpenApiController {
     @Autowired
     private OrganizationUserOpenApiService organizationUserOpenApiService;
 
-    @ResourceAuth(value = "user", type = AuthType.User)
     @Operation(summary = "项目用户列表-分页查询", description = "项目用户列表-分页查询")
     @RequestMapping(value = {"page"}, method = {RequestMethod.POST})
     public ResultContent<Page<OrganizationUserOpenApiModel>> page(@RequestBody OrganizationUserOpenApiSearch param) {
         return organizationUserOpenApiService.projectUserPage(param);
     }
 
-    @ResourceAuth(value = "user", type = AuthType.User)
     @Operation(summary = "用户详情", description = "用户详情")
     @RequestMapping(value = {"getUserDetailById"}, method = {RequestMethod.POST})
     public ResultContent<OrganizationUserOpenApiModel> getUserDetailById(@RequestBody IDParam param) {

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

@@ -37,10 +37,8 @@ public class TestController {
     @Operation(summary = "测试接口", description = "测试接口")
     @RequestMapping(value = "text", method = {RequestMethod.GET})
     public ResultContent text() {
-//        openAPIRegisterService.initRegisterPAIS();
+        openAPIRegisterService.initRegisterPAIS();
         try {
-            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/service/openAPI/OpenAPIRegisterService.java

@@ -8,6 +8,7 @@ import com.zhongshu.opengateway.client.type.ApiType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
@@ -39,7 +40,6 @@ public class OpenAPIRegisterService {
         param.setOpenApiInfo(openAPIS);
         param.setApiType(ApiType.FullCard.name());
         param.setApiDocs(OpenAPIScan.filterOpenApi(str, sign));
-
         ResultContent content = restTemplate.postForObject("http://openapiserver/manager/gateway/api/refresh", param, ResultContent.class);
         if (content == null) {
             content = ResultContent.buildSuccess();

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

@@ -580,6 +580,10 @@ public class PayCallService extends SuperService {
                 entity.setRefundState(RefundState.Refunded);
                 entity.setRefuseRemark("退款成功");
                 entity.setOrderType(OrderState.REFUNDED);
+                if (model.getTransactionLogModelList() != null) {
+                    entity.setRefundTransactionIds(model.getTransactionLogModelList().getContent());
+                    refundRecord.setRefundTransactionIds(model.getTransactionLogModelList().getContent());
+                }
 
                 refundRecord.setRefuseRemark("退款成功");
                 refundRecord.setRefundState(RefundState.Refunded);