更新

FullCardClient/src/main/java/com/zhongshu/card/client/model/org/OrganizationAddParam.java

@@ -34,12 +34,12 @@ public class OrganizationAddParam extends SuperParam {
     @Schema(description = "logo")
     private String logo;
 
-    @Schema(description = "地址")
-    private String address;
-
     @Schema(description = " 行政区划编码,01,02,03")
     private String adminDivisionItemCode;
 
+    @Schema(description = "地址")
+    private String address;
+
     @Schema(description = "经度")
     private String mapLon;
 

FullCardClient/src/main/java/com/zhongshu/card/client/model/org/OrganizationModel.java

@@ -6,6 +6,8 @@ import com.zhongshu.card.client.utils.type.OrganizationState;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @author TRX
  * @date 2024/5/31
@@ -39,6 +41,9 @@ public class OrganizationModel extends SuperModel {
     @Schema(description = " 行政区划编码")
     private String adminDivisionItemCode;
 
+    @Schema(description = "地区列表")
+    private List<RegionModel> regionList;
+
     @Schema(description = "经度")
     private String mapLon;
 

FullCardClient/src/main/java/com/zhongshu/card/client/service/org/OrganizationService.java

@@ -17,15 +17,29 @@ import java.util.List;
 
 public interface OrganizationService {
 
+    /**
+     * 通用添加结构信息
+     *
+     * @param param
+     * @return
+     */
     public ResultContent addOrganization(OrganizationAddParam param);
 
+    /**
+     * 通用编辑机构
+     *
+     * @param param
+     * @return
+     */
+    public ResultContent update(OrganizationUpdateParam param);
+
     // 添加学校
     public ResultContent addSchool(SchoolAddParam param);
 
+    // 编辑学校
     ResultContent updateSchool(SchoolUpdateParam param);
 
-    public ResultContent update(OrganizationUpdateParam param);
-
+    // 查询结构详情
     public ResultContent<OrganizationModel> getDetail(String oid);
 
     public ResultContent deleteOrganization(String oid);

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

@@ -28,4 +28,5 @@ public class DepartmentController {
     }
 
 
+
 }

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

@@ -84,6 +84,36 @@ public class OrganizationController {
     }
     //------------------------------学校管理 end------------------------
 
+    //------------------------------商户管理 start----------------------
+
+    @ResourceAuth(value = "user",type = AuthType.User)
+    @ResourceAuth(value = AuthConstant.SuperAdmin,type = AuthType.Platform)
+    @Operation(summary = "商户-添加", description = "商户-添加")
+    @RequestMapping(value = "addShop", method = {RequestMethod.POST})
+    public ResultContent addShop(@RequestBody OrganizationAddParam param) {
+        param.setAuthType(AuthType.Shop);
+        return this.organizationService.addOrganization(param);
+    }
+
+    @ResourceAuth(value = "user",type = AuthType.User)
+    @Operation(summary = "商户-编辑", description = "商户-编辑")
+    @RequestMapping(value = "updateShop", method = {RequestMethod.POST})
+    public ResultContent updateShop(@RequestBody OrganizationUpdateParam param) {
+        Assert.hasText(param.getId(), "id不能为空");
+        return this.organizationService.update(param);
+    }
+
+    @ResourceAuth(value = "user",type = AuthType.User)
+    @Operation(summary = "商户列表-分页查询", description = "商户列表-分页查询")
+    @RequestMapping(value = {"pageShop"}, method = {RequestMethod.POST})
+    public ResultContent<Page<OrganizationModel>> pageShop(
+            @Parameter(hidden = true) @PageableDefault(page = 0, size = 10) Pageable pageable,
+            @Parameter(required = false) OrganizationSearchParam param) {
+        param.setAuthType(AuthType.Shop);
+        return organizationService.page(param, pageable);
+    }
+    //------------------------------商户管理 end------------------------
+
     @ResourceAuth(value = "user",type = AuthType.User)
     @ResourceAuth(value = AuthConstant.SuperAdmin,type = AuthType.Platform)
     @Operation(summary = "项目-学校-商家-删除", description = "项目-学校-商家-删除")

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/org/Organization.java

@@ -51,7 +51,7 @@ public class Organization extends SuperMain {
     @Schema(description = "地址")
     private String address;
 
-    @Schema(description = " 行政区划编码")
+    @Schema(description = " 行政区划编码 21,2104,210403")
     private String adminDivisionItemCode;
 
     @Schema(description = "经度")

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

@@ -96,6 +96,13 @@ public class OrganizationServiceImpl extends SuperService implements Organizatio
      */
     @Override
     public ResultContent<Organization> addOrganization(OrganizationAddParam param) {
+        if(StringUtils.isNotEmpty(param.getPassword())) {
+            // 验证密码是否符合格式
+            ValidateResult validateResult = ValidateUtils.validatePassWord(param.getPassword());
+            if (!validateResult.isSuccess()) {
+                return ResultContent.buildFail(validateResult.getMsg());
+            }
+        }
         param.setId(null);
         // 验证数据
         Organization temp = organizationDao.findTopByName(param.getName());
@@ -174,11 +181,6 @@ public class OrganizationServiceImpl extends SuperService implements Organizatio
         if (ObjectUtils.isEmpty(organization)) {
             return ResultContent.buildSuccess(String.format("项目不存在：%s", projectId));
         }
-        // 验证密码是否符合格式
-        ValidateResult validateResult = ValidateUtils.validatePassWord(param.getPassword());
-        if (!validateResult.isSuccess()) {
-            return ResultContent.buildFail(validateResult.getMsg());
-        }
 
         OrganizationAddParam addParam = new SchoolAddParam();
         BeanUtils.copyProperties(param, addParam);
@@ -296,6 +298,11 @@ public class OrganizationServiceImpl extends SuperService implements Organizatio
         return ResultContent.buildSuccess();
     }
 
+    /**
+     * 查询结构详情
+     * @param oid
+     * @return
+     */
     public ResultContent<OrganizationModel> getDetail(String oid) {
         Organization organization = organizationDao.findTopByOid(oid);
         if (ObjectUtils.isEmpty(organization)) {
@@ -603,6 +610,19 @@ public class OrganizationServiceImpl extends SuperService implements Organizatio
                     model.setProjectModel(toSimpleModel(organization.getRelOrganization()));
                 }
             }
+
+            // 区域信息
+            String adminDivisionItemCode = entity.getAdminDivisionItemCode();
+            if(StringUtils.isEmpty(adminDivisionItemCode)) {
+                List<String> codes = List.of(adminDivisionItemCode.split(","));
+                List<Region> regions = regionDao.findByCodeIn(codes);
+                List<RegionModel> regionList = regions.stream().map(it->{
+                    RegionModel regionModel = new RegionModel();
+                    BeanUtils.copyProperties(it, regionModel);
+                    return  regionModel;
+                }).collect(Collectors.toList());
+                model.setRegionList(regionList);
+            }
         }
         return model;
     }