机构类型

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

@@ -82,7 +82,7 @@ public class OrganizationController {
     @Operation(summary = "学校-添加", description = "学校-添加")
     @RequestMapping(value = "addSchool", method = {RequestMethod.POST})
     public ResultContent addSchool(@RequestBody SchoolAddParam param) {
-        param.setAuthType(AuthType.Project);
+        param.setAuthType(AuthType.School);
         return this.organizationService.addSchool(param);
     }
 
@@ -116,7 +116,7 @@ public class OrganizationController {
     @RequestMapping(value = {"getUsableShop"}, method = {RequestMethod.POST})
     public ResultContent<List<OrganizationSimpleModel>> getUsableShop(
             @Parameter(required = false) OrganizationSearchParam param) {
-        param.setAuthType(AuthType.Shop);
+        param.setAuthType(AuthType.BusinessMain);
         return organizationService.list(param);
     }
 
@@ -129,7 +129,7 @@ public class OrganizationController {
     @Operation(summary = "商户-添加", description = "商户-添加")
     @RequestMapping(value = "addShop", method = {RequestMethod.POST})
     public ResultContent addShop(@RequestBody OrganizationAddParam param) {
-        param.setAuthType(AuthType.Shop);
+        param.setAuthType(AuthType.BusinessMain);
         return this.organizationService.addOrganization(param);
     }
 
@@ -147,7 +147,7 @@ public class OrganizationController {
     public ResultContent<Page<OrganizationModel>> pageShop(
             @Parameter(hidden = true) @PageableDefault(page = 0, size = 10) Pageable pageable,
             @Parameter(required = false) OrganizationSearchParam param) {
-        param.setAuthType(AuthType.Shop);
+        param.setAuthType(AuthType.BusinessMain);
         return organizationService.page(param, pageable);
     }
     //------------------------------商户管理 end------------------------

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

@@ -116,7 +116,7 @@ public class UserInfoController {
     @RequestMapping(value = {"getUserShop"}, method = {RequestMethod.GET})
     public ResultContent<List<OrganizationModel>> getUserShop() {
         OrganizationUserSearch param = new OrganizationUserSearch();
-        param.setAuthType(AuthType.Shop);
+        param.setAuthType(AuthType.BusinessMain);
         param.setState(UserState.Normal);
         return organizationService.getUserOrgList(param);
     }

FullCardServer/src/main/java/com/zhongshu/card/server/core/model/upLoadFile/RemoteFile.java

@@ -4,6 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.apache.commons.lang3.ObjectUtils;
 
 import java.util.List;
 
@@ -20,13 +21,29 @@ public class RemoteFile {
     private String accountId;
 
     //文件路径
-    @Schema(description = "path", example = "[['other','文件.docx']]")
+    @Schema(description = "path", example = "['文件.docx']")
     private List<String> path;
 
+    public List<String> getPath() {
+        if (ObjectUtils.isNotEmpty(path)) {
+            return path;
+        }
+        return List.of(fileName);
+    }
+
     @Schema(description = "保留原名称")
     private Boolean isReserveName = Boolean.FALSE;
 
+    @Schema(description = "fileName 文件名称")
     private String fileName;
 
+    @Schema(description = "fileNames 文件列表")
     private List<String> fileNames;
+
+    public List<String> getFileNames() {
+        if (ObjectUtils.isNotEmpty(fileNames)) {
+            return fileNames;
+        }
+        return this.path;
+    }
 }

FullCardServer/src/main/java/com/zhongshu/card/server/core/model/upLoadFile/StsToken.java

@@ -1,10 +1,13 @@
 package com.zhongshu.card.server.core.model.upLoadFile;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Map;
 
@@ -29,4 +32,12 @@ public class StsToken {
     //端点
     private String endPoint;
 
+    @Schema(description = "文件url")
+    private String url;
+
+    public String getUrl() {
+        String path = String.join("/", Arrays.stream(new ArrayList<>(paths).get(0)).toList());
+        String url = String.format("//%s.%s.aliyuncs.com/%s", bucket, endPoint, path);
+        return url;
+    }
 }

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/org/IndexService.java

@@ -193,7 +193,7 @@ public class IndexService {
 //                return ResultContent.buildFail(String.format("用户未加入学校，登录失败：%s", phone));
 //            }
 //        } else if (param.getLoginFromType() == LoginFromType.Shop) {
-//            long number = organizationUserDao.countByUserAndStateAndAuthType(userAccount, UserState.Normal, AuthType.Shop);
+//            long number = organizationUserDao.countByUserAndStateAndAuthType(userAccount, UserState.Normal, AuthType.BusinessMain);
 //            if (number <= 0) {
 //                return ResultContent.buildFail(String.format("用户不属于任何商户，登录失败：%s", phone));
 //            }

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/org/OrganizationServiceImpl.java

@@ -114,7 +114,7 @@ public class OrganizationServiceImpl extends SuperService implements Organizatio
             return ResultContent.buildFail("机构类型错误");
         }
         String contactPhone = param.getContactPhone();
-        List<AuthType> authTypes = List.of(AuthType.School, AuthType.Shop, AuthType.Enterprise);
+        List<AuthType> authTypes = List.of(AuthType.School, AuthType.BusinessMain, AuthType.Enterprise);
         if (authTypes.contains(authType)) {
             Assert.hasText(contactPhone, "contactPhone 不能为空");
         }

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/org/RegionService.java

@@ -31,7 +31,6 @@ public class RegionService {
     }
 
     public ResultContent<List<ITree>> getAllTree() {
-        fixData();
         List<Region> list = regionDao.findAll(Sort.by(Sort.Order.asc("index")));
         List<ITree> models = list.parallelStream().map(this::toModel).collect(Collectors.toList());
         List<ITree> iTrees = TreeUtil.buildTree(models, ITree.ROOT_ID);