From 5e20e67a5e26e08a8ed9cf83d921ca035c2f2f2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Tue, 18 Feb 2025 16:35:03 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B1=BB=E5=90=8D=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/ShopTableController.java | 1 - .../entity/{ShopArea.java => ShopTableArea.java} | 4 ++-- .../com/czg/account/service/ShopAreaService.java | 4 ++-- .../service/account/mapper/ShopAreaMapper.java | 4 ++-- .../service/impl/ShopAreaServiceImpl.java | 4 ++-- .../service/impl/ShopTableServiceImpl.java | 16 +++------------- 6 files changed, 11 insertions(+), 22 deletions(-) rename cash-common/cash-common-service/src/main/java/com/czg/account/entity/{ShopArea.java => ShopTableArea.java} (91%) diff --git a/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopTableController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopTableController.java index 41916ea86..4164d002c 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopTableController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopTableController.java @@ -33,7 +33,6 @@ public class ShopTableController { /** * 批量生成台桌码 * 权限标识: shopTable:code - * @return 台桌列表 */ @SaAdminCheckPermission("shopTable:code") @PostMapping("/code") diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopArea.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopTableArea.java similarity index 91% rename from cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopArea.java rename to cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopTableArea.java index e6478b2a8..6037d6d0b 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopArea.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopTableArea.java @@ -22,8 +22,8 @@ import lombok.NoArgsConstructor; @Builder @NoArgsConstructor @AllArgsConstructor -@Table("tb_shop_area") -public class ShopArea implements Serializable { +@Table("tb_shop_table_area") +public class ShopTableArea implements Serializable { @Serial private static final long serialVersionUID = 1L; 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/ShopAreaService.java index c478d0ab9..1b17bc1bd 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/ShopAreaService.java @@ -1,7 +1,7 @@ package com.czg.account.service; import com.mybatisflex.core.service.IService; -import com.czg.account.entity.ShopArea; +import com.czg.account.entity.ShopTableArea; /** * 店铺区域 服务层。 @@ -9,6 +9,6 @@ import com.czg.account.entity.ShopArea; * @author zs * @since 2025-02-18 */ -public interface ShopAreaService extends IService { +public interface ShopAreaService extends IService { } diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/mapper/ShopAreaMapper.java b/cash-service/account-service/src/main/java/com/czg/service/account/mapper/ShopAreaMapper.java index df267605c..7442eb4ea 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/mapper/ShopAreaMapper.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/mapper/ShopAreaMapper.java @@ -1,7 +1,7 @@ package com.czg.service.account.mapper; import com.mybatisflex.core.BaseMapper; -import com.czg.account.entity.ShopArea; +import com.czg.account.entity.ShopTableArea; /** * 店铺区域 映射层。 @@ -9,6 +9,6 @@ import com.czg.account.entity.ShopArea; * @author zs * @since 2025-02-18 */ -public interface ShopAreaMapper extends BaseMapper { +public interface ShopAreaMapper extends BaseMapper { } 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 index 8c63995fc..82553238f 100644 --- 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 @@ -1,7 +1,7 @@ package com.czg.service.account.service.impl; import com.mybatisflex.spring.service.impl.ServiceImpl; -import com.czg.account.entity.ShopArea; +import com.czg.account.entity.ShopTableArea; import com.czg.account.service.ShopAreaService; import com.czg.service.account.mapper.ShopAreaMapper; import org.springframework.stereotype.Service; @@ -13,6 +13,6 @@ import org.springframework.stereotype.Service; * @since 2025-02-18 */ @Service -public class ShopAreaServiceImpl extends ServiceImpl implements ShopAreaService{ +public class ShopAreaServiceImpl extends ServiceImpl implements ShopAreaService{ } 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 54a084f08..d8fc4586f 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 @@ -1,17 +1,11 @@ package com.czg.service.account.service.impl; -import cn.dev33.satoken.context.SaHolder; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.img.ImgUtil; -import cn.hutool.core.io.FileUtil; -import cn.hutool.core.io.IoUtil; -import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.StrUtil; -import cn.hutool.core.util.ZipUtil; import cn.hutool.extra.qrcode.QrCodeUtil; import com.czg.account.dto.table.ShopTableAddDTO; -import com.czg.account.entity.ShopArea; +import com.czg.account.entity.ShopTableArea; import com.czg.account.service.ShopAreaService; import com.czg.enums.ShopTableStatusEnum; import com.czg.exception.ApiNotPrintException; @@ -27,12 +21,8 @@ import org.springframework.stereotype.Service; import java.awt.image.BufferedImage; import java.io.ByteArrayOutputStream; -import java.io.File; import java.io.IOException; -import java.math.BigDecimal; import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; import java.util.List; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; @@ -50,8 +40,8 @@ public class ShopTableServiceImpl extends ServiceImpl