feat(config): 重构收银台配置模块

- 将 CashierCodeConfig 相关类移动到 config.cashier 包中- 新增 CheckoutConfig、CheckoutGroupConfig 和 CheckoutItemConfig 类
- 更新相关 Controller、Service 和 DAO层的包结构
- 修改 Task.md 文件中的任务列表

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.*;

daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/controller/config/CheckoutConfig.java

@@ -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 {
-}

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;
 

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;
 

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);
+
+
+}

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);
+}

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;

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;
 
 /**
  * 收银台码牌配置

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;

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 接口

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<CheckoutConfigMapper, CheckoutConfig> {
+}

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<CheckoutConfig> {
+}

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<CheckoutGroupConfigMapper, CheckoutGroupConfig> {
+}

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<CheckoutGroupConfig> {
+}

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;
 
 /**
  * 收银码牌配置

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;
 
 /**
  * 特定类型码牌配置

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;
+
+}

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;
+}

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;
+
+}

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;

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;

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 {
+}

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 {
+}

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;

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;

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 {
+}

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 {
+}

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;
 

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;