From 3520a4cc07eb17109fa7eb95323f5464915a316e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Wed, 19 Feb 2025 10:31:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=97=E9=93=BA=E5=8C=BA=E5=9F=9F=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/ShopTableAreaController.java | 36 ++++++++++++++++--- .../ShopAreaEditDTO.java} | 13 +++---- .../com/czg/account/entity/ShopTableArea.java | 8 +++-- ...Service.java => ShopTableAreaService.java} | 4 ++- .../service/impl/ShopAreaServiceImpl.java | 18 ---------- .../impl/ShopTableAreaServiceImpl.java | 31 ++++++++++++++++ .../service/impl/ShopTableServiceImpl.java | 4 +-- 7 files changed, 78 insertions(+), 36 deletions(-) rename cash-common/cash-common-service/src/main/java/com/czg/account/dto/{ShopAreaDTO.java => area/ShopAreaEditDTO.java} (72%) rename cash-common/cash-common-service/src/main/java/com/czg/account/service/{ShopAreaService.java => ShopTableAreaService.java} (53%) delete mode 100644 cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopAreaServiceImpl.java create mode 100644 cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopTableAreaServiceImpl.java diff --git a/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopTableAreaController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopTableAreaController.java index 1c760a73..d7eec061 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopTableAreaController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopTableAreaController.java @@ -1,11 +1,19 @@ package com.czg.controller.admin; +import com.czg.account.entity.ShopTableArea; +import com.czg.account.service.ShopTableAreaService; import com.czg.annotation.SaAdminCheckPermission; import com.czg.resp.CzgResult; +import com.czg.sa.StpKit; +import com.mybatisflex.core.paginate.Page; +import jakarta.annotation.Resource; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + /** * 区域管理 * @author Administrator @@ -13,10 +21,28 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("/shopArea") public class ShopTableAreaController { + @Resource + private ShopTableAreaService shopTableAreaService; -// @SaAdminCheckPermission("shopArea:list") -// @GetMapping -// public CzgResult list() { -// -// } + /** + * 区域添加 + * @param name 区域名称 + * @return 是否成功 + */ + @SaAdminCheckPermission("shopArea:list") + @GetMapping + public CzgResult> list(String name) { + return CzgResult.success(shopTableAreaService.pageInfo(StpKit.USER.getShopId(), name)); + } + + /** + * 区域修改 + * @param name 区域名称 + * @return 是否成功 + */ + @SaAdminCheckPermission("shopArea:edit") + @PutMapping + public CzgResult> edit(String name) { + return CzgResult.success(shopTableAreaService.pageInfo(StpKit.USER.getShopId(), name)); + } } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopAreaDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/area/ShopAreaEditDTO.java similarity index 72% rename from cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopAreaDTO.java rename to cash-common/cash-common-service/src/main/java/com/czg/account/dto/area/ShopAreaEditDTO.java index e08d996b..e5e1e2c0 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopAreaDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/area/ShopAreaEditDTO.java @@ -1,8 +1,10 @@ -package com.czg.account.dto; +package com.czg.account.dto.area; import java.io.Serializable; import java.io.Serial; + +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -18,14 +20,12 @@ import lombok.NoArgsConstructor; @Builder @NoArgsConstructor @AllArgsConstructor -public class ShopAreaDTO implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; +public class ShopAreaEditDTO implements Serializable { /** * id */ + @NotNull private Integer id; /** @@ -43,8 +43,5 @@ public class ShopAreaDTO implements Serializable { */ private String name; - private Long createdAt; - - private Long updatedAt; } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopTableArea.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopTableArea.java index 6037d6d0..c39aeab2 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopTableArea.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopTableArea.java @@ -1,11 +1,13 @@ package com.czg.account.entity; +import com.mybatisflex.annotation.Column; import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.KeyType; import com.mybatisflex.annotation.Table; import java.io.Serializable; import java.io.Serial; +import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.Builder; @@ -49,8 +51,10 @@ public class ShopTableArea implements Serializable { */ private String name; - private Long createdAt; + @Column(onInsertValue = "now()") + private LocalDateTime createdTime; - private Long updatedAt; + @Column(onInsertValue = "now()", onUpdateValue = "now()") + private Long updatedTime; } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopAreaService.java b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopTableAreaService.java similarity index 53% rename from cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopAreaService.java rename to cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopTableAreaService.java index 1b17bc1b..760c863b 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopAreaService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopTableAreaService.java @@ -1,5 +1,6 @@ package com.czg.account.service; +import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.service.IService; import com.czg.account.entity.ShopTableArea; @@ -9,6 +10,7 @@ import com.czg.account.entity.ShopTableArea; * @author zs * @since 2025-02-18 */ -public interface ShopAreaService extends IService { +public interface ShopTableAreaService extends IService { + Page pageInfo(Long shopId, String name); } diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopAreaServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopAreaServiceImpl.java deleted file mode 100644 index 82553238..00000000 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopAreaServiceImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.czg.service.account.service.impl; - -import com.mybatisflex.spring.service.impl.ServiceImpl; -import com.czg.account.entity.ShopTableArea; -import com.czg.account.service.ShopAreaService; -import com.czg.service.account.mapper.ShopAreaMapper; -import org.springframework.stereotype.Service; - -/** - * 店铺区域 服务层实现。 - * - * @author zs - * @since 2025-02-18 - */ -@Service -public class ShopAreaServiceImpl extends ServiceImpl implements ShopAreaService{ - -} diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopTableAreaServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopTableAreaServiceImpl.java new file mode 100644 index 00000000..8a948bb4 --- /dev/null +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopTableAreaServiceImpl.java @@ -0,0 +1,31 @@ +package com.czg.service.account.service.impl; + +import cn.hutool.core.util.StrUtil; +import com.czg.utils.PageUtil; +import com.mybatisflex.core.paginate.Page; +import com.mybatisflex.core.query.QueryWrapper; +import com.mybatisflex.spring.service.impl.ServiceImpl; +import com.czg.account.entity.ShopTableArea; +import com.czg.account.service.ShopTableAreaService; +import com.czg.service.account.mapper.ShopAreaMapper; +import org.springframework.stereotype.Service; + +/** + * 店铺区域 服务层实现。 + * + * @author zs + * @since 2025-02-18 + */ +@Service +public class ShopTableAreaServiceImpl extends ServiceImpl implements ShopTableAreaService { + + @Override + public Page pageInfo(Long shopId, String name) { + QueryWrapper queryWrapper = new QueryWrapper().eq(ShopTableArea::getShopId, shopId); + + if (StrUtil.isNotBlank(name)) { + queryWrapper.like(ShopTableArea::getName, name); + } + return page(PageUtil.buildPage(), queryWrapper); + } +} diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopTableServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopTableServiceImpl.java index 778e8ee3..debba2d4 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopTableServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopTableServiceImpl.java @@ -9,7 +9,7 @@ import com.czg.account.dto.table.ShopTableAddDTO; import com.czg.account.dto.table.ShopTableBindDTO; import com.czg.account.entity.ShopTableArea; import com.czg.account.entity.ShopTableCode; -import com.czg.account.service.ShopAreaService; +import com.czg.account.service.ShopTableAreaService; import com.czg.account.service.ShopTableCodeService; import com.czg.enums.ShopTableStatusEnum; import com.czg.exception.ApiNotPrintException; @@ -42,7 +42,7 @@ import java.util.zip.ZipOutputStream; @Service public class ShopTableServiceImpl extends ServiceImpl implements ShopTableService{ @Resource - private ShopAreaService shopAreaService; + private ShopTableAreaService shopAreaService; @Resource private ShopTableCodeService shopTableCodeService;