From eaa936c9c76d70cf783575fb66c1ab94496db90a Mon Sep 17 00:00:00 2001 From: DaxPay Date: Tue, 26 Nov 2024 16:40:22 +0800 Subject: [PATCH] =?UTF-8?q?feat(config):=20=E9=87=8D=E6=9E=84=E6=94=B6?= =?UTF-8?q?=E9=93=B6=E5=8F=B0=E9=85=8D=E7=BD=AE=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将 CashierCodeConfig 相关类移动到 config.cashier 包中- 新增 CheckoutConfig、CheckoutGroupConfig 和 CheckoutItemConfig 类 - 更新相关 Controller、Service 和 DAO层的包结构 - 修改 Task.md 文件中的任务列表 --- _doc/Task.md | 4 +- .../config/CashierCodeConfigController.java | 8 ++-- .../controller/config/CheckoutConfig.java | 16 -------- .../config/CashierCodeConfigConvert.java | 6 +-- .../config/CashierCodeTypeConfigConvert.java | 6 +-- .../config/CheckoutGroupConfigConvert.java | 23 +++++++++++ .../config/CheckoutItemConfigConvert.java | 21 ++++++++++ .../CashierCodeConfigManager.java | 4 +- .../CashierCodeConfigMapper.java | 4 +- .../CashierCodeTypeConfigManager.java | 4 +- .../CashierCodeTypeConfigMapper.java | 4 +- .../checkout/CheckoutConfigManager.java | 18 ++++++++ .../config/checkout/CheckoutConfigMapper.java | 14 +++++++ .../checkout/CheckoutGroupConfigManager.java | 18 ++++++++ .../checkout/CheckoutGroupConfigMapper.java | 14 +++++++ .../{ => cashier}/CashierCodeConfig.java | 6 +-- .../{ => cashier}/CashierCodeTypeConfig.java | 6 +-- .../config/checkout/CheckoutConfig.java | 20 +++++++++ .../config/checkout/CheckoutGroupConfig.java | 26 ++++++++++++ .../config/checkout/CheckoutItemConfig.java | 41 +++++++++++++++++++ .../{ => cashier}/CashierCodeConfigParam.java | 2 +- .../CashierCodeTypeConfigParam.java | 2 +- .../checkout/CheckoutGroupConfigParam.java | 16 ++++++++ .../checkout/CheckoutItemConfigParam.java | 16 ++++++++ .../CashierCodeConfigResult.java | 2 +- .../CashierCodeTypeConfigResult.java | 2 +- .../checkout/CheckoutGroupConfigResult.java | 19 +++++++++ .../checkout/CheckoutItemConfigResult.java | 19 +++++++++ .../config/CashierCodeConfigService.java | 12 +++--- .../config/CashierCodeTypeConfigService.java | 12 +++--- 30 files changed, 307 insertions(+), 58 deletions(-) delete mode 100644 daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/controller/config/CheckoutConfig.java create mode 100644 daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/convert/config/CheckoutGroupConfigConvert.java create mode 100644 daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/convert/config/CheckoutItemConfigConvert.java rename daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/config/{ => cashier}/CashierCodeConfigManager.java (86%) rename daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/config/{ => cashier}/CashierCodeConfigMapper.java (66%) rename daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/config/{ => cashier}/CashierCodeTypeConfigManager.java (93%) rename daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/config/{ => cashier}/CashierCodeTypeConfigMapper.java (67%) create mode 100644 daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/config/checkout/CheckoutConfigManager.java create mode 100644 daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/config/checkout/CheckoutConfigMapper.java create mode 100644 daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/config/checkout/CheckoutGroupConfigManager.java create mode 100644 daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/config/checkout/CheckoutGroupConfigMapper.java rename daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/entity/config/{ => cashier}/CashierCodeConfig.java (86%) rename daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/entity/config/{ => cashier}/CashierCodeTypeConfig.java (87%) create mode 100644 daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/entity/config/checkout/CheckoutConfig.java create mode 100644 daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/entity/config/checkout/CheckoutGroupConfig.java create mode 100644 daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/entity/config/checkout/CheckoutItemConfig.java rename daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/param/config/{ => cashier}/CashierCodeConfigParam.java (92%) rename daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/param/config/{ => cashier}/CashierCodeTypeConfigParam.java (95%) create mode 100644 daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/param/config/checkout/CheckoutGroupConfigParam.java create mode 100644 daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/param/config/checkout/CheckoutItemConfigParam.java rename daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/result/config/{ => cashier}/CashierCodeConfigResult.java (93%) rename daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/result/config/{ => cashier}/CashierCodeTypeConfigResult.java (96%) create mode 100644 daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/result/config/checkout/CheckoutGroupConfigResult.java create mode 100644 daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/result/config/checkout/CheckoutItemConfigResult.java diff --git a/_doc/Task.md b/_doc/Task.md index 4cc6e64a..1ef53b9c 100644 --- a/_doc/Task.md +++ b/_doc/Task.md @@ -19,10 +19,10 @@ - 在微信支付宝时为结算页, 可以直接发起支付 - [ ] PC收银台, PC收银台可以生成聚合收银码, 也可以通道特殊方式的支付(微信扫码/支付宝PC支付) - [ ] H5收银台只在浏览器中才会出现, 在软件中会直接跳转到结算页 -- [ ] 支付码牌配置 +- [x] 支付码牌配置 - [x] 一个应用支持多码牌 - [x] 码牌不再使用应用号座位标识, 使用独立的编码 - - [ ] 码牌H5页面对接 + - [x] 码牌H5页面对接 ## bugs - [x] 修复 BigDecimal 类型数据序列化和签名异常问题 diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/controller/config/CashierCodeConfigController.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/controller/config/CashierCodeConfigController.java index 362b2cd2..07814742 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/controller/config/CashierCodeConfigController.java +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/controller/config/CashierCodeConfigController.java @@ -7,10 +7,10 @@ import cn.bootx.platform.core.rest.result.Result; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; -import org.dromara.daxpay.service.param.config.CashierCodeConfigParam; -import org.dromara.daxpay.service.param.config.CashierCodeTypeConfigParam; -import org.dromara.daxpay.service.result.config.CashierCodeConfigResult; -import org.dromara.daxpay.service.result.config.CashierCodeTypeConfigResult; +import org.dromara.daxpay.service.param.config.cashier.CashierCodeConfigParam; +import org.dromara.daxpay.service.param.config.cashier.CashierCodeTypeConfigParam; +import org.dromara.daxpay.service.result.config.cashier.CashierCodeConfigResult; +import org.dromara.daxpay.service.result.config.cashier.CashierCodeTypeConfigResult; import org.dromara.daxpay.service.service.config.CashierCodeConfigService; import org.dromara.daxpay.service.service.config.CashierCodeTypeConfigService; import org.springframework.web.bind.annotation.*; diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/controller/config/CheckoutConfig.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/controller/config/CheckoutConfig.java deleted file mode 100644 index b294f36e..00000000 --- a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/controller/config/CheckoutConfig.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.dromara.daxpay.service.controller.config; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.experimental.Accessors; - -/** - * 收银台配置 - * @author xxm - * @since 2024/11/22 - */ -@Data -@Accessors(chain = true) -@Schema(title = "收银台配置") -public class CheckoutConfig { -} diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/convert/config/CashierCodeConfigConvert.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/convert/config/CashierCodeConfigConvert.java index dc28b947..12b04339 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/convert/config/CashierCodeConfigConvert.java +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/convert/config/CashierCodeConfigConvert.java @@ -1,8 +1,8 @@ package org.dromara.daxpay.service.convert.config; -import org.dromara.daxpay.service.entity.config.CashierCodeConfig; -import org.dromara.daxpay.service.param.config.CashierCodeConfigParam; -import org.dromara.daxpay.service.result.config.CashierCodeConfigResult; +import org.dromara.daxpay.service.entity.config.cashier.CashierCodeConfig; +import org.dromara.daxpay.service.param.config.cashier.CashierCodeConfigParam; +import org.dromara.daxpay.service.result.config.cashier.CashierCodeConfigResult; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/convert/config/CashierCodeTypeConfigConvert.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/convert/config/CashierCodeTypeConfigConvert.java index b6c90b50..e7586f97 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/convert/config/CashierCodeTypeConfigConvert.java +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/convert/config/CashierCodeTypeConfigConvert.java @@ -1,8 +1,8 @@ package org.dromara.daxpay.service.convert.config; -import org.dromara.daxpay.service.entity.config.CashierCodeTypeConfig; -import org.dromara.daxpay.service.param.config.CashierCodeTypeConfigParam; -import org.dromara.daxpay.service.result.config.CashierCodeTypeConfigResult; +import org.dromara.daxpay.service.entity.config.cashier.CashierCodeTypeConfig; +import org.dromara.daxpay.service.param.config.cashier.CashierCodeTypeConfigParam; +import org.dromara.daxpay.service.result.config.cashier.CashierCodeTypeConfigResult; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/convert/config/CheckoutGroupConfigConvert.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/convert/config/CheckoutGroupConfigConvert.java new file mode 100644 index 00000000..0b0e221f --- /dev/null +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/convert/config/CheckoutGroupConfigConvert.java @@ -0,0 +1,23 @@ +package org.dromara.daxpay.service.convert.config; + +import org.dromara.daxpay.service.entity.config.checkout.CheckoutGroupConfig; +import org.dromara.daxpay.service.param.config.checkout.CheckoutGroupConfigParam; +import org.dromara.daxpay.service.result.config.checkout.CheckoutGroupConfigResult; +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; + +/** + * + * @author xxm + * @since 2024/11/26 + */ +@Mapper +public interface CheckoutGroupConfigConvert { + CheckoutGroupConfigConvert CONVERT = Mappers.getMapper(CheckoutGroupConfigConvert.class); + + CheckoutGroupConfig toEntity(CheckoutGroupConfigParam param); + + CheckoutGroupConfigResult toResult(CheckoutGroupConfig entity); + + +} diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/convert/config/CheckoutItemConfigConvert.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/convert/config/CheckoutItemConfigConvert.java new file mode 100644 index 00000000..47ac0c22 --- /dev/null +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/convert/config/CheckoutItemConfigConvert.java @@ -0,0 +1,21 @@ +package org.dromara.daxpay.service.convert.config; + +import org.dromara.daxpay.service.entity.config.checkout.CheckoutItemConfig; +import org.dromara.daxpay.service.param.config.checkout.CheckoutItemConfigParam; +import org.dromara.daxpay.service.result.config.checkout.CheckoutItemConfigResult; +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; + +/** + * + * @author xxm + * @since 2024/11/26 + */ +@Mapper +public interface CheckoutItemConfigConvert { + CheckoutItemConfigConvert CONVERT = Mappers.getMapper(CheckoutItemConfigConvert.class); + + CheckoutItemConfig toEntity(CheckoutItemConfigParam param); + + CheckoutItemConfigResult toResult(CheckoutItemConfig entity); +} diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/config/CashierCodeConfigManager.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/config/cashier/CashierCodeConfigManager.java similarity index 86% rename from daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/config/CashierCodeConfigManager.java rename to daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/config/cashier/CashierCodeConfigManager.java index 9bb33f5b..57be5dc4 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/config/CashierCodeConfigManager.java +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/config/cashier/CashierCodeConfigManager.java @@ -1,9 +1,9 @@ -package org.dromara.daxpay.service.dao.config; +package org.dromara.daxpay.service.dao.config.cashier; import cn.bootx.platform.common.mybatisplus.impl.BaseManager; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.daxpay.service.entity.config.CashierCodeConfig; +import org.dromara.daxpay.service.entity.config.cashier.CashierCodeConfig; import org.springframework.stereotype.Repository; import java.util.List; diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/config/CashierCodeConfigMapper.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/config/cashier/CashierCodeConfigMapper.java similarity index 66% rename from daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/config/CashierCodeConfigMapper.java rename to daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/config/cashier/CashierCodeConfigMapper.java index a5665083..9c7a4f96 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/config/CashierCodeConfigMapper.java +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/config/cashier/CashierCodeConfigMapper.java @@ -1,8 +1,8 @@ -package org.dromara.daxpay.service.dao.config; +package org.dromara.daxpay.service.dao.config.cashier; import com.github.yulichang.base.MPJBaseMapper; import org.apache.ibatis.annotations.Mapper; -import org.dromara.daxpay.service.entity.config.CashierCodeConfig; +import org.dromara.daxpay.service.entity.config.cashier.CashierCodeConfig; /** * 收银台码牌配置 diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/config/CashierCodeTypeConfigManager.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/config/cashier/CashierCodeTypeConfigManager.java similarity index 93% rename from daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/config/CashierCodeTypeConfigManager.java rename to daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/config/cashier/CashierCodeTypeConfigManager.java index b12f56fd..b8455002 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/config/CashierCodeTypeConfigManager.java +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/config/cashier/CashierCodeTypeConfigManager.java @@ -1,9 +1,9 @@ -package org.dromara.daxpay.service.dao.config; +package org.dromara.daxpay.service.dao.config.cashier; import cn.bootx.platform.common.mybatisplus.impl.BaseManager; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.daxpay.service.entity.config.CashierCodeTypeConfig; +import org.dromara.daxpay.service.entity.config.cashier.CashierCodeTypeConfig; import org.springframework.stereotype.Repository; import java.util.List; diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/config/CashierCodeTypeConfigMapper.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/config/cashier/CashierCodeTypeConfigMapper.java similarity index 67% rename from daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/config/CashierCodeTypeConfigMapper.java rename to daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/config/cashier/CashierCodeTypeConfigMapper.java index 43e31ce8..42401301 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/config/CashierCodeTypeConfigMapper.java +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/config/cashier/CashierCodeTypeConfigMapper.java @@ -1,8 +1,8 @@ -package org.dromara.daxpay.service.dao.config; +package org.dromara.daxpay.service.dao.config.cashier; import com.github.yulichang.base.MPJBaseMapper; import org.apache.ibatis.annotations.Mapper; -import org.dromara.daxpay.service.entity.config.CashierCodeTypeConfig; +import org.dromara.daxpay.service.entity.config.cashier.CashierCodeTypeConfig; /** * 渠道码类型配置表 Mapper 接口 diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/config/checkout/CheckoutConfigManager.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/config/checkout/CheckoutConfigManager.java new file mode 100644 index 00000000..fc646c49 --- /dev/null +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/config/checkout/CheckoutConfigManager.java @@ -0,0 +1,18 @@ +package org.dromara.daxpay.service.dao.config.checkout; + +import cn.bootx.platform.common.mybatisplus.impl.BaseManager; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.dromara.daxpay.service.entity.config.checkout.CheckoutConfig; +import org.springframework.stereotype.Repository; + +/** + * + * @author xxm + * @since 2024/11/25 + */ +@Slf4j +@Repository +@RequiredArgsConstructor +public class CheckoutConfigManager extends BaseManager { +} diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/config/checkout/CheckoutConfigMapper.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/config/checkout/CheckoutConfigMapper.java new file mode 100644 index 00000000..d559b021 --- /dev/null +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/config/checkout/CheckoutConfigMapper.java @@ -0,0 +1,14 @@ +package org.dromara.daxpay.service.dao.config.checkout; + +import com.github.yulichang.base.MPJBaseMapper; +import org.apache.ibatis.annotations.Mapper; +import org.dromara.daxpay.service.entity.config.checkout.CheckoutConfig; + +/** + * + * @author xxm + * @since 2024/11/25 + */ +@Mapper +public interface CheckoutConfigMapper extends MPJBaseMapper { +} diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/config/checkout/CheckoutGroupConfigManager.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/config/checkout/CheckoutGroupConfigManager.java new file mode 100644 index 00000000..42985d6a --- /dev/null +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/config/checkout/CheckoutGroupConfigManager.java @@ -0,0 +1,18 @@ +package org.dromara.daxpay.service.dao.config.checkout; + +import cn.bootx.platform.common.mybatisplus.impl.BaseManager; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.dromara.daxpay.service.entity.config.checkout.CheckoutGroupConfig; +import org.springframework.stereotype.Repository; + +/** + * 收银台类目配置 + * @author xxm + * @since 2024/11/25 + */ +@Slf4j +@Repository +@RequiredArgsConstructor +public class CheckoutGroupConfigManager extends BaseManager { +} diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/config/checkout/CheckoutGroupConfigMapper.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/config/checkout/CheckoutGroupConfigMapper.java new file mode 100644 index 00000000..37d5a1b1 --- /dev/null +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/config/checkout/CheckoutGroupConfigMapper.java @@ -0,0 +1,14 @@ +package org.dromara.daxpay.service.dao.config.checkout; + +import com.github.yulichang.base.MPJBaseMapper; +import org.apache.ibatis.annotations.Mapper; +import org.dromara.daxpay.service.entity.config.checkout.CheckoutGroupConfig; + +/** + * 收银台类目配置 + * @author xxm + * @since 2024/11/25 + */ +@Mapper +public interface CheckoutGroupConfigMapper extends MPJBaseMapper { +} diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/entity/config/CashierCodeConfig.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/entity/config/cashier/CashierCodeConfig.java similarity index 86% rename from daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/entity/config/CashierCodeConfig.java rename to daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/entity/config/cashier/CashierCodeConfig.java index 8794cb15..2e3b9d5b 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/entity/config/CashierCodeConfig.java +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/entity/config/cashier/CashierCodeConfig.java @@ -1,4 +1,4 @@ -package org.dromara.daxpay.service.entity.config; +package org.dromara.daxpay.service.entity.config.cashier; import cn.bootx.platform.common.mybatisplus.function.ToResult; import com.baomidou.mybatisplus.annotation.FieldStrategy; @@ -9,8 +9,8 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import org.dromara.daxpay.service.common.entity.MchAppBaseEntity; import org.dromara.daxpay.service.convert.config.CashierCodeConfigConvert; -import org.dromara.daxpay.service.param.config.CashierCodeConfigParam; -import org.dromara.daxpay.service.result.config.CashierCodeConfigResult; +import org.dromara.daxpay.service.param.config.cashier.CashierCodeConfigParam; +import org.dromara.daxpay.service.result.config.cashier.CashierCodeConfigResult; /** * 收银码牌配置 diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/entity/config/CashierCodeTypeConfig.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/entity/config/cashier/CashierCodeTypeConfig.java similarity index 87% rename from daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/entity/config/CashierCodeTypeConfig.java rename to daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/entity/config/cashier/CashierCodeTypeConfig.java index a96cce2c..2c588820 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/entity/config/CashierCodeTypeConfig.java +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/entity/config/cashier/CashierCodeTypeConfig.java @@ -1,4 +1,4 @@ -package org.dromara.daxpay.service.entity.config; +package org.dromara.daxpay.service.entity.config.cashier; import cn.bootx.platform.common.mybatisplus.function.ToResult; import com.baomidou.mybatisplus.annotation.TableName; @@ -10,8 +10,8 @@ import org.dromara.daxpay.core.enums.ChannelEnum; import org.dromara.daxpay.core.enums.PayMethodEnum; import org.dromara.daxpay.service.common.entity.MchAppBaseEntity; import org.dromara.daxpay.service.convert.config.CashierCodeTypeConfigConvert; -import org.dromara.daxpay.service.param.config.CashierCodeTypeConfigParam; -import org.dromara.daxpay.service.result.config.CashierCodeTypeConfigResult; +import org.dromara.daxpay.service.param.config.cashier.CashierCodeTypeConfigParam; +import org.dromara.daxpay.service.result.config.cashier.CashierCodeTypeConfigResult; /** * 特定类型码牌配置 diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/entity/config/checkout/CheckoutConfig.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/entity/config/checkout/CheckoutConfig.java new file mode 100644 index 00000000..512d07c8 --- /dev/null +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/entity/config/checkout/CheckoutConfig.java @@ -0,0 +1,20 @@ +package org.dromara.daxpay.service.entity.config.checkout; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.dromara.daxpay.service.common.entity.MchAppBaseEntity; + +/** + * 收银台配置 + * @author xxm + * @since 2024/11/22 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@Accessors(chain = true) +public class CheckoutConfig extends MchAppBaseEntity { + /** 收银台名称 */ + private String name; + +} diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/entity/config/checkout/CheckoutGroupConfig.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/entity/config/checkout/CheckoutGroupConfig.java new file mode 100644 index 00000000..4cad0e81 --- /dev/null +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/entity/config/checkout/CheckoutGroupConfig.java @@ -0,0 +1,26 @@ +package org.dromara.daxpay.service.entity.config.checkout; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.dromara.daxpay.service.common.entity.MchAppBaseEntity; + +/** + * 收银台类目配置 + * @author xxm + * @since 2024/11/25 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@Accessors(chain = true) +public class CheckoutGroupConfig extends MchAppBaseEntity { + + /** 类型 web/h5/小程序 */ + private String type; + + /** 名称 */ + private String name; + + /** 排序 */ + private Double sort; +} diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/entity/config/checkout/CheckoutItemConfig.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/entity/config/checkout/CheckoutItemConfig.java new file mode 100644 index 00000000..2f526495 --- /dev/null +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/entity/config/checkout/CheckoutItemConfig.java @@ -0,0 +1,41 @@ +package org.dromara.daxpay.service.entity.config.checkout; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.dromara.daxpay.core.enums.ChannelEnum; +import org.dromara.daxpay.core.enums.PayMethodEnum; +import org.dromara.daxpay.service.common.entity.MchAppBaseEntity; + +/** + * 收银台配置项 + * @author xxm + * @since 2024/11/25 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@Accessors(chain = true) +public class CheckoutItemConfig extends MchAppBaseEntity { + + /** 类目配置Id */ + private Long classifyId; + + /** 排序 */ + private Double sort; + + /** + * 支付通道 + * @see ChannelEnum + */ + private String channel; + + /** + * 支付方式 + * @see PayMethodEnum + */ + private String payMethod; + + /** 是否开启分账 */ + private boolean allocation; + +} diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/param/config/CashierCodeConfigParam.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/param/config/cashier/CashierCodeConfigParam.java similarity index 92% rename from daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/param/config/CashierCodeConfigParam.java rename to daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/param/config/cashier/CashierCodeConfigParam.java index 409339a1..fe5dd141 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/param/config/CashierCodeConfigParam.java +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/param/config/cashier/CashierCodeConfigParam.java @@ -1,4 +1,4 @@ -package org.dromara.daxpay.service.param.config; +package org.dromara.daxpay.service.param.config.cashier; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/param/config/CashierCodeTypeConfigParam.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/param/config/cashier/CashierCodeTypeConfigParam.java similarity index 95% rename from daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/param/config/CashierCodeTypeConfigParam.java rename to daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/param/config/cashier/CashierCodeTypeConfigParam.java index 1c35691c..7a6f49f7 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/param/config/CashierCodeTypeConfigParam.java +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/param/config/cashier/CashierCodeTypeConfigParam.java @@ -1,4 +1,4 @@ -package org.dromara.daxpay.service.param.config; +package org.dromara.daxpay.service.param.config.cashier; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/param/config/checkout/CheckoutGroupConfigParam.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/param/config/checkout/CheckoutGroupConfigParam.java new file mode 100644 index 00000000..3434493d --- /dev/null +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/param/config/checkout/CheckoutGroupConfigParam.java @@ -0,0 +1,16 @@ +package org.dromara.daxpay.service.param.config.checkout; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * 收银台分组配置参数 + * @author xxm + * @since 2024/11/26 + */ +@Data +@Accessors(chain = true) +@Schema(title = "收银台分组配置参数") +public class CheckoutGroupConfigParam { +} diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/param/config/checkout/CheckoutItemConfigParam.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/param/config/checkout/CheckoutItemConfigParam.java new file mode 100644 index 00000000..ea3d7e2c --- /dev/null +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/param/config/checkout/CheckoutItemConfigParam.java @@ -0,0 +1,16 @@ +package org.dromara.daxpay.service.param.config.checkout; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * 收银台配置项参数 + * @author xxm + * @since 2024/11/26 + */ +@Data +@Accessors(chain = true) +@Schema(title = "收银台配置项参数") +public class CheckoutItemConfigParam { +} diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/result/config/CashierCodeConfigResult.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/result/config/cashier/CashierCodeConfigResult.java similarity index 93% rename from daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/result/config/CashierCodeConfigResult.java rename to daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/result/config/cashier/CashierCodeConfigResult.java index 3a3fadb8..22e2110a 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/result/config/CashierCodeConfigResult.java +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/result/config/cashier/CashierCodeConfigResult.java @@ -1,4 +1,4 @@ -package org.dromara.daxpay.service.result.config; +package org.dromara.daxpay.service.result.config.cashier; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/result/config/CashierCodeTypeConfigResult.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/result/config/cashier/CashierCodeTypeConfigResult.java similarity index 96% rename from daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/result/config/CashierCodeTypeConfigResult.java rename to daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/result/config/cashier/CashierCodeTypeConfigResult.java index e44ef030..86a4d463 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/result/config/CashierCodeTypeConfigResult.java +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/result/config/cashier/CashierCodeTypeConfigResult.java @@ -1,4 +1,4 @@ -package org.dromara.daxpay.service.result.config; +package org.dromara.daxpay.service.result.config.cashier; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/result/config/checkout/CheckoutGroupConfigResult.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/result/config/checkout/CheckoutGroupConfigResult.java new file mode 100644 index 00000000..dc9cb230 --- /dev/null +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/result/config/checkout/CheckoutGroupConfigResult.java @@ -0,0 +1,19 @@ +package org.dromara.daxpay.service.result.config.checkout; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.dromara.daxpay.core.result.MchAppResult; + +/** + * 收银台分类配置 + * @author xxm + * @since 2024/11/26 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@Accessors(chain = true) +@Schema(title = "") +public class CheckoutGroupConfigResult extends MchAppResult { +} diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/result/config/checkout/CheckoutItemConfigResult.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/result/config/checkout/CheckoutItemConfigResult.java new file mode 100644 index 00000000..33b893fc --- /dev/null +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/result/config/checkout/CheckoutItemConfigResult.java @@ -0,0 +1,19 @@ +package org.dromara.daxpay.service.result.config.checkout; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.dromara.daxpay.core.result.MchAppResult; + +/** + * 收银台配置项 + * @author xxm + * @since 2024/11/26 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@Accessors(chain = true) +@Schema(title = "收银台配置项") +public class CheckoutItemConfigResult extends MchAppResult { +} diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/config/CashierCodeConfigService.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/config/CashierCodeConfigService.java index f11fdef0..14503bb3 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/config/CashierCodeConfigService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/config/CashierCodeConfigService.java @@ -10,13 +10,13 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.dromara.daxpay.core.exception.ConfigNotEnableException; import org.dromara.daxpay.core.result.cashier.CashierCodeResult; -import org.dromara.daxpay.service.dao.config.CashierCodeConfigManager; -import org.dromara.daxpay.service.dao.config.CashierCodeTypeConfigManager; -import org.dromara.daxpay.service.entity.config.CashierCodeConfig; -import org.dromara.daxpay.service.entity.config.CashierCodeTypeConfig; +import org.dromara.daxpay.service.dao.config.cashier.CashierCodeConfigManager; +import org.dromara.daxpay.service.dao.config.cashier.CashierCodeTypeConfigManager; +import org.dromara.daxpay.service.entity.config.cashier.CashierCodeConfig; +import org.dromara.daxpay.service.entity.config.cashier.CashierCodeTypeConfig; import org.dromara.daxpay.service.entity.config.PlatformConfig; -import org.dromara.daxpay.service.param.config.CashierCodeConfigParam; -import org.dromara.daxpay.service.result.config.CashierCodeConfigResult; +import org.dromara.daxpay.service.param.config.cashier.CashierCodeConfigParam; +import org.dromara.daxpay.service.result.config.cashier.CashierCodeConfigResult; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/config/CashierCodeTypeConfigService.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/config/CashierCodeTypeConfigService.java index 4ee86e37..664f4d10 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/config/CashierCodeTypeConfigService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/config/CashierCodeTypeConfigService.java @@ -6,12 +6,12 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.daxpay.service.dao.config.CashierCodeConfigManager; -import org.dromara.daxpay.service.dao.config.CashierCodeTypeConfigManager; -import org.dromara.daxpay.service.entity.config.CashierCodeConfig; -import org.dromara.daxpay.service.entity.config.CashierCodeTypeConfig; -import org.dromara.daxpay.service.param.config.CashierCodeTypeConfigParam; -import org.dromara.daxpay.service.result.config.CashierCodeTypeConfigResult; +import org.dromara.daxpay.service.dao.config.cashier.CashierCodeConfigManager; +import org.dromara.daxpay.service.dao.config.cashier.CashierCodeTypeConfigManager; +import org.dromara.daxpay.service.entity.config.cashier.CashierCodeConfig; +import org.dromara.daxpay.service.entity.config.cashier.CashierCodeTypeConfig; +import org.dromara.daxpay.service.param.config.cashier.CashierCodeTypeConfigParam; +import org.dromara.daxpay.service.result.config.cashier.CashierCodeTypeConfigResult; import org.springframework.stereotype.Service; import java.util.List;