From c697e0e6eaab99c37057471aa46d785e48dfbc7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Mon, 24 Feb 2025 10:41:13 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E6=94=BE=E5=BC=80?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/czg/exception/CzgControllerAdvice.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cash-common/cash-common-api-config/src/main/java/com/czg/exception/CzgControllerAdvice.java b/cash-common/cash-common-api-config/src/main/java/com/czg/exception/CzgControllerAdvice.java index e100de6b..96ca44f0 100644 --- a/cash-common/cash-common-api-config/src/main/java/com/czg/exception/CzgControllerAdvice.java +++ b/cash-common/cash-common-api-config/src/main/java/com/czg/exception/CzgControllerAdvice.java @@ -34,7 +34,7 @@ public class CzgControllerAdvice { public CzgResult errorHandler(Exception ex) { setErrorLog(ex); log.error("", ex); - return CzgResult.failure(CzgRespCode.SYSTEM_ERROR); + return CzgResult.failure(CzgRespCode.SYSTEM_ERROR.getCode(), ex.getMessage()); } @ResponseBody From 1d3797fe571b390f76c0ed75e83dbcc4e06bf8cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Mon, 24 Feb 2025 13:56:15 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=9C=BA=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/czg/account/entity/PrintMachine.java | 2 +- .../service/account/service/impl/PrintMachineServiceImpl.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/PrintMachine.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/PrintMachine.java index f00253c8..35883346 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/PrintMachine.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/PrintMachine.java @@ -66,7 +66,7 @@ public class PrintMachine implements Serializable { /** * 店铺Id */ - private String shopId; + private Long shopId; /** * 分类Id diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PrintMachineServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PrintMachineServiceImpl.java index 86eb923d..b7c83347 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PrintMachineServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PrintMachineServiceImpl.java @@ -41,6 +41,7 @@ public class PrintMachineServiceImpl extends ServiceImpl Date: Mon, 24 Feb 2025 13:59:19 +0800 Subject: [PATCH 3/3] =?UTF-8?q?pad=E5=B8=83=E5=B1=80=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../czg/controller/admin/PadProdController.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/cash-api/account-server/src/main/java/com/czg/controller/admin/PadProdController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/PadProdController.java index 1d9a4b47..1c004a6e 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/admin/PadProdController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/PadProdController.java @@ -2,7 +2,9 @@ package com.czg.controller.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.czg.account.dto.pad.*; +import com.czg.account.entity.PadLayout; import com.czg.account.entity.PadProductCategoryDetail; +import com.czg.account.service.PadLayoutService; import com.czg.account.service.PadProdService; import com.czg.annotation.SaAdminCheckPermission; import com.czg.resp.CzgResult; @@ -25,6 +27,18 @@ import java.util.Map; public class PadProdController { @Resource private PadProdService padProdService; + @Resource + private PadLayoutService padLayoutService; + + /** + * pad布局列表 + * @return 数据 + */ + @SaAdminCheckPermission(value = "padProd:layout:list", name = "pad布局列表") + @GetMapping("/layout") + public CzgResult> layout() { + return CzgResult.success(padLayoutService.page(PageUtil.buildPage())); + } /** * 获取点餐列表