service位置调整

2025-02-11 15:06:58 +08:00
parent 13a5838f55
commit c49248c47a
68 changed files with 463 additions and 766 deletions
--- a/cash-api/account-server/src/main/java/com/czg/controller/AuthorizationController.java
+++ b/cash-api/account-server/src/main/java/com/czg/controller/AuthorizationController.java
@@ -1,11 +1,11 @@
 package com.czg.controller;

-import com.czg.service.account.dto.SysLoginDTO;
+import com.czg.account.dto.SysLoginDTO;
+import com.czg.account.service.AuthorizationService;
+import com.czg.account.service.PermissionService;
+import com.czg.account.vo.LoginVO;
 import com.czg.resp.CzgResult;
 import com.czg.sa.StpKit;
-import com.czg.service.account.service.AuthorizationService;
-import com.czg.service.account.service.PermissionService;
-import com.czg.service.account.vo.LoginVO;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
--- a/cash-api/account-server/src/main/java/com/czg/controller/MenuController.java
+++ b/cash-api/account-server/src/main/java/com/czg/controller/MenuController.java
@@ -1,7 +1,7 @@
 package com.czg.controller;

+import com.czg.account.service.SysMenuService;
 import com.czg.resp.CzgResult;
-import com.czg.service.account.service.SysMenuService;
 import jakarta.annotation.Resource;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
--- a/cash-api/account-server/src/main/java/com/czg/controller/MerchantRegisterController.java
+++ b/cash-api/account-server/src/main/java/com/czg/controller/MerchantRegisterController.java
@@ -1,12 +1,12 @@
 package com.czg.controller;

+import com.czg.account.dto.PageDTO;
+import com.czg.account.dto.register.MerchantRegisterDTO;
+import com.czg.account.entity.MerchantRegister;
+import com.czg.account.service.MerchantRegisterService;
 import com.czg.annotation.SaAdminCheckPermission;
 import com.czg.annotation.SaAdminCheckRole;
 import com.czg.resp.CzgResult;
-import com.czg.service.account.dto.PageDTO;
-import com.czg.service.account.dto.register.MerchantRegisterDTO;
-import com.czg.service.account.entity.MerchantRegister;
-import com.czg.service.account.service.MerchantRegisterService;
 import com.mybatisflex.core.paginate.Page;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -35,7 +35,7 @@ public class MerchantRegisterController {
     * @return 激活码列表
     */
    @SaAdminCheckRole("管理员")
-    @SaAdminCheckPermission("merchantRegister:add")
+    @SaAdminCheckPermission("merchantRegister:list")
    @GetMapping
    public CzgResult<Page<MerchantRegister>> get(PageDTO pageDTO, Integer state, String startTime, String endTime) {
        return CzgResult.success(merchantRegisterService.get(pageDTO, state, startTime, endTime));
--- a/cash-api/account-server/src/main/java/com/czg/controller/RoleController.java
+++ b/cash-api/account-server/src/main/java/com/czg/controller/RoleController.java
@@ -1,13 +1,13 @@
 package com.czg.controller;

+import com.czg.account.dto.PageDTO;
+import com.czg.account.dto.role.RoleAddDTO;
+import com.czg.account.dto.role.RoleEditDTO;
+import com.czg.account.dto.role.RoleRemoveDTO;
+import com.czg.account.entity.SysRole;
+import com.czg.account.service.SysRoleService;
 import com.czg.annotation.SaAdminCheckPermission;
 import com.czg.resp.CzgResult;
-import com.czg.service.account.dto.PageDTO;
-import com.czg.service.account.dto.role.RoleAddDTO;
-import com.czg.service.account.dto.role.RoleEditDTO;
-import com.czg.service.account.dto.role.RoleRemoveDTO;
-import com.czg.service.account.entity.SysRole;
-import com.czg.service.account.service.SysRoleService;
 import com.mybatisflex.core.paginate.Page;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
--- a/cash-api/account-server/src/main/java/com/czg/controller/ShopInfoController.java
+++ b/cash-api/account-server/src/main/java/com/czg/controller/ShopInfoController.java
@@ -1,15 +1,16 @@
 package com.czg.controller;

+import com.czg.account.dto.PageDTO;
+import com.czg.account.dto.shopinfo.ShopInfoAddDTO;
+import com.czg.account.dto.shopinfo.ShopInfoEditDTO;
+import com.czg.account.entity.ShopInfo;
+import com.czg.account.service.ShopInfoService;
 import com.czg.annotation.SaAdminCheckPermission;
 import com.czg.annotation.SaAdminCheckRole;
 import com.czg.resp.CzgResult;
-import com.czg.service.account.dto.shopinfo.ShopInfoAddDTO;
-import com.czg.service.account.service.ShopInfoService;
+import com.mybatisflex.core.paginate.Page;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;

 /**
 * 店铺管理
@@ -24,6 +25,17 @@ public class ShopInfoController {
        this.shopInfoService = shopInfoService;
    }

+    /**
+     * 店铺列表
+     * 权限标识: shopInfo:list
+     */
+    @SaAdminCheckRole("管理员")
+    @SaAdminCheckPermission("shopInfo:list")
+    @GetMapping
+    public CzgResult<Page<ShopInfo>> get(PageDTO pageDTO, String shopName, Integer status) {
+        return CzgResult.success(shopInfoService.get(pageDTO, shopName, status));
+    }
+
    /**
     * 店铺添加
     * 权限标识: shopInfo:add
@@ -34,4 +46,15 @@ public class ShopInfoController {
    public CzgResult<?> add(@RequestBody @Validated ShopInfoAddDTO shopInfoAddDTO) {
        return CzgResult.success(shopInfoService.add(shopInfoAddDTO));
    }
+
+    /**
+     * 店铺编辑
+     * 权限标识: shopInfo:edit
+     */
+    @SaAdminCheckRole("管理员")
+    @SaAdminCheckPermission("shopInfo:edit")
+    @PutMapping
+    public CzgResult<?> edit(@RequestBody @Validated ShopInfoEditDTO shopInfoEditDTO) {
+        return CzgResult.success(shopInfoService.edit(shopInfoEditDTO));
+    }
 }
--- a/cash-api/account-server/src/main/java/com/czg/controller/ShopMerchantController.java
+++ b/cash-api/account-server/src/main/java/com/czg/controller/ShopMerchantController.java
@@ -0,0 +1,47 @@
+package com.czg.controller;
+
+import com.czg.account.dto.merchant.ShopMerchantEditDTO;
+import com.czg.account.entity.ShopMerchant;
+import com.czg.account.service.ShopMerchantService;
+import com.czg.annotation.SaAdminCheckPermission;
+import com.czg.annotation.SaAdminCheckRole;
+import com.czg.resp.CzgResult;
+import com.mybatisflex.core.paginate.Page;
+import jakarta.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 商户信息管理
+ * @author Administrator
+ */
+@RestController
+@RequestMapping("/shopMerchant")
+public class ShopMerchantController {
+    @Resource
+    private ShopMerchantService shopMerchantService;
+
+    /**
+     * 商户支付信息获取
+     * 权限标识: shopMerchant:detail
+     * @return 支付信息
+     */
+    @SaAdminCheckRole("管理员")
+    @SaAdminCheckPermission("shopMerchant:detail")
+    @GetMapping
+    public CzgResult<ShopMerchant> detail() {
+        return CzgResult.success(shopMerchantService.detail());
+    }
+
+    /**
+     * 商户支付信息修改
+     * 权限标识: shopMerchant:edit
+     * @return 是否成功
+     */
+    @SaAdminCheckRole("管理员")
+    @SaAdminCheckPermission("shopMerchant:edit")
+    @PutMapping
+    public CzgResult<Boolean> edit(@RequestBody @Validated ShopMerchantEditDTO shopMerchantEditDTO) {
+        return CzgResult.success(shopMerchantService.edit(shopMerchantEditDTO));
+    }
+}