From 01e16e69e6d0fb0e77b9f5dc834f7eecd19c9964 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Fri, 7 Mar 2025 14:00:31 +0800 Subject: [PATCH 1/4] =?UTF-8?q?dubbo=E5=BC=95=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/account/service/impl/PlatformDictServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PlatformDictServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PlatformDictServiceImpl.java index 5c2f4af6..3a51272c 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PlatformDictServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PlatformDictServiceImpl.java @@ -4,6 +4,7 @@ import com.czg.service.account.mapper.PlatformDictMapper; import com.mybatisflex.spring.service.impl.ServiceImpl; import com.czg.account.entity.PlatformDict; import com.czg.account.service.PlatformDictService; +import org.apache.dubbo.config.annotation.DubboService; import org.springframework.stereotype.Service; /** @@ -13,6 +14,7 @@ import org.springframework.stereotype.Service; * @since 2025-02-28 */ @Service +@DubboService public class PlatformDictServiceImpl extends ServiceImpl implements PlatformDictService{ } From 7cad9078c5a89500cd02bbb5b6d124b4f8398198 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Fri, 7 Mar 2025 14:06:06 +0800 Subject: [PATCH 2/4] =?UTF-8?q?dubbo=E5=BC=95=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/account/service/impl/PlatformDictServiceImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PlatformDictServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PlatformDictServiceImpl.java index 3a51272c..1c031f54 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PlatformDictServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PlatformDictServiceImpl.java @@ -13,7 +13,6 @@ import org.springframework.stereotype.Service; * @author zs * @since 2025-02-28 */ -@Service @DubboService public class PlatformDictServiceImpl extends ServiceImpl implements PlatformDictService{ From e1d6fae8067794a707dc55e6bce22912fa1cd012 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Fri, 7 Mar 2025 14:15:31 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=9C=BA=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=B7=BB=E5=8A=A0=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/czg/controller/admin/PrintMachineController.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cash-api/account-server/src/main/java/com/czg/controller/admin/PrintMachineController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/PrintMachineController.java index b1547866..08d6202b 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/admin/PrintMachineController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/PrintMachineController.java @@ -36,7 +36,7 @@ public class PrintMachineController { */ @SaAdminCheckPermission(value = "printer:list", name = "打印机列表获取") @GetMapping - public CzgResult> list(String name, String connectionType) { + public CzgResult> list(String name, String connectionType, String subType) { QueryWrapper queryWrapper = new QueryWrapper().eq(PrintMachine::getShopId, StpKit.USER.getShopId()); if (StrUtil.isNotBlank(name)) { queryWrapper.like(PrintMachine::getName, name); @@ -45,6 +45,10 @@ public class PrintMachineController { if (StrUtil.isNotBlank(connectionType)) { queryWrapper.eq(PrintMachine::getConnectionType, connectionType); } + + if (StrUtil.isNotBlank(subType)) { + queryWrapper.eq(PrintMachine::getSubType, subType); + } queryWrapper.orderBy(PrintMachine::getSort, true).orderBy(PrintMachine::getId, false); return CzgResult.success(printMachineService.page(PageUtil.buildPage(), queryWrapper)); } From d9b8aa384671eb68dd089c0102aa208e9ce216b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Fri, 7 Mar 2025 14:21:24 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=9C=BA=E5=8E=BB?= =?UTF-8?q?=E9=99=A4=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/czg/account/dto/print/PrinterAddDTO.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/print/PrinterAddDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/print/PrinterAddDTO.java index 6269ec0e..70bf0c23 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/print/PrinterAddDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/print/PrinterAddDTO.java @@ -28,6 +28,7 @@ public class PrinterAddDTO { /** * ip地址 */ + @NotBlank private String address; /** @@ -44,7 +45,7 @@ public class PrinterAddDTO { /** * 打印机品牌 */ - @NotBlank(message = "打印机品牌不为空") +// @NotBlank(message = "打印机品牌不为空") private String contentType; @@ -71,25 +72,25 @@ public class PrinterAddDTO { /** * 分类打印 0-所有 1-部分分类 2-部分商品 */ - @NotBlank(message = "打印分类不为空") +// @NotBlank(message = "打印分类不为空") private String classifyPrint; /** * 打印数量 c1m1^2=顾客+商家[2张] m1^1=商家[1张] c1^1顾客[1张] c2m1^3顾客2+商家1[3张] */ - @NotBlank(message = "打印数量不为空") +// @NotBlank(message = "打印数量不为空") private String printQty; /** * 打印方式 all-全部打印 normal-仅打印结账单「前台」one-仅打印制作单「厨房」 */ - @NotBlank(message = "打印方式不为空") +// @NotBlank(message = "打印方式不为空") private String printMethod; /** * 打印类型，JSON数组 refund-确认退款单 handover-交班单 queue-排队取号 */ - @NotBlank(message = "打印类型不为空") +// @NotBlank(message = "打印类型不为空") private String printType; private Integer status;