mirror of
https://gitee.com/dromara/dax-pay.git
synced 2025-09-03 19:16:21 +00:00
feat(cashier): 改进收银台功能并新增支付码牌配置
- 将 CashierTypeEnum 重命名为 CashierCodeTypeEnum,用于表示收银码牌类型 - 新增 CashierCodeResult 类用于收银码牌信息和配置的结果 - 添加 CashierCodeConfig 相关的控制器、服务、DAO 和实体类 -移除 ChannelCashierConfig 相关的代码,改为使用 CashierCodeTypeConfig - 更新支付订单状态,新增待支付状态 - 调整 MPJ 依赖版本
This commit is contained in:
@@ -4,17 +4,17 @@ import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
|
||||
/**
|
||||
* 收银台类型
|
||||
* 字典: cashier_type
|
||||
* 收银码牌类型
|
||||
* 字典: cashier_code_type
|
||||
* @author xxm
|
||||
* @since 2024/9/28
|
||||
*/
|
||||
@Getter
|
||||
@AllArgsConstructor
|
||||
public enum CashierTypeEnum {
|
||||
public enum CashierCodeTypeEnum {
|
||||
|
||||
WECHAT_PAY("wechat_pay", "微信收银台"),
|
||||
ALIPAY("alipay", "支付宝收银台"),
|
||||
WECHAT_PAY("wechat_pay", "微信码牌"),
|
||||
ALIPAY("alipay", "支付宝码牌"),
|
||||
;
|
||||
|
||||
private final String code;
|
@@ -16,6 +16,7 @@ import java.util.Objects;
|
||||
@Getter
|
||||
@RequiredArgsConstructor
|
||||
public enum PayStatusEnum {
|
||||
WAIT("wait","待支付"),
|
||||
PROGRESS("progress","支付中"),
|
||||
SUCCESS("success","成功"),
|
||||
CLOSE("close","支付关闭"),
|
||||
|
@@ -0,0 +1,40 @@
|
||||
package org.dromara.daxpay.core.result.cashier;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
import lombok.experimental.Accessors;
|
||||
import org.dromara.daxpay.core.enums.ChannelEnum;
|
||||
import org.dromara.daxpay.core.enums.PayMethodEnum;
|
||||
|
||||
/**
|
||||
* 收银码牌信息和配置
|
||||
* @author xxm
|
||||
* @since 2024/11/20
|
||||
*/
|
||||
@Data
|
||||
@Accessors(chain = true)
|
||||
@Schema(title = "收银码牌信息和配置")
|
||||
public class CashierCodeResult {
|
||||
|
||||
/** 码牌名称 */
|
||||
@Schema(description = "码牌名称")
|
||||
private String name;
|
||||
|
||||
/** 模板编号 */
|
||||
@Schema(description = "模板编号")
|
||||
private String templateCode;
|
||||
|
||||
/**
|
||||
* 支付通道
|
||||
* @see ChannelEnum
|
||||
*/
|
||||
@Schema(description = "支付通道")
|
||||
private String channel;
|
||||
|
||||
/**
|
||||
* 支付方式
|
||||
* @see PayMethodEnum
|
||||
*/
|
||||
@Schema(description = "支付方式")
|
||||
private String payMethod;
|
||||
}
|
Reference in New Issue
Block a user