diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/DaxPayApplication.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/DaxPayApplication.java index b46079c14..3cac0a4eb 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/DaxPayApplication.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/DaxPayApplication.java @@ -18,7 +18,7 @@ import java.net.UnknownHostException; * DaxPay 支付开发平台 * * @author xxm - * @date 2023/4/20 + * @since 2023/4/20 */ @Slf4j @ConfigurationPropertiesScan diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/code/CachingCode.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/code/CachingCode.java index 43a29088f..325c9a28d 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/code/CachingCode.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/code/CachingCode.java @@ -4,7 +4,7 @@ package cn.bootx.platform.daxpay.code; * 支付服务缓存 * * @author xxm - * @date 2022/7/11 + * @since 2022/7/11 */ public interface CachingCode { diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/code/MchAndAppCode.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/code/MchAndAppCode.java index 4926cfe8d..4db744504 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/code/MchAndAppCode.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/code/MchAndAppCode.java @@ -4,7 +4,7 @@ package cn.bootx.platform.daxpay.code; * 商户和应用相关编码 * * @author xxm - * @date 2023/6/12 + * @since 2023/6/12 */ public interface MchAndAppCode { diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/code/PaymentErrorCode.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/code/PaymentErrorCode.java index 19f7d8171..e97f4ddd1 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/code/PaymentErrorCode.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/code/PaymentErrorCode.java @@ -4,7 +4,7 @@ package cn.bootx.platform.daxpay.code; * 错误码 * * @author xxm - * @date 2020/12/7 + * @since 2020/12/7 */ public interface PaymentErrorCode { diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/code/pay/PayChannelEnum.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/code/pay/PayChannelEnum.java index 06e510c7d..62816ca7c 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/code/pay/PayChannelEnum.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/code/pay/PayChannelEnum.java @@ -12,7 +12,7 @@ import java.util.Objects; * 支付通道枚举 * * @author xxm - * @date 2021/7/26 + * @since 2021/7/26 */ @Getter @RequiredArgsConstructor diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/code/pay/PayStatusCode.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/code/pay/PayStatusCode.java index 1a593768e..a9435a400 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/code/pay/PayStatusCode.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/code/pay/PayStatusCode.java @@ -4,7 +4,7 @@ package cn.bootx.platform.daxpay.code.pay; * 支付状态 * * @author xxm - * @date 2021/3/1 + * @since 2021/3/1 */ public interface PayStatusCode { diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/code/pay/PaySyncStatus.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/code/pay/PaySyncStatus.java index 92fa962fb..2995158b4 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/code/pay/PaySyncStatus.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/code/pay/PaySyncStatus.java @@ -4,7 +4,7 @@ package cn.bootx.platform.daxpay.code.pay; * 支付网关同步状态 * * @author xxm - * @date 2021/4/21 + * @since 2021/4/21 */ public interface PaySyncStatus { diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/code/pay/PayWayEnum.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/code/pay/PayWayEnum.java index 315b56723..26e70cfa8 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/code/pay/PayWayEnum.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/code/pay/PayWayEnum.java @@ -11,7 +11,7 @@ import java.util.Objects; * 支付方式 * * @author xxm - * @date 2021/7/26 + * @since 2021/7/26 */ @Getter @AllArgsConstructor diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/code/pay/PayWayExtraCode.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/code/pay/PayWayExtraCode.java index bfcee309c..aee3f2cb0 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/code/pay/PayWayExtraCode.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/code/pay/PayWayExtraCode.java @@ -4,7 +4,7 @@ package cn.bootx.platform.daxpay.code.pay; * 支付方式扩展字段 * * @author xxm - * @date 2022/2/27 + * @since 2022/2/27 */ public interface PayWayExtraCode { @@ -17,6 +17,9 @@ public interface PayWayExtraCode { /** 单张储值卡 */ String VOUCHER_NO = "voucher_no"; + /** 钱包ID */ + String WALLET_ID = "wallet_id"; + /** 同步通知路径 支付完成跳转的页面地址 */ String RETURN_URL = "return_url"; diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/code/paymodel/AliPayCode.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/code/paymodel/AliPayCode.java index 261a75dad..9c229ff8e 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/code/paymodel/AliPayCode.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/code/paymodel/AliPayCode.java @@ -4,7 +4,7 @@ package cn.bootx.platform.daxpay.code.paymodel; * 支付宝支付参数 * * @author xxm - * @date 2021/2/27 + * @since 2021/2/27 */ public interface AliPayCode { diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/code/paymodel/AliPayWay.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/code/paymodel/AliPayWay.java index 2e9dde690..65209b4f3 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/code/paymodel/AliPayWay.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/code/paymodel/AliPayWay.java @@ -12,7 +12,7 @@ import java.util.Objects; * 支付宝支付方式 * * @author xxm - * @date 2021/7/2 + * @since 2021/7/2 */ @UtilityClass public class AliPayWay { diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/code/paymodel/VoucherCode.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/code/paymodel/VoucherCode.java index c9fdda132..1eb270231 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/code/paymodel/VoucherCode.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/code/paymodel/VoucherCode.java @@ -4,7 +4,7 @@ package cn.bootx.platform.daxpay.code.paymodel; * 储值卡常量 * * @author xxm - * @date 2022/3/14 + * @since 2022/3/14 */ public interface VoucherCode { diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/code/paymodel/WalletCode.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/code/paymodel/WalletCode.java index 0df236496..aadd2ff6a 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/code/paymodel/WalletCode.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/code/paymodel/WalletCode.java @@ -4,66 +4,75 @@ package cn.bootx.platform.daxpay.code.paymodel; * 钱包涉及到的常量 * * @author xxm - * @date 2020/12/8 + * @since 2020/12/8 */ public interface WalletCode { /* 操作类型 */ /** 系统操作 */ - String OPERATION_SOURCE_SYSTEM = "1"; + String OPERATION_SOURCE_SYSTEM = "system"; /** 管理员操作 */ - String OPERATION_SOURCE_ADMIN = ""; + String OPERATION_SOURCE_ADMIN = "admin"; /** 用户操作 */ - String OPERATION_SOURCE_USER = "3"; + String OPERATION_SOURCE_USER = "user"; /* 钱包状态 */ /** 钱包状态-正常 */ - String STATUS_NORMAL = ""; + String STATUS_NORMAL = "normal"; /** 钱包状态-禁用 */ - String STATUS_FORBIDDEN = ""; + String STATUS_FORBIDDEN = "forbidden"; /* 日志类型 */ /** * 钱包日志-开通 */ - String LOG_ACTIVE = ""; + String LOG_ACTIVE = "active"; /** - * 钱包日志-主动充值 + * 钱包日志-Admin操作余额变动 */ - String LOG_RECHARGE = ""; + String LOG_ADMIN_CHANGER = "adminChanger"; /** - * 钱包日志-自动充值 + * 钱包日志-预冻结额度 */ - String LOG_AUTO_RECHARGE = ""; + String LOG_FREEZE_BALANCE = "freeze"; /** - * 钱包日志-Admin余额变动 + * 钱包日志-解冻额度 */ - String LOG_ADMIN_CHANGER = ""; + String LOG_UNFREEZE_BALANCE = "unfreeze"; /** - * 钱包日志-支付 + * 钱包日志-解冻并扣减余额 */ - String LOG_PAY = ""; + String LOG_REDUCE_AND_UNFREEZE_BALANCE = "reduceAndUnfreeze"; /** - * 钱包日志-系统扣除余额的日志 + * 钱包日志-直接支付 */ - String LOG_SYSTEM_REDUCE_BALANCE = ""; + String LOG_PAY = "pay"; + /** + * 钱包日志-取消支付 + */ + String LOG_CLOSE_PAY = "closePay"; /** * 钱包日志-退款 */ - String LOG_REFUND = ""; + String LOG_REFUND = "refund"; /** - * 钱包日志-取消支付返还 + * 锁定钱包 */ - String LOG_PAY_CLOSE = ""; + String LOG_LOCK = "lock"; + + /** + * 解锁钱包 + */ + String LOG_UNLOCK = "unlock"; } diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/code/paymodel/WeChatPayCode.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/code/paymodel/WeChatPayCode.java index 8818b1a85..c89c55057 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/code/paymodel/WeChatPayCode.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/code/paymodel/WeChatPayCode.java @@ -4,7 +4,7 @@ package cn.bootx.platform.daxpay.code.paymodel; * 微信参数 * * @author xxm - * @date 2021/6/21 + * @since 2021/6/21 */ public interface WeChatPayCode { diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/code/paymodel/WeChatPayWay.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/code/paymodel/WeChatPayWay.java index 03a4d5e66..4014fff5f 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/code/paymodel/WeChatPayWay.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/code/paymodel/WeChatPayWay.java @@ -12,7 +12,7 @@ import java.util.Objects; * 微信支付方式 * * @author xxm - * @date 2021/7/2 + * @since 2021/7/2 */ @UtilityClass public class WeChatPayWay { diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/configuration/PaymentRabbitMqConfiguration.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/configuration/PaymentRabbitMqConfiguration.java index 9dd04b640..ae4da542c 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/configuration/PaymentRabbitMqConfiguration.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/configuration/PaymentRabbitMqConfiguration.java @@ -12,7 +12,7 @@ import org.springframework.context.annotation.Configuration; * 消息队列配置 * * @author xxm - * @date 2021/6/25 + * @since 2021/6/25 */ @Configuration public class PaymentRabbitMqConfiguration { diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/AggregateController.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/AggregateController.java index bb308d97a..325dab579 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/AggregateController.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/AggregateController.java @@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController; * 聚合支付 * * @author xxm - * @date 2022/3/6 + * @since 2022/3/6 */ @IgnoreAuth @Tag(name = "聚合支付") diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/AlipayConfigController.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/AlipayConfigController.java index 049dd8e44..8376adbe3 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/AlipayConfigController.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/AlipayConfigController.java @@ -18,7 +18,7 @@ import java.util.List; /** * @author xxm - * @date 2021/2/26 + * @since 2021/2/26 */ @Tag(name = "支付宝配置") @RestController diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/CashierController.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/CashierController.java index 65ad023bb..4b694f6c0 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/CashierController.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/CashierController.java @@ -20,7 +20,7 @@ import static org.springframework.http.HttpHeaders.USER_AGENT; /** * @author xxm - * @date 2022/2/23 + * @since 2022/2/23 */ @IgnoreAuth @Tag(name = "结算台") diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/MchApplicationController.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/MchApplicationController.java index b10547e3f..ccf17af33 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/MchApplicationController.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/MchApplicationController.java @@ -20,7 +20,7 @@ import java.util.List; * 商户应用 * * @author xxm - * @date 2023-05-23 + * @since 2023-05-23 */ @Tag(name = "商户应用") @RestController diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/MerchantInfoController.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/MerchantInfoController.java index f29b7fab7..422b33341 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/MerchantInfoController.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/MerchantInfoController.java @@ -19,7 +19,7 @@ import java.util.List; * 商户 * * @author xxm - * @date 2023-05-17 + * @since 2023-05-17 */ @Tag(name = "商户") @RestController diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/PayCallbackController.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/PayCallbackController.java index 4d3e73911..490eef248 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/PayCallbackController.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/PayCallbackController.java @@ -21,7 +21,7 @@ import java.util.Map; /** * @author xxm - * @date 2021/2/27 + * @since 2021/2/27 */ @IgnoreAuth @Slf4j diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/PayChannelConfigController.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/PayChannelConfigController.java index e6a0b66ed..68bf3ddc1 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/PayChannelConfigController.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/PayChannelConfigController.java @@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.*; * 支付通道配置 * * @author xxm - * @date 2023-05-24 + * @since 2023-05-24 */ @Tag(name = "支付通道配置") @RestController diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/PayController.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/PayController.java index 49c0f3c98..950d31c75 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/PayController.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/PayController.java @@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController; /** * @author xxm - * @date 2020/12/9 + * @since 2020/12/9 */ @Tag(name = "统一支付") @RestController diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/PayNotifyRecordController.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/PayNotifyRecordController.java index 6767270b0..74dfc00e7 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/PayNotifyRecordController.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/PayNotifyRecordController.java @@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController; * 回调记录 * * @author xxm - * @date 2021/7/22 + * @since 2021/7/22 */ @Tag(name = "支付回调记录") @RestController diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/PaymentController.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/PaymentController.java index d5908581a..7db5b8209 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/PaymentController.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/PaymentController.java @@ -20,7 +20,7 @@ import java.util.List; /** * @author xxm - * @date 2021/6/28 + * @since 2021/6/28 */ @Tag(name = "支付记录") @RestController diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/RefundRecordController.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/RefundRecordController.java index ab05e6471..e79a7320e 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/RefundRecordController.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/RefundRecordController.java @@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController; * 退款记录 * * @author xxm - * @date 2022/3/3 + * @since 2022/3/3 */ @Tag(name = "退款记录") @RestController diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/VoucherController.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/VoucherController.java index d75762677..ecbdf84a3 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/VoucherController.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/VoucherController.java @@ -18,7 +18,7 @@ import java.util.List; /** * @author xxm - * @date 2022/3/14 + * @since 2022/3/14 */ @Tag(name = "储值卡") @RestController diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/WalletController.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/WalletController.java index 3819a5d19..287a9c695 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/WalletController.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/WalletController.java @@ -24,11 +24,11 @@ import java.util.List; * 钱包 * * @author xxm - * @date 2021/2/24 + * @since 2021/2/24 */ @Tag(name = "钱包相关的接口") @RestController -@RequestMapping("wallet") +@RequestMapping("/wallet") @AllArgsConstructor public class WalletController { diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/WalletLogController.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/WalletLogController.java index 94479b0eb..0ba1afeeb 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/WalletLogController.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/WalletLogController.java @@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController; * 钱包日志相关接口 * * @author xxm - * @date 2020/12/8 + * @since 2020/12/8 */ @Tag(name = "钱包日志相关的接口") @RestController diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/WeChatPayConfigController.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/WeChatPayConfigController.java index 5dcc41be4..246ebe530 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/WeChatPayConfigController.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/WeChatPayConfigController.java @@ -17,7 +17,7 @@ import java.util.List; /** * @author xxm - * @date 2021/3/19 + * @since 2021/3/19 */ @Tag(name = "微信支付配置") @RestController diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/aggregate/entity/AggregatePayInfo.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/aggregate/entity/AggregatePayInfo.java index 0012db560..b56bb2c2e 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/aggregate/entity/AggregatePayInfo.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/aggregate/entity/AggregatePayInfo.java @@ -9,7 +9,7 @@ import java.math.BigDecimal; * 聚合支付发起信息 * * @author xxm - * @date 2022/3/5 + * @since 2022/3/5 */ @Data @Accessors(chain = true) diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/aggregate/service/AggregateService.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/aggregate/service/AggregateService.java index d818eb1c8..497216809 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/aggregate/service/AggregateService.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/aggregate/service/AggregateService.java @@ -18,7 +18,7 @@ import java.util.Optional; * 聚合支付 * * @author xxm - * @date 2022/3/6 + * @since 2022/3/6 */ @Slf4j @Service diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/cashier/service/CashierService.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/cashier/service/CashierService.java index 68af74511..13bf9b90a 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/cashier/service/CashierService.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/cashier/service/CashierService.java @@ -43,7 +43,7 @@ import java.util.*; * 结算台 * * @author xxm - * @date 2022/2/23 + * @since 2022/2/23 */ @Slf4j @Service @@ -79,6 +79,7 @@ public class CashierService { map.put(PayWayExtraCode.AUTH_CODE, param.getAuthCode()); map.put(PayWayExtraCode.OPEN_ID, param.getOpenId()); map.put(PayWayExtraCode.VOUCHER_NO, param.getVoucherNo()); + map.put(PayWayExtraCode.WALLET_ID, param.getWalletId()); String extraParamsJson = PayWaylUtil.buildExtraParamsJson(param.getPayChannel(), map); payWayParam.setExtraParamsJson(extraParamsJson); diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/convert/AlipayConvert.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/convert/AlipayConvert.java index 542051b6c..3b2f6e38a 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/convert/AlipayConvert.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/convert/AlipayConvert.java @@ -10,7 +10,7 @@ import org.mapstruct.factory.Mappers; * 支付宝转换 * * @author xxm - * @date 2021/7/5 + * @since 2021/7/5 */ @Mapper public interface AlipayConvert { diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/dao/AliPaymentManager.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/dao/AliPaymentManager.java index 863eb255f..666e1e512 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/dao/AliPaymentManager.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/dao/AliPaymentManager.java @@ -12,7 +12,7 @@ import java.util.Optional; * 支付宝 * * @author xxm - * @date 2021/2/26 + * @since 2021/2/26 */ @Repository @RequiredArgsConstructor diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/dao/AliPaymentMapper.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/dao/AliPaymentMapper.java index 62d95574a..72fbeec2c 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/dao/AliPaymentMapper.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/dao/AliPaymentMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * 支付宝支付 * * @author xxm - * @date 2021/2/26 + * @since 2021/2/26 */ @Mapper public interface AliPaymentMapper extends BaseMapper { diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/dao/AlipayConfigManager.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/dao/AlipayConfigManager.java index af8ab0c5b..82ca22188 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/dao/AlipayConfigManager.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/dao/AlipayConfigManager.java @@ -16,7 +16,7 @@ import java.util.Optional; * 支付宝配置 * * @author xxm - * @date 2021/2/26 + * @since 2021/2/26 */ @Repository @RequiredArgsConstructor diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/entity/AliPayment.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/entity/AliPayment.java index 0e2021ab4..85267aae5 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/entity/AliPayment.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/entity/AliPayment.java @@ -13,7 +13,7 @@ import lombok.experimental.Accessors; * 支付宝支付记录 * * @author xxm - * @date 2021/2/26 + * @since 2021/2/26 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/entity/AlipayConfig.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/entity/AlipayConfig.java index 7fd4a0ffa..cf78ea0b1 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/entity/AlipayConfig.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/entity/AlipayConfig.java @@ -26,7 +26,7 @@ import lombok.experimental.Accessors; * 支付宝支付配置 * * @author xxm - * @date 2020/12/15 + * @since 2020/12/15 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/service/AliPayCallbackService.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/service/AliPayCallbackService.java index d11975c20..f02fb438d 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/service/AliPayCallbackService.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/service/AliPayCallbackService.java @@ -28,7 +28,7 @@ import java.util.Objects; * 支付宝回调处理 * * @author xxm - * @date 2021/2/28 + * @since 2021/2/28 */ @Slf4j @Service diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/service/AliPayCancelService.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/service/AliPayCancelService.java index d2ea695e9..4a0a0570a 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/service/AliPayCancelService.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/service/AliPayCancelService.java @@ -24,7 +24,7 @@ import java.util.Objects; * 支付宝支付取消和退款 * * @author xxm - * @date 2021/4/20 + * @since 2021/4/20 */ @Slf4j @Service diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/service/AliPayService.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/service/AliPayService.java index 9e448697c..eecf277dc 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/service/AliPayService.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/service/AliPayService.java @@ -39,7 +39,7 @@ import static cn.bootx.platform.daxpay.code.paymodel.AliPayCode.QUICK_MSECURITY_ * 支付宝支付service * * @author xxm - * @date 2021/2/26 + * @since 2021/2/26 */ @Slf4j @Service diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/service/AliPaymentService.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/service/AliPaymentService.java index 600c6770e..9892220e9 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/service/AliPaymentService.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/service/AliPaymentService.java @@ -27,7 +27,7 @@ import java.util.Optional; * 支付宝支付记录 * * @author xxm - * @date 2021/2/26 + * @since 2021/2/26 */ @Slf4j @Service diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/service/AlipayConfigService.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/service/AlipayConfigService.java index 81e6645e5..f41f2de13 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/service/AlipayConfigService.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/service/AlipayConfigService.java @@ -32,7 +32,7 @@ import java.util.stream.Collectors; * 支付宝支付 * * @author xxm - * @date 2020/12/15 + * @since 2020/12/15 */ @Slf4j @Service diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/service/AlipaySyncService.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/service/AlipaySyncService.java index 53744a606..10170207c 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/service/AlipaySyncService.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/service/AlipaySyncService.java @@ -19,7 +19,7 @@ import java.util.Objects; * 支付宝同步 * * @author xxm - * @date 2021/5/17 + * @since 2021/5/17 */ @Slf4j @Service diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/base/entity/BasePayment.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/base/entity/BasePayment.java index b7ac726e6..d10282e29 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/base/entity/BasePayment.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/base/entity/BasePayment.java @@ -13,7 +13,7 @@ import java.time.LocalDateTime; * 基础支付记录类 * * @author xxm - * @date 2021/2/25 + * @since 2021/2/25 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/cash/dao/CashPaymentManager.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/cash/dao/CashPaymentManager.java index 7c73280e3..bc23d52af 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/cash/dao/CashPaymentManager.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/cash/dao/CashPaymentManager.java @@ -12,7 +12,7 @@ import java.util.Optional; * 现金支付 * * @author xxm - * @date 2021/6/23 + * @since 2021/6/23 */ @Slf4j @Repository diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/cash/dao/CashPaymentMapper.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/cash/dao/CashPaymentMapper.java index c88a88c3d..141b11384 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/cash/dao/CashPaymentMapper.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/cash/dao/CashPaymentMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * 现金支付 * * @author xxm - * @date 2021/6/23 + * @since 2021/6/23 */ @Mapper public interface CashPaymentMapper extends BaseMapper { diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/cash/entity/CashPayment.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/cash/entity/CashPayment.java index 77c3de49d..7d8bfc420 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/cash/entity/CashPayment.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/cash/entity/CashPayment.java @@ -10,7 +10,7 @@ import lombok.experimental.Accessors; * 现金支付记录 * * @author xxm - * @date 2021/6/23 + * @since 2021/6/23 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/cash/service/CashService.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/cash/service/CashService.java index 56c1da88b..0294f6cbb 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/cash/service/CashService.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/cash/service/CashService.java @@ -18,7 +18,7 @@ import java.util.Optional; * 现金支付 * * @author xxm - * @date 2021/6/23 + * @since 2021/6/23 */ @Slf4j @Service diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/config/convert/PayChannelConfigConvert.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/config/convert/PayChannelConfigConvert.java index 69fefb63b..d1b7d3002 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/config/convert/PayChannelConfigConvert.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/config/convert/PayChannelConfigConvert.java @@ -10,7 +10,7 @@ import org.mapstruct.factory.Mappers; * 支付通道配置 * * @author xxm - * @date 2023-05-24 + * @since 2023-05-24 */ @Mapper public interface PayChannelConfigConvert { @@ -21,4 +21,4 @@ public interface PayChannelConfigConvert { PayChannelConfigDto convert(PayChannelConfig in); -} \ No newline at end of file +} diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/config/dao/PayChannelConfigManager.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/config/dao/PayChannelConfigManager.java index 75b0929da..d4e9aa199 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/config/dao/PayChannelConfigManager.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/config/dao/PayChannelConfigManager.java @@ -18,7 +18,7 @@ import java.util.List; * 支付通道配置 * * @author xxm - * @date 2023-05-24 + * @since 2023-05-24 */ @Repository @RequiredArgsConstructor diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/config/dao/PayChannelConfigMapper.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/config/dao/PayChannelConfigMapper.java index 37f0c2799..b83fe2055 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/config/dao/PayChannelConfigMapper.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/config/dao/PayChannelConfigMapper.java @@ -8,9 +8,9 @@ import org.apache.ibatis.annotations.Mapper; * 支付通道配置 * * @author xxm - * @date 2023-05-24 + * @since 2023-05-24 */ @Mapper public interface PayChannelConfigMapper extends BaseMapper { -} \ No newline at end of file +} diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/config/entity/PayChannelConfig.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/config/entity/PayChannelConfig.java index c0890e64b..cf59cfb97 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/config/entity/PayChannelConfig.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/config/entity/PayChannelConfig.java @@ -16,7 +16,7 @@ import lombok.experimental.Accessors; * 支付通道配置 * * @author xxm - * @date 2023-05-24 + * @since 2023-05-24 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/config/service/PayChannelConfigService.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/config/service/PayChannelConfigService.java index ca60109e7..74e7c8025 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/config/service/PayChannelConfigService.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/config/service/PayChannelConfigService.java @@ -19,7 +19,7 @@ import org.springframework.stereotype.Service; * 支付通道配置 * * @author xxm - * @date 2023-05-24 + * @since 2023-05-24 */ @Slf4j @Service diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/union/convert/UnionPayConvert.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/union/convert/UnionPayConvert.java index 2d3adcac4..4f697cb34 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/union/convert/UnionPayConvert.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/union/convert/UnionPayConvert.java @@ -7,7 +7,7 @@ import org.mapstruct.factory.Mappers; /** * @author xxm - * @date 2022/3/11 + * @since 2022/3/11 */ @Mapper public interface UnionPayConvert { diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/union/dao/UnionPayConfigManager.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/union/dao/UnionPayConfigManager.java index b3c369573..6bded1d82 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/union/dao/UnionPayConfigManager.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/union/dao/UnionPayConfigManager.java @@ -8,7 +8,7 @@ import org.springframework.stereotype.Repository; /** * @author xxm - * @date 2022/3/11 + * @since 2022/3/11 */ @Slf4j @Repository diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/union/dao/UnionPayConfigMapper.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/union/dao/UnionPayConfigMapper.java index 14b92177f..9a65f7956 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/union/dao/UnionPayConfigMapper.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/union/dao/UnionPayConfigMapper.java @@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper; /** * @author xxm - * @date 2022/3/11 + * @since 2022/3/11 */ @Mapper public interface UnionPayConfigMapper extends BaseMapper { diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/union/dao/UnionPaymentManager.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/union/dao/UnionPaymentManager.java index 0104d91ca..84e0af5b4 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/union/dao/UnionPaymentManager.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/union/dao/UnionPaymentManager.java @@ -8,7 +8,7 @@ import org.springframework.stereotype.Repository; /** * @author xxm - * @date 2022/3/11 + * @since 2022/3/11 */ @Slf4j @Repository diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/union/dao/UnionPaymentMapper.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/union/dao/UnionPaymentMapper.java index 6381d9c24..455d9d77c 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/union/dao/UnionPaymentMapper.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/union/dao/UnionPaymentMapper.java @@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper; /** * @author xxm - * @date 2022/3/11 + * @since 2022/3/11 */ @Mapper public interface UnionPaymentMapper extends BaseMapper { diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/union/entity/UnionPayConfig.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/union/entity/UnionPayConfig.java index 08d144d6e..3910dc7b7 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/union/entity/UnionPayConfig.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/union/entity/UnionPayConfig.java @@ -13,7 +13,7 @@ import lombok.experimental.Accessors; * 云闪付 * * @author xxm - * @date 2022/3/11 + * @since 2022/3/11 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/union/entity/UnionPayment.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/union/entity/UnionPayment.java index d1abb5b25..dcd7b1b64 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/union/entity/UnionPayment.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/union/entity/UnionPayment.java @@ -8,7 +8,7 @@ import lombok.experimental.Accessors; /** * @author xxm - * @date 2022/3/11 + * @since 2022/3/11 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/union/service/UnionPayConfigService.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/union/service/UnionPayConfigService.java index 89ceb6ce7..27d60b821 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/union/service/UnionPayConfigService.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/union/service/UnionPayConfigService.java @@ -7,7 +7,7 @@ import org.springframework.stereotype.Service; /** * @author xxm - * @date 2022/3/11 + * @since 2022/3/11 */ @Slf4j @Service diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/union/service/UnionPayService.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/union/service/UnionPayService.java index 250b7c60c..12b11f15a 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/union/service/UnionPayService.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/union/service/UnionPayService.java @@ -6,7 +6,7 @@ import org.springframework.stereotype.Service; /** * @author xxm - * @date 2022/3/11 + * @since 2022/3/11 */ @Slf4j @Service diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/union/service/UnionPaymentService.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/union/service/UnionPaymentService.java index daf8717ce..0305898f7 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/union/service/UnionPaymentService.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/union/service/UnionPaymentService.java @@ -6,7 +6,7 @@ import org.springframework.stereotype.Service; /** * @author xxm - * @date 2022/3/11 + * @since 2022/3/11 */ @Slf4j @Service diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/convert/VoucherConvert.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/convert/VoucherConvert.java index 7fcda84c7..1d854b07b 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/convert/VoucherConvert.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/convert/VoucherConvert.java @@ -9,7 +9,7 @@ import org.mapstruct.factory.Mappers; /** * @author xxm - * @date 2022/3/14 + * @since 2022/3/14 */ @Mapper public interface VoucherConvert { diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/dao/VoucherLogManager.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/dao/VoucherLogManager.java index 4d2642a63..93cfcf5f6 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/dao/VoucherLogManager.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/dao/VoucherLogManager.java @@ -10,7 +10,7 @@ import java.util.List; /** * @author xxm - * @date 2022/3/19 + * @since 2022/3/19 */ @Slf4j @Repository diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/dao/VoucherLogMapper.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/dao/VoucherLogMapper.java index 57b3985df..7c89a04c7 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/dao/VoucherLogMapper.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/dao/VoucherLogMapper.java @@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper; /** * @author xxm - * @date 2022/3/19 + * @since 2022/3/19 */ @Mapper public interface VoucherLogMapper extends BaseMapper { diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/dao/VoucherManager.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/dao/VoucherManager.java index 19f4b6431..4ecdadb2a 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/dao/VoucherManager.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/dao/VoucherManager.java @@ -18,7 +18,7 @@ import java.util.Optional; /** * @author xxm - * @date 2022/3/14 + * @since 2022/3/14 */ @Slf4j @Repository diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/dao/VoucherMapper.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/dao/VoucherMapper.java index 47ddc20e8..63e52bc73 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/dao/VoucherMapper.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/dao/VoucherMapper.java @@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper; /** * @author xxm - * @date 2022/3/14 + * @since 2022/3/14 */ @Mapper public interface VoucherMapper extends BaseMapper { diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/dao/VoucherPaymentManager.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/dao/VoucherPaymentManager.java index 0eb1d52fa..d7fb54e9d 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/dao/VoucherPaymentManager.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/dao/VoucherPaymentManager.java @@ -10,7 +10,7 @@ import java.util.Optional; /** * @author xxm - * @date 2022/3/14 + * @since 2022/3/14 */ @Slf4j @Repository diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/dao/VoucherPaymentMapper.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/dao/VoucherPaymentMapper.java index 721b4bb8e..dc337a690 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/dao/VoucherPaymentMapper.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/dao/VoucherPaymentMapper.java @@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper; /** * @author xxm - * @date 2022/3/14 + * @since 2022/3/14 */ @Mapper public interface VoucherPaymentMapper extends BaseMapper { diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/entity/Voucher.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/entity/Voucher.java index 752fb3cfb..3a093eede 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/entity/Voucher.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/entity/Voucher.java @@ -17,7 +17,7 @@ import java.time.LocalDateTime; * 储值卡 * * @author xxm - * @date 2022/3/14 + * @since 2022/3/14 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/entity/VoucherLog.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/entity/VoucherLog.java index ba02e726d..db3dcb425 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/entity/VoucherLog.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/entity/VoucherLog.java @@ -13,7 +13,7 @@ import java.math.BigDecimal; * 储值卡日志 * * @author xxm - * @date 2022/3/17 + * @since 2022/3/17 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/entity/VoucherPayment.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/entity/VoucherPayment.java index 96c332cd4..f45c8e937 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/entity/VoucherPayment.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/entity/VoucherPayment.java @@ -13,7 +13,7 @@ import lombok.experimental.Accessors; * 储值卡支付记录 * * @author xxm - * @date 2022/3/14 + * @since 2022/3/14 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/service/VoucherLogService.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/service/VoucherLogService.java index d064127c4..ae0f60f9d 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/service/VoucherLogService.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/service/VoucherLogService.java @@ -9,7 +9,7 @@ import org.springframework.stereotype.Service; * 储值卡日志 * * @author xxm - * @date 2022/3/19 + * @since 2022/3/19 */ @Slf4j @Service diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/service/VoucherPayService.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/service/VoucherPayService.java index 2451ef573..84f1d214b 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/service/VoucherPayService.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/service/VoucherPayService.java @@ -34,7 +34,7 @@ import java.util.stream.Collectors; * 储值卡支付 * * @author xxm - * @date 2022/3/14 + * @since 2022/3/14 */ @Slf4j @Service diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/service/VoucherPaymentService.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/service/VoucherPaymentService.java index 2bfedbe27..bffe467f7 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/service/VoucherPaymentService.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/service/VoucherPaymentService.java @@ -24,7 +24,7 @@ import java.util.stream.Collectors; * 储值卡支付记录 * * @author xxm - * @date 2022/3/14 + * @since 2022/3/14 */ @Slf4j @Service diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/service/VoucherQueryService.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/service/VoucherQueryService.java index a3711846d..743ef4cf6 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/service/VoucherQueryService.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/service/VoucherQueryService.java @@ -16,7 +16,7 @@ import org.springframework.stereotype.Service; * 储值卡查询 * * @author xxm - * @date 2022/3/14 + * @since 2022/3/14 */ @Slf4j @Service diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/service/VoucherService.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/service/VoucherService.java index 0a931e78f..16b33e615 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/service/VoucherService.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/service/VoucherService.java @@ -23,7 +23,7 @@ import java.util.stream.Collectors; * 储值卡 * * @author xxm - * @date 2022/3/14 + * @since 2022/3/14 */ @Slf4j @Service diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/convert/WalletConvert.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/convert/WalletConvert.java index f85e5fa2b..70714337c 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/convert/WalletConvert.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/convert/WalletConvert.java @@ -13,7 +13,7 @@ import org.mapstruct.factory.Mappers; * 转换 * * @author xxm - * @date 2021/8/20 + * @since 2021/8/20 */ @Mapper public interface WalletConvert { diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/dao/WalletLogManager.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/dao/WalletLogManager.java index b9863038c..dbceb0eb3 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/dao/WalletLogManager.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/dao/WalletLogManager.java @@ -17,7 +17,7 @@ import java.util.Optional; * 钱包日志 * * @author xxm - * @date 2020/12/8 + * @since 2020/12/8 */ @Repository @RequiredArgsConstructor diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/dao/WalletLogMapper.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/dao/WalletLogMapper.java index b6edac9fd..9fabe6ede 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/dao/WalletLogMapper.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/dao/WalletLogMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * 钱包日志 * * @author xxm - * @date 2020/12/8 + * @since 2020/12/8 */ @Mapper public interface WalletLogMapper extends BaseMapper { diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/dao/WalletManager.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/dao/WalletManager.java index ff07aa60d..ed92cf3c6 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/dao/WalletManager.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/dao/WalletManager.java @@ -25,7 +25,7 @@ import java.util.stream.Collectors; * 钱包管理 * * @author xxm - * @date 2020/12/8 + * @since 2020/12/8 */ @Repository @RequiredArgsConstructor @@ -34,14 +34,25 @@ public class WalletManager extends BaseManager { private final WalletMapper walletMapper; /** - * 增加余额 - * @param walletId 钱包 + * 预占额度 + * @param walletId 钱包ID * @param amount 金额 * @return 更新数量 */ - public int increaseBalance(Long walletId, BigDecimal amount) { + public int freezeBalance(Long walletId, BigDecimal amount){ Long userId = SecurityUtil.getUserIdOrDefaultId(); - return walletMapper.increaseBalance(walletId, amount, userId, LocalDateTime.now()); + return walletMapper.freezeBalance(walletId, amount, userId, LocalDateTime.now()); + } + + /** + * 解冻金额 + * @param walletId 钱包ID + * @param amount 金额 + * @return 更新数量 + */ + public int unfreezeBalance(Long walletId, BigDecimal amount){ + Long userId = SecurityUtil.getUserIdOrDefaultId(); + return walletMapper.unfreezeBalance(walletId, amount, userId, LocalDateTime.now()); } /** @@ -56,9 +67,31 @@ public class WalletManager extends BaseManager { } /** - * 扣减余额-允许扣成负数 + * 扣减余额同时解除预冻结的额度 * @param walletId 钱包ID * @param amount 扣减金额 + * @return 操作条数 + */ + public int reduceAndUnfreezeBalance(Long walletId, BigDecimal amount) { + Long userId = SecurityUtil.getUserIdOrDefaultId(); + return walletMapper.reduceAndUnfreezeBalance(walletId, amount, userId, LocalDateTime.now()); + } + + /** + * 增加余额 + * @param walletId 钱包 + * @param amount 金额 + * @return 更新数量 + */ + public int increaseBalance(Long walletId, BigDecimal amount) { + Long userId = SecurityUtil.getUserIdOrDefaultId(); + return walletMapper.increaseBalance(walletId, amount, userId, LocalDateTime.now()); + } + + /** + * 更改余额-允许扣成负数 + * @param walletId 钱包ID + * @param amount 更改的额度, 正数增加,负数减少 * @return 剩余条数 */ public int reduceBalanceUnlimited(Long walletId, BigDecimal amount) { @@ -66,13 +99,6 @@ public class WalletManager extends BaseManager { return walletMapper.reduceBalanceUnlimited(walletId, amount, userId, LocalDateTime.now()); } - /** - * 更新钱包状态 - */ - public void setUpStatus(Long walletId, String status) { - lambdaUpdate().eq(Wallet::getId, walletId).set(Wallet::getStatus, status).update(); - } - /** * 用户钱包是否存在 */ diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/dao/WalletMapper.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/dao/WalletMapper.java index c4725a198..20958eecd 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/dao/WalletMapper.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/dao/WalletMapper.java @@ -16,11 +16,56 @@ import java.time.LocalDateTime; * 钱包 * * @author xxm - * @date 2021/2/24 + * @since 2021/2/24 */ @Mapper public interface WalletMapper extends BaseMapper { + /** + * 预冻结余额 + * @param walletId 钱包ID + * @param amount 冻结的额度 + * @param operator 操作人 + * @param date 时间 + * @return 更新数量 + */ + int freezeBalance(@Param("walletId") Long walletId, @Param("amount") BigDecimal amount, + @Param("operator") Long operator, @Param("date") LocalDateTime date); + + /** + * 解冻金额 + * @param walletId 钱包ID + * @param amount 冻结的额度 + * @param operator 操作人 + * @param date 时间 + * @return 更新数量 + */ + int unfreezeBalance(@Param("walletId") Long walletId, @Param("amount") BigDecimal amount, + @Param("operator") Long operator, @Param("date") LocalDateTime date); + + /** + * 释放预占额度 + * @param walletId 钱包ID + * @param amount 要释放的额度 + * @param operator 操作人 + * @param date 操作时间 + * @return 操作条数 + */ + int reduceBalance(@Param("walletId") Long walletId, @Param("amount") BigDecimal amount, + @Param("operator") Long operator, @Param("date") LocalDateTime date); + + /** + * 扣减余额同时解除预冻结的额度 + * @param walletId 钱包ID + * @param amount 减少的额度 + * @param operator 操作人 + * @param date 操作时间 + * @return 操作条数 + */ + int reduceAndUnfreezeBalance(@Param("walletId") Long walletId, @Param("amount") BigDecimal amount, + @Param("operator") Long operator, @Param("date") LocalDateTime date); + + /** * 增加余额 * @param walletId 钱包ID @@ -30,29 +75,18 @@ public interface WalletMapper extends BaseMapper { * @return 更新数量 */ int increaseBalance(@Param("walletId") Long walletId, @Param("amount") BigDecimal amount, - @Param("operator") Long operator, @Param("date") LocalDateTime date); + @Param("operator") Long operator, @Param("date") LocalDateTime date); /** - * 减少余额 + * 扣减余额,允许扣成负数 * @param walletId 钱包ID - * @param amount 减少的额度 - * @param operator 操作人 - * @param date 操作时间 - * @return 操作条数 - */ - int reduceBalance(@Param("walletId") Long walletId, @Param("amount") BigDecimal amount, - @Param("operator") Long operator, @Param("date") LocalDateTime date); - - /** - * 减少余额,允许扣成负数 - * @param walletId 钱包ID - * @param amount 减少的额度 + * @param amount 更改的额度, 正数增加,负数减少 * @param operator 操作人 * @param date 操作时间 * @return 操作条数 */ int reduceBalanceUnlimited(@Param("walletId") Long walletId, @Param("amount") BigDecimal amount, - @Param("operator") Long operator, @Param("date") LocalDateTime date); + @Param("operator") Long operator, @Param("date") LocalDateTime date); /** * 待开通钱包的用户列表 diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/entity/Wallet.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/entity/Wallet.java index 5897bb876..ba647f948 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/entity/Wallet.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/entity/Wallet.java @@ -2,8 +2,10 @@ package cn.bootx.platform.daxpay.core.channel.wallet.entity; import cn.bootx.mybatis.table.modify.annotation.DbColumn; import cn.bootx.mybatis.table.modify.annotation.DbTable; +import cn.bootx.mybatis.table.modify.mybatis.mysq.annotation.DbMySqlIndex; import cn.bootx.platform.common.core.function.EntityBaseFunction; import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; +import cn.bootx.platform.daxpay.code.paymodel.WalletCode; import cn.bootx.platform.daxpay.core.channel.wallet.convert.WalletConvert; import cn.bootx.platform.daxpay.dto.channel.wallet.WalletDto; import com.baomidou.mybatisplus.annotation.TableName; @@ -17,7 +19,7 @@ import java.math.BigDecimal; * 钱包 * * @author xxm - * @date 2020/12/8 + * @since 2020/12/8 */ @EqualsAndHashCode(callSuper = true) @Data @@ -27,6 +29,7 @@ import java.math.BigDecimal; public class Wallet extends MpBaseEntity implements EntityBaseFunction { /** 关联用户id */ + @DbMySqlIndex @DbColumn(comment = "关联用户id") private Long userId; @@ -36,9 +39,12 @@ public class Wallet extends MpBaseEntity implements EntityBaseFunction { + Optional walletOpt = walletManager.findById(walletPayment.getWalletId()); + if (!walletOpt.isPresent()) { + log.error("钱包出现恶性问题,需要人工排查"); + return; + } + Wallet wallet = walletOpt.get(); + walletPayment.setPayStatus(PayStatusCode.TRADE_CANCEL); + walletPaymentManager.save(walletPayment); + // 支付余额 + int i = walletManager.reduceAndUnfreezeBalance(wallet.getId(), walletPayment.getAmount()); + // 判断操作结果 + if (i < 1) { + throw new WalletLackOfBalanceException(); + } + // 日志 + WalletLog walletLog = new WalletLog().setWalletId(wallet.getId()) + .setUserId(wallet.getUserId()) + .setPaymentId(walletPayment.getPaymentId()) + .setAmount(walletPayment.getAmount()) + .setType(WalletCode.LOG_REDUCE_AND_UNFREEZE_BALANCE) + .setRemark(String.format("钱包扣款金额 %.2f ", walletPayment.getAmount())) + .setOperationSource(WalletCode.OPERATION_SOURCE_USER) + .setBusinessId(walletPayment.getBusinessId()); + walletLogManager.save(walletLog); + }); + } + + /** + * 直接进行支付 + */ + public void pay(BigDecimal amount, Payment payment, Wallet wallet){ + // 直接扣减余额 + int i = walletManager.reduceBalance(wallet.getId(), amount); + + // 判断操作结果 + if (i < 1) { + throw new WalletLackOfBalanceException(); + } + // 日志 + WalletLog walletLog = new WalletLog().setWalletId(wallet.getId()) + .setUserId(wallet.getUserId()) + .setPaymentId(payment.getId()) + .setAmount(amount) + .setType(WalletCode.LOG_PAY) + .setRemark(String.format("钱包支付金额 %.2f ", amount)) + .setOperationSource(WalletCode.OPERATION_SOURCE_USER) + .setBusinessId(payment.getBusinessId()); + walletLogManager.save(walletLog); + } + + /** + * 取消支付, 可配置解除冻结金额 + * @param freeze 是否是冻结模式, 是的话对冻结金额进行解冻, 不是的话返还扣减的金额 + */ + public void close(Long paymentId,boolean freeze) { // 钱包支付记录 walletPaymentManager.findByPaymentId(paymentId).ifPresent(walletPayment -> { Optional walletOpt = walletManager.findById(walletPayment.getWalletId()); @@ -78,18 +134,24 @@ public class WalletPayService { walletPayment.setPayStatus(PayStatusCode.TRADE_CANCEL); walletPaymentManager.save(walletPayment); - // 金额返还 - walletManager.increaseBalance(wallet.getId(), walletPayment.getAmount()); + // 是否在进行了额度冻结 + if (freeze){ + // 解冻金额 + walletManager.unfreezeBalance(wallet.getId(), walletPayment.getAmount()); + } else { + // 金额返还 + walletManager.increaseBalance(wallet.getId(), walletPayment.getAmount()); + } // 记录日志 WalletLog walletLog = new WalletLog().setAmount(walletPayment.getAmount()) - .setPaymentId(walletPayment.getPaymentId()) - .setWalletId(wallet.getId()) - .setUserId(wallet.getUserId()) - .setType(WalletCode.LOG_PAY_CLOSE) - .setRemark(String.format("取消支付返回金额 %.2f ", walletPayment.getAmount())) - .setOperationSource(WalletCode.OPERATION_SOURCE_SYSTEM) - .setBusinessId(walletPayment.getBusinessId()); + .setPaymentId(walletPayment.getPaymentId()) + .setWalletId(wallet.getId()) + .setUserId(wallet.getUserId()) + .setType(freeze?WalletCode.LOG_CLOSE_PAY:WalletCode.LOG_UNFREEZE_BALANCE) + .setRemark(String.format("取消支付金额 %.2f ", walletPayment.getAmount())) + .setOperationSource(WalletCode.OPERATION_SOURCE_SYSTEM) + .setBusinessId(walletPayment.getBusinessId()); // save log walletLogManager.save(walletLog); }); diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/service/WalletPaymentService.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/service/WalletPaymentService.java index 4e04d8877..892a810f5 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/service/WalletPaymentService.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/service/WalletPaymentService.java @@ -21,7 +21,7 @@ import java.util.Optional; * 钱包交易记录的相关操作 * * @author xxm - * @date 2020/12/8 + * @since 2020/12/8 */ @Slf4j @Service diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/service/WalletQueryService.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/service/WalletQueryService.java index a9e262d1a..d9064a1e5 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/service/WalletQueryService.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/service/WalletQueryService.java @@ -22,7 +22,7 @@ import org.springframework.stereotype.Service; * 钱包 * * @author xxm - * @date 2022/3/11 + * @since 2022/3/11 */ @Slf4j @Service diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/service/WalletService.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/service/WalletService.java index 13ef522bf..b7b5a8a7d 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/service/WalletService.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/service/WalletService.java @@ -9,10 +9,8 @@ import cn.bootx.platform.daxpay.core.channel.wallet.dao.WalletManager; import cn.bootx.platform.daxpay.core.channel.wallet.entity.Wallet; import cn.bootx.platform.daxpay.core.channel.wallet.entity.WalletLog; import cn.bootx.platform.daxpay.exception.waller.WalletBannedException; -import cn.bootx.platform.daxpay.exception.waller.WalletLogError; import cn.bootx.platform.daxpay.exception.waller.WalletNotExistsException; import cn.bootx.platform.daxpay.param.channel.wallet.WalletRechargeParam; -import com.google.common.collect.Lists; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -27,7 +25,7 @@ import java.util.stream.Collectors; * 钱包的相关操作 * * @author xxm - * @date 2020/12/8 + * @since 2020/12/8 */ @Slf4j @Service @@ -47,57 +45,82 @@ public class WalletService { if (walletManager.existsByUser(userId)) { throw new BizException("钱包已经开通"); } - Wallet wallet = new Wallet().setUserId(userId).setBalance(BigDecimal.ZERO).setStatus(WalletCode.STATUS_NORMAL); + Wallet wallet = new Wallet().setUserId(userId) + .setBalance(BigDecimal.ZERO) + .setFreezeBalance(BigDecimal.ZERO) + .setStatus(WalletCode.STATUS_NORMAL); walletManager.save(wallet); // 激活 log WalletLog activeLog = new WalletLog().setWalletId(wallet.getId()) - .setUserId(wallet.getUserId()) - .setType(WalletCode.LOG_ACTIVE) - .setRemark("激活钱包") - .setOperationSource(WalletCode.OPERATION_SOURCE_USER); + .setUserId(wallet.getUserId()) + .setType(WalletCode.LOG_ACTIVE) + .setRemark("激活钱包") + .setOperationSource(WalletCode.OPERATION_SOURCE_USER); walletLogManager.save(activeLog); } /** * 批量开通 */ + @Transactional(rollbackFor = Exception.class) public void createWalletBatch(List userIds) { // 查询出 List existUserIds = walletManager.findExistUserIds(userIds); userIds.removeAll(existUserIds); List wallets = userIds.stream() - .map(userId -> new Wallet().setUserId(userId) - .setStatus(WalletCode.STATUS_NORMAL) - .setBalance(BigDecimal.ZERO)) - .collect(Collectors.toList()); + .map(userId -> new Wallet().setUserId(userId) + .setStatus(WalletCode.STATUS_NORMAL) + .setFreezeBalance(BigDecimal.ZERO) + .setBalance(BigDecimal.ZERO)) + .collect(Collectors.toList()); walletManager.saveAll(wallets); List walletLogs = wallets.stream() - .map(wallet -> new WalletLog().setWalletId(wallet.getId()) - .setUserId(wallet.getUserId()) - .setAmount(BigDecimal.ZERO) - .setType(WalletCode.LOG_ACTIVE) - .setRemark("激活钱包") - .setOperationSource(WalletCode.OPERATION_SOURCE_USER)) - .collect(Collectors.toList()); + .map(wallet -> new WalletLog().setWalletId(wallet.getId()) + .setUserId(wallet.getUserId()) + .setAmount(BigDecimal.ZERO) + .setType(WalletCode.LOG_ACTIVE) + .setRemark("激活钱包") + .setOperationSource(WalletCode.OPERATION_SOURCE_USER)) + .collect(Collectors.toList()); walletLogManager.saveAll(walletLogs); } /** * 锁定钱包 */ + @Transactional(rollbackFor = Exception.class) public void lock(Long walletId) { - walletManager.setUpStatus(walletId, WalletCode.STATUS_FORBIDDEN); + Wallet wallet = walletManager.findById(walletId).orElseThrow(DataNotExistException::new); + wallet.setStatus(WalletCode.STATUS_FORBIDDEN); + walletManager.updateById(wallet); + // 激活 log + WalletLog log = new WalletLog().setWalletId(wallet.getId()) + .setUserId(wallet.getUserId()) + .setType(WalletCode.LOG_LOCK) + .setRemark("锁定钱包") + .setOperationSource(WalletCode.OPERATION_SOURCE_ADMIN); + walletLogManager.save(log); } /** * 解锁钱包 */ + @Transactional(rollbackFor = Exception.class) public void unlock(Long walletId) { - walletManager.setUpStatus(walletId, WalletCode.STATUS_NORMAL); + Wallet wallet = walletManager.findById(walletId).orElseThrow(DataNotExistException::new); + wallet.setStatus(WalletCode.STATUS_NORMAL); + walletManager.updateById(wallet); + // 激活 log + WalletLog log = new WalletLog().setWalletId(wallet.getId()) + .setUserId(wallet.getUserId()) + .setType(WalletCode.LOG_UNLOCK) + .setRemark("解锁钱包") + .setOperationSource(WalletCode.OPERATION_SOURCE_ADMIN); + walletLogManager.save(log); } /** - * 充值操作 也可以扣款 + * 更改余额 也可以扣款 */ @Transactional(rollbackFor = Exception.class) public void changerBalance(WalletRechargeParam param) { @@ -112,57 +135,14 @@ public class WalletService { } Wallet wallet = walletManager.findById(param.getWalletId()).orElseThrow(DataNotExistException::new); WalletLog walletLog = new WalletLog().setAmount(param.getAmount()) - .setWalletId(wallet.getId()) - .setType(WalletCode.LOG_ADMIN_CHANGER) - .setUserId(wallet.getUserId()) - .setRemark(String.format("系统变动余额 %.2f ", param.getAmount())) - .setOperationSource(WalletCode.OPERATION_SOURCE_ADMIN); + .setWalletId(wallet.getId()) + .setType(WalletCode.LOG_ADMIN_CHANGER) + .setUserId(wallet.getUserId()) + .setRemark(String.format("系统变动余额 %.2f ", param.getAmount())) + .setOperationSource(WalletCode.OPERATION_SOURCE_ADMIN); walletLogManager.save(walletLog); } - /** - * 根据支付单对钱包充值的余额进行扣减 - */ - @Transactional(rollbackFor = Exception.class) - public void deductedBalanceByPaymentId(Long paymentId, Long orderId, String remark, Boolean isThrowError) { - - // 根据支付记录ID查询交易的金额和交易的钱包ID - WalletLog walletLog = walletLogManager.findFirstByPayment(paymentId).orElseThrow(DataNotExistException::new); - if (walletLog == null) { - return; - } - - // 充值类型 - List chargeLogType = Lists.newArrayList(WalletCode.LOG_RECHARGE, WalletCode.LOG_AUTO_RECHARGE, - WalletCode.LOG_ADMIN_CHANGER); - - // 保证是充值类型 且充值金额大于0 - if (!chargeLogType.contains(walletLog.getType()) - || BigDecimalUtil.compareTo(walletLog.getAmount(), BigDecimal.ZERO) < 0) { - log.warn("退款 发现非充值交易，日志ID:{},交易类型:{}", walletLog.getId(), walletLog.getType()); - if (isThrowError) { - throw new WalletLogError(); - } - return; - } - - // 获取钱包ID 并扣减对应金额(允许扣成负数) - walletManager.reduceBalanceUnlimited(walletLog.getWalletId(), walletLog.getAmount()); - - // 记录日志 - WalletLog log = new WalletLog().setWalletId(walletLog.getWalletId()) - .setUserId(walletLog.getUserId()) - .setPaymentId(paymentId) - .setAmount(walletLog.getAmount()) - .setType(WalletCode.LOG_SYSTEM_REDUCE_BALANCE) - .setRemark(String.format("系统减少余额 %.2f (" + remark + ")", walletLog.getAmount())) - .setOperationSource(WalletCode.OPERATION_SOURCE_SYSTEM) - .setPaymentId(paymentId) - .setBusinessId(String.valueOf(orderId)); - walletLogManager.save(log); - - } - /** * 查询钱包，如果钱包不存在或者钱包被禁用将抛出异常 */ @@ -188,5 +168,4 @@ public class WalletService { } return wallet; } - } diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/convert/WeChatConvert.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/convert/WeChatConvert.java index 177a7a37c..d6e19e031 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/convert/WeChatConvert.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/convert/WeChatConvert.java @@ -12,7 +12,7 @@ import org.mapstruct.factory.Mappers; * 微信转换类 * * @author xxm - * @date 2021/6/21 + * @since 2021/6/21 */ @Mapper public interface WeChatConvert { diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/dao/WeChatPayConfigManager.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/dao/WeChatPayConfigManager.java index c72edc966..43b88ca33 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/dao/WeChatPayConfigManager.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/dao/WeChatPayConfigManager.java @@ -18,7 +18,7 @@ import java.util.Optional; * 微信支付配置 * * @author xxm - * @date 2021/3/19 + * @since 2021/3/19 */ @Repository @RequiredArgsConstructor diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/dao/WeChatPayConfigMapper.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/dao/WeChatPayConfigMapper.java index 86083c6ae..fb61adec3 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/dao/WeChatPayConfigMapper.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/dao/WeChatPayConfigMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * 微信支付配置 * * @author xxm - * @date 2021/3/19 + * @since 2021/3/19 */ @Mapper public interface WeChatPayConfigMapper extends BaseMapper { diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/dao/WeChatPaymentManager.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/dao/WeChatPaymentManager.java index 6d0ac0a03..c1503af00 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/dao/WeChatPaymentManager.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/dao/WeChatPaymentManager.java @@ -12,7 +12,7 @@ import java.util.Optional; * 微信支付记录 * * @author xxm - * @date 2021/6/21 + * @since 2021/6/21 */ @Slf4j @Repository diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/entity/WeChatPayConfig.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/entity/WeChatPayConfig.java index d4b6ef00f..ed0ccc912 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/entity/WeChatPayConfig.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/entity/WeChatPayConfig.java @@ -23,7 +23,7 @@ import lombok.experimental.Accessors; * 微信支付配置 * * @author xxm - * @date 2021/3/1 + * @since 2021/3/1 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/entity/WeChatPayment.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/entity/WeChatPayment.java index 5246b30a4..4a7d68e07 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/entity/WeChatPayment.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/entity/WeChatPayment.java @@ -11,7 +11,7 @@ import lombok.experimental.Accessors; /** * @author xxm - * @date 2021/6/21 + * @since 2021/6/21 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/service/WeChatPayCallbackService.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/service/WeChatPayCallbackService.java index d21f565a4..f86de3ef3 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/service/WeChatPayCallbackService.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/service/WeChatPayCallbackService.java @@ -26,7 +26,7 @@ import static cn.bootx.platform.daxpay.code.paymodel.WeChatPayCode.APPID; * 微信支付回调 * * @author xxm - * @date 2021/6/21 + * @since 2021/6/21 */ @Slf4j @Service diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/service/WeChatPayCancelService.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/service/WeChatPayCancelService.java index a854e2d5f..be1939b26 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/service/WeChatPayCancelService.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/service/WeChatPayCancelService.java @@ -32,7 +32,7 @@ import static cn.bootx.platform.daxpay.code.pay.PayStatusCode.REFUND_PROCESS_FAI * 微信支付关闭和退款 * * @author xxm - * @date 2021/6/21 + * @since 2021/6/21 */ @Slf4j @Service diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/service/WeChatPayConfigService.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/service/WeChatPayConfigService.java index 8e4e5ee08..217aeafa7 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/service/WeChatPayConfigService.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/service/WeChatPayConfigService.java @@ -32,7 +32,7 @@ import java.util.stream.Collectors; * 微信支付配置 * * @author xxm - * @date 2021/3/5 + * @since 2021/3/5 */ @Slf4j @Service diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/service/WeChatPayService.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/service/WeChatPayService.java index deae6d882..1b3c15b06 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/service/WeChatPayService.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/service/WeChatPayService.java @@ -43,7 +43,7 @@ import static cn.bootx.platform.daxpay.code.pay.PaySyncStatus.WAIT_BUYER_PAY; * 微信支付 * * @author xxm - * @date 2021/3/2 + * @since 2021/3/2 */ @Slf4j @Service diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/service/WeChatPaySyncService.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/service/WeChatPaySyncService.java index d474fdee8..1b9986137 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/service/WeChatPaySyncService.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/service/WeChatPaySyncService.java @@ -19,7 +19,7 @@ import java.util.Objects; * 微信支付同步服务 * * @author xxm - * @date 2021/6/21 + * @since 2021/6/21 */ @Slf4j @Service diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/service/WeChatPaymentService.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/service/WeChatPaymentService.java index abdebb5c8..37d8db7fe 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/service/WeChatPaymentService.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/service/WeChatPaymentService.java @@ -27,7 +27,7 @@ import java.util.Optional; * 微信支付记录单 * * @author xxm - * @date 2021/6/21 + * @since 2021/6/21 */ @Slf4j @Service diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/convert/MchApplicationConvert.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/convert/MchApplicationConvert.java index bad40a86b..d7fd3dd21 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/convert/MchApplicationConvert.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/convert/MchApplicationConvert.java @@ -10,7 +10,7 @@ import org.mapstruct.factory.Mappers; * 商户应用 * * @author xxm - * @date 2023-05-19 + * @since 2023-05-19 */ @Mapper public interface MchApplicationConvert { diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/convert/MerchantInfoConvert.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/convert/MerchantInfoConvert.java index 358d945de..d7e8c6a3e 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/convert/MerchantInfoConvert.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/convert/MerchantInfoConvert.java @@ -10,7 +10,7 @@ import org.mapstruct.factory.Mappers; * 商户 * * @author xxm - * @date 2023-05-17 + * @since 2023-05-17 */ @Mapper public interface MerchantInfoConvert { @@ -21,4 +21,4 @@ public interface MerchantInfoConvert { MerchantInfoDto convert(MerchantInfo in); -} \ No newline at end of file +} diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/dao/MchAppManager.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/dao/MchAppManager.java index a0ce6cdf2..982dcffa3 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/dao/MchAppManager.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/dao/MchAppManager.java @@ -17,7 +17,7 @@ import java.util.Optional; * 商户应用 * * @author xxm - * @date 2023-05-23 + * @since 2023-05-23 */ @Repository @RequiredArgsConstructor diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/dao/MchAppPayConfigManager.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/dao/MchAppPayConfigManager.java index b2c538fd1..b0aa49dbd 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/dao/MchAppPayConfigManager.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/dao/MchAppPayConfigManager.java @@ -9,7 +9,7 @@ import org.springframework.stereotype.Repository; * 商户应用支付配置 * * @author xxm - * @date 2023-05-19 + * @since 2023-05-19 */ @Repository @RequiredArgsConstructor diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/dao/MchAppPayConfigMapper.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/dao/MchAppPayConfigMapper.java index fd11b878c..35436aea5 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/dao/MchAppPayConfigMapper.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/dao/MchAppPayConfigMapper.java @@ -8,9 +8,9 @@ import org.apache.ibatis.annotations.Mapper; * 商户应用支付配置 * * @author xxm - * @date 2023-05-19 + * @since 2023-05-19 */ @Mapper public interface MchAppPayConfigMapper extends BaseMapper { -} \ No newline at end of file +} diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/dao/MchApplicationMapper.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/dao/MchApplicationMapper.java index 72a551c65..6854f7c95 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/dao/MchApplicationMapper.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/dao/MchApplicationMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * 商户应用 * * @author xxm - * @date 2023-05-19 + * @since 2023-05-19 */ @Mapper public interface MchApplicationMapper extends BaseMapper { diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/dao/MerchantInfoManager.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/dao/MerchantInfoManager.java index da8c5af69..fd56defa5 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/dao/MerchantInfoManager.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/dao/MerchantInfoManager.java @@ -20,7 +20,7 @@ import java.util.stream.Collectors; * 商户 * * @author xxm - * @date 2023-05-17 + * @since 2023-05-17 */ @Repository @RequiredArgsConstructor diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/dao/MerchantInfoMapper.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/dao/MerchantInfoMapper.java index 07f7c2dcc..58fdd010c 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/dao/MerchantInfoMapper.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/dao/MerchantInfoMapper.java @@ -8,9 +8,9 @@ import org.apache.ibatis.annotations.Mapper; * 商户 * * @author xxm - * @date 2023-05-17 + * @since 2023-05-17 */ @Mapper public interface MerchantInfoMapper extends BaseMapper { -} \ No newline at end of file +} diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/entity/MchAppPayConfig.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/entity/MchAppPayConfig.java index 19b590e4a..2e644293d 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/entity/MchAppPayConfig.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/entity/MchAppPayConfig.java @@ -13,7 +13,7 @@ import lombok.experimental.Accessors; * 商户应用支付配置 * * @author xxm - * @date 2023-05-19 + * @since 2023-05-19 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/entity/MchApplication.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/entity/MchApplication.java index df7adf38e..00b7b6510 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/entity/MchApplication.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/entity/MchApplication.java @@ -21,7 +21,7 @@ import lombok.experimental.FieldNameConstants; * 商户应用 * * @author xxm - * @date 2023-05-19 + * @since 2023-05-19 */ @DbTable(comment = "商户应用") @EqualsAndHashCode(callSuper = true) diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/entity/MerchantInfo.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/entity/MerchantInfo.java index b19b27eca..57496b2fd 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/entity/MerchantInfo.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/entity/MerchantInfo.java @@ -23,7 +23,7 @@ import static cn.bootx.platform.daxpay.core.merchant.entity.MerchantInfo.Fields. * 商户 * * @author xxm - * @date 2023-05-17 + * @since 2023-05-17 */ @DbMySqlIndex(fields = code, type = MySqlIndexType.UNIQUE, comment = "商户号唯一索引") @EqualsAndHashCode(callSuper = true) diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/service/MchAppPayConfigService.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/service/MchAppPayConfigService.java index 8feacce6f..3f498b0fa 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/service/MchAppPayConfigService.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/service/MchAppPayConfigService.java @@ -19,7 +19,7 @@ import java.util.stream.Collectors; * 商户应用支付配置 * * @author xxm - * @date 2023-05-19 + * @since 2023-05-19 */ @Slf4j @Service diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/service/MchAppService.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/service/MchAppService.java index 0400055e4..43537fed9 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/service/MchAppService.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/service/MchAppService.java @@ -26,7 +26,7 @@ import java.util.Objects; * 商户应用 * * @author xxm - * @date 2023-05-19 + * @since 2023-05-19 */ @Slf4j @Service diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/service/MerchantInfoService.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/service/MerchantInfoService.java index e7ed48940..f15265176 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/service/MerchantInfoService.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/service/MerchantInfoService.java @@ -22,7 +22,7 @@ import java.util.List; * 商户 * * @author xxm - * @date 2023-05-17 + * @since 2023-05-17 */ @Slf4j @Service diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/notify/convert/PayNotifyConvert.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/notify/convert/PayNotifyConvert.java index b1ec444ef..a5bacce71 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/notify/convert/PayNotifyConvert.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/notify/convert/PayNotifyConvert.java @@ -9,7 +9,7 @@ import org.mapstruct.factory.Mappers; * 转换 * * @author xxm - * @date 2021/6/22 + * @since 2021/6/22 */ @Mapper public interface PayNotifyConvert { diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/notify/dao/PayNotifyRecordManager.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/notify/dao/PayNotifyRecordManager.java index e48f11e2d..0715a5d04 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/notify/dao/PayNotifyRecordManager.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/notify/dao/PayNotifyRecordManager.java @@ -17,7 +17,7 @@ import java.util.Objects; * 支付消息通知回调 * * @author xxm - * @date 2021/6/22 + * @since 2021/6/22 */ @Slf4j @Repository diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/notify/entity/PayNotifyRecord.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/notify/entity/PayNotifyRecord.java index 8916f49d9..8b021531a 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/notify/entity/PayNotifyRecord.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/notify/entity/PayNotifyRecord.java @@ -21,7 +21,7 @@ import java.time.LocalDateTime; * 回调记录 * * @author xxm - * @date 2021/6/22 + * @since 2021/6/22 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/notify/service/PayNotifyRecordService.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/notify/service/PayNotifyRecordService.java index 731c65527..cf3778179 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/notify/service/PayNotifyRecordService.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/notify/service/PayNotifyRecordService.java @@ -16,7 +16,7 @@ import org.springframework.stereotype.Service; * 回调记录 * * @author xxm - * @date 2021/7/5 + * @since 2021/7/5 */ @Slf4j @Service diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/builder/PayEventBuilder.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/builder/PayEventBuilder.java index ede4922c5..5f68455b7 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/builder/PayEventBuilder.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/builder/PayEventBuilder.java @@ -10,7 +10,7 @@ import lombok.experimental.UtilityClass; * 支付事件生成器 * * @author xxm - * @date 2022/7/11 + * @since 2022/7/11 */ @UtilityClass public class PayEventBuilder { diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/builder/PaymentBuilder.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/builder/PaymentBuilder.java index c233fca87..77e670b8b 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/builder/PaymentBuilder.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/builder/PaymentBuilder.java @@ -26,7 +26,7 @@ import java.util.stream.Collectors; * 支付对象构建器 * * @author xxm - * @date 2021/2/25 + * @since 2021/2/25 */ @UtilityClass public class PaymentBuilder { diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/convert/PayConvert.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/convert/PayConvert.java index f249de022..3f77f8105 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/convert/PayConvert.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/convert/PayConvert.java @@ -9,7 +9,7 @@ import org.mapstruct.factory.Mappers; * 支付对象转换 * * @author xxm - * @date 2022/3/2 + * @since 2022/3/2 */ @Mapper public interface PayConvert { diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/exception/BaseException.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/exception/BaseException.java index 0deaac774..2e3f77c11 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/exception/BaseException.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/exception/BaseException.java @@ -4,7 +4,7 @@ package cn.bootx.platform.daxpay.core.pay.exception; * 支付异常信息 * * @author xxm - * @date 2020/12/9 + * @since 2020/12/9 */ public interface BaseException { diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/exception/ExceptionInfo.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/exception/ExceptionInfo.java index b9c068f94..caca086d2 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/exception/ExceptionInfo.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/exception/ExceptionInfo.java @@ -6,7 +6,7 @@ import lombok.experimental.Accessors; /** * @author xxm - * @date 2021/5/24 + * @since 2021/5/24 */ @Data @Accessors(chain = true) diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/factory/PayStrategyFactory.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/factory/PayStrategyFactory.java index 726d33c55..c324af684 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/factory/PayStrategyFactory.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/factory/PayStrategyFactory.java @@ -20,7 +20,7 @@ import static cn.bootx.platform.daxpay.code.pay.PayChannelEnum.*; * 支付策略工厂 * * @author xxm - * @date 2020/12/11 + * @since 2020/12/11 */ public class PayStrategyFactory { diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/func/AbsPayCallbackStrategy.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/func/AbsPayCallbackStrategy.java index fcaa3d056..4e249a0f9 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/func/AbsPayCallbackStrategy.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/func/AbsPayCallbackStrategy.java @@ -19,7 +19,7 @@ import java.util.Map; * 支付回调处理抽象接口 * * @author xxm - * @date 2021/6/21 + * @since 2021/6/21 */ @Slf4j @RequiredArgsConstructor diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/func/AbsPayStrategy.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/func/AbsPayStrategy.java index 6f0e353a1..ecee4d857 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/func/AbsPayStrategy.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/func/AbsPayStrategy.java @@ -16,7 +16,7 @@ import java.util.Map; * 抽象支付策略基类 同步支付 异步支付 错误处理 关闭支付 撤销支付 支付网关同步 退款 * * @author xxm - * @date 2020/12/11 + * @since 2020/12/11 */ @Getter @Setter diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/func/PayStrategyConsumer.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/func/PayStrategyConsumer.java index c35566b66..8705016c0 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/func/PayStrategyConsumer.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/func/PayStrategyConsumer.java @@ -8,7 +8,7 @@ import java.util.List; * 支付策略接口 * * @author xxm - * @date 2020/12/9 + * @since 2020/12/9 */ @FunctionalInterface public interface PayStrategyConsumer, S extends Payment> { diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/local/AsyncPayInfoLocal.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/local/AsyncPayInfoLocal.java index cfef25cc0..e801eeec1 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/local/AsyncPayInfoLocal.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/local/AsyncPayInfoLocal.java @@ -7,7 +7,7 @@ import com.alibaba.ttl.TransmittableThreadLocal; * 异步支付线程变量 * * @author xxm - * @date 2021/4/21 + * @since 2021/4/21 */ public final class AsyncPayInfoLocal { diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/local/AsyncRefundLocal.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/local/AsyncRefundLocal.java index 56b7cdece..82a11c373 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/local/AsyncRefundLocal.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/local/AsyncRefundLocal.java @@ -6,7 +6,7 @@ import com.alibaba.ttl.TransmittableThreadLocal; * 异步退款线程变量 * * @author xxm - * @date 2022/3/9 + * @since 2022/3/9 */ public final class AsyncRefundLocal { diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/result/PayCallbackResult.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/result/PayCallbackResult.java index f5134b90d..229e115b3 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/result/PayCallbackResult.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/result/PayCallbackResult.java @@ -8,7 +8,7 @@ import lombok.experimental.Accessors; * 支付回调处理结果 * * @author xxm - * @date 2021/6/22 + * @since 2021/6/22 */ @Data @Accessors(chain = true) diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/result/PaySyncResult.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/result/PaySyncResult.java index 39c6387f4..fa0bd5d4a 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/result/PaySyncResult.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/result/PaySyncResult.java @@ -12,7 +12,7 @@ import static cn.bootx.platform.daxpay.code.pay.PaySyncStatus.NOT_SYNC; * 支付网关通知状态对象 * * @author xxm - * @date 2021/4/21 + * @since 2021/4/21 */ @Data @Accessors(chain = true) diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/service/PayCallbackService.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/service/PayCallbackService.java index 28084552c..1802431b6 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/service/PayCallbackService.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/service/PayCallbackService.java @@ -31,7 +31,7 @@ import java.util.stream.Collectors; * 支付回调处理 * * @author xxm - * @date 2021/2/27 + * @since 2021/2/27 */ @Slf4j @Service diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/service/PayCancelService.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/service/PayCancelService.java index f71f7573a..c2abdaa07 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/service/PayCancelService.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/service/PayCancelService.java @@ -28,7 +28,7 @@ import static cn.bootx.platform.daxpay.code.pay.PayStatusCode.*; * 取消订单处理 * * @author xxm - * @date 2021/3/2 + * @since 2021/3/2 */ @Slf4j @Service diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/service/PayExpiredTimeService.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/service/PayExpiredTimeService.java index 49cd088b4..bda102f3d 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/service/PayExpiredTimeService.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/service/PayExpiredTimeService.java @@ -31,7 +31,7 @@ import static cn.bootx.platform.daxpay.code.pay.PayStatusCode.*; * 支付超时处理 * * @author xxm - * @date 2022/7/13 + * @since 2022/7/13 */ @Slf4j @Service diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/service/PayRefundService.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/service/PayRefundService.java index 054ddbde6..809edc9a6 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/service/PayRefundService.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/service/PayRefundService.java @@ -48,7 +48,7 @@ import static cn.bootx.platform.daxpay.code.pay.PayStatusCode.*; * 支付退款 * * @author xxm - * @date 2022/2/26 + * @since 2022/2/26 */ @Slf4j @Service diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/service/PayService.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/service/PayService.java index f8c235126..c296f99af 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/service/PayService.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/service/PayService.java @@ -41,7 +41,7 @@ import static cn.bootx.platform.daxpay.code.pay.PayStatusCode.*; * 支付流程 * * @author xxm - * @date 2020/12/9 + * @since 2020/12/9 */ @Slf4j @Service diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/service/PaySyncService.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/service/PaySyncService.java index 7e689ce70..b746b8348 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/service/PaySyncService.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/service/PaySyncService.java @@ -30,7 +30,7 @@ import static cn.bootx.platform.daxpay.code.pay.PayStatusCode.*; * 未完成的异步支付单与支付网关进行对比 * * @author xxm - * @date 2021/4/21 + * @since 2021/4/21 */ @Slf4j @Service diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/strategy/AliPayStrategy.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/strategy/AliPayStrategy.java index a5bca85a5..ec7fb22fa 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/strategy/AliPayStrategy.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/strategy/AliPayStrategy.java @@ -39,7 +39,7 @@ import static org.springframework.beans.factory.config.BeanDefinition.SCOPE_PROT * 支付宝支付 * * @author xxm - * @date 2021/2/27 + * @since 2021/2/27 */ @Scope(SCOPE_PROTOTYPE) @Component diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/strategy/CashPayStrategy.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/strategy/CashPayStrategy.java index de2f3f113..672f987df 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/strategy/CashPayStrategy.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/strategy/CashPayStrategy.java @@ -20,7 +20,7 @@ import static org.springframework.beans.factory.config.BeanDefinition.SCOPE_PROT * 现金支付 * * @author xxm - * @date 2021/6/23 + * @since 2021/6/23 */ @Slf4j @Scope(SCOPE_PROTOTYPE) diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/strategy/UnionPayStrategy.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/strategy/UnionPayStrategy.java index 985a31230..7f6775e1e 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/strategy/UnionPayStrategy.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/strategy/UnionPayStrategy.java @@ -14,7 +14,7 @@ import static org.springframework.beans.factory.config.BeanDefinition.SCOPE_PROT * 云闪付 * * @author xxm - * @date 2022/3/8 + * @since 2022/3/8 */ @Slf4j @Scope(SCOPE_PROTOTYPE) diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/strategy/VoucherStrategy.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/strategy/VoucherStrategy.java index 26baf0021..9f721aa9a 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/strategy/VoucherStrategy.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/strategy/VoucherStrategy.java @@ -19,7 +19,7 @@ import static org.springframework.beans.factory.config.BeanDefinition.SCOPE_PROT * 储值卡支付 * * @author xxm - * @date 2022/3/13 + * @since 2022/3/13 */ @Slf4j @Scope(SCOPE_PROTOTYPE) diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/strategy/WalletPayStrategy.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/strategy/WalletPayStrategy.java index 7844faa3a..d5c1ea21d 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/strategy/WalletPayStrategy.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/strategy/WalletPayStrategy.java @@ -24,7 +24,7 @@ import static org.springframework.beans.factory.config.BeanDefinition.SCOPE_PROT * 钱包支付策略 * * @author xxm - * @date 2020/12/11 + * @since 2020/12/11 */ @Scope(SCOPE_PROTOTYPE) @Component @@ -52,10 +52,9 @@ public class WalletPayStrategy extends AbsPayStrategy { @Override public void doBeforePayHandler() { try { - // 支付宝参数验证 + // 钱包参数验证 String extraParamsJson = this.getPayWayParam().getExtraParamsJson(); if (StrUtil.isNotBlank(extraParamsJson)) { - WalletPayParam walletPayParam = JSONUtil.toBean(extraParamsJson, WalletPayParam.class); this.wallet = walletService.getNormalWalletById(walletPayParam.getWalletId()); } @@ -74,7 +73,12 @@ public class WalletPayStrategy extends AbsPayStrategy { */ @Override public void doPayHandler() { - walletPayService.pay(getPayWayParam().getAmount(), this.getPayment(), this.wallet); + // 异步支付方式时使用冻结方式 + if (this.getPayment().isAsyncPayMode()){ + walletPayService.freezeBalance(getPayWayParam().getAmount(), this.getPayment(), this.wallet); + } else { + walletPayService.pay(getPayWayParam().getAmount(), this.getPayment(), this.wallet); + } walletPaymentService.savePayment(this.getPayment(), this.getPayParam(), this.getPayWayParam(), this.wallet); } @@ -83,6 +87,9 @@ public class WalletPayStrategy extends AbsPayStrategy { */ @Override public void doSuccessHandler() { + if (this.getPayment().isAsyncPayMode()){ + walletPayService.success(this.getPayment().getId()); + } walletPaymentService.updateSuccess(this.getPayment().getId()); } @@ -91,7 +98,10 @@ public class WalletPayStrategy extends AbsPayStrategy { */ @Override public void doCloseHandler() { - walletPayService.close(this.getPayment().getId()); + if (this.getPayment().isAsyncPayMode()){ + walletPayService.success(this.getPayment().getId()); + } + walletPayService.close(this.getPayment().getId(),this.getPayment().isAsyncPayMode()); walletPaymentService.updateClose(this.getPayment().getId()); } diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/strategy/WeChatPayStrategy.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/strategy/WeChatPayStrategy.java index c672e53b5..cccad2fb2 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/strategy/WeChatPayStrategy.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/strategy/WeChatPayStrategy.java @@ -36,7 +36,7 @@ import static org.springframework.beans.factory.config.BeanDefinition.SCOPE_PROT * 微信支付 * * @author xxm - * @date 2021/4/5 + * @since 2021/4/5 */ @Scope(SCOPE_PROTOTYPE) @Component diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/payment/convert/PaymentConvert.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/payment/convert/PaymentConvert.java index aad069341..f4f2794b7 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/payment/convert/PaymentConvert.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/payment/convert/PaymentConvert.java @@ -9,7 +9,7 @@ import org.mapstruct.factory.Mappers; * 支付记录转换 * * @author xxm - * @date 2021/8/20 + * @since 2021/8/20 */ @Mapper public interface PaymentConvert { diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/payment/dao/PaymentExpiredTimeRepository.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/payment/dao/PaymentExpiredTimeRepository.java index 6b74653fe..c20303a21 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/payment/dao/PaymentExpiredTimeRepository.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/payment/dao/PaymentExpiredTimeRepository.java @@ -13,7 +13,7 @@ import java.util.Set; * 支付单过去处理 * * @author xxm - * @date 2022/7/12 + * @since 2022/7/12 */ @Slf4j @Repository diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/payment/dao/PaymentMapper.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/payment/dao/PaymentMapper.java index a0ea95cad..f7e3a336d 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/payment/dao/PaymentMapper.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/payment/dao/PaymentMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * 支付记录 * * @author xxm - * @date 2021/7/27 + * @since 2021/7/27 */ @Mapper public interface PaymentMapper extends BaseMapper { diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/payment/entity/Payment.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/payment/entity/Payment.java index b1102a0ca..d6a4bff8f 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/payment/entity/Payment.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/payment/entity/Payment.java @@ -31,7 +31,7 @@ import java.util.List; * 支付记录 * * @author xxm - * @date 2020/12/8 + * @since 2020/12/8 */ @DbTable @EqualsAndHashCode(callSuper = true) diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/payment/service/PaymentQueryService.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/payment/service/PaymentQueryService.java index b6d5368c0..60f9cc17d 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/payment/service/PaymentQueryService.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/payment/service/PaymentQueryService.java @@ -24,7 +24,7 @@ import static cn.bootx.platform.daxpay.code.pay.PayStatusCode.TRADE_UNKNOWN; * 支付单查询 * * @author xxm - * @date 2021/6/28 + * @since 2021/6/28 */ @Slf4j @Service diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/payment/service/PaymentService.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/payment/service/PaymentService.java index 60c676596..9bd23182c 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/payment/service/PaymentService.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/payment/service/PaymentService.java @@ -28,7 +28,7 @@ import static cn.bootx.platform.daxpay.code.pay.PayStatusCode.TRADE_PROGRESS; * 支付记录 * * @author xxm - * @date 2021/3/8 + * @since 2021/3/8 */ @Slf4j @Service diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/refund/convert/RefundConvert.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/refund/convert/RefundConvert.java index 99d438172..40435992f 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/refund/convert/RefundConvert.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/refund/convert/RefundConvert.java @@ -7,7 +7,7 @@ import org.mapstruct.factory.Mappers; /** * @author xxm - * @date 2022/3/2 + * @since 2022/3/2 */ @Mapper public interface RefundConvert { diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/refund/dao/RefundRecordManager.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/refund/dao/RefundRecordManager.java index ed200f39c..b6b4d8611 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/refund/dao/RefundRecordManager.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/refund/dao/RefundRecordManager.java @@ -15,7 +15,7 @@ import java.util.Objects; /** * @author xxm - * @date 2022/3/2 + * @since 2022/3/2 */ @Slf4j @Repository diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/refund/dao/RefundRecordMapper.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/refund/dao/RefundRecordMapper.java index 7a28fccb4..1afae7f79 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/refund/dao/RefundRecordMapper.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/refund/dao/RefundRecordMapper.java @@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper; /** * @author xxm - * @date 2022/3/2 + * @since 2022/3/2 */ @Mapper public interface RefundRecordMapper extends BaseMapper { diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/refund/entity/RefundRecord.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/refund/entity/RefundRecord.java index 72e2158c9..1b1b0d123 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/refund/entity/RefundRecord.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/refund/entity/RefundRecord.java @@ -21,7 +21,7 @@ import java.util.List; * 退款记录 * * @author xxm - * @date 2022/3/2 + * @since 2022/3/2 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/refund/service/RefundRecordService.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/refund/service/RefundRecordService.java index ad7d77af3..30961d71d 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/refund/service/RefundRecordService.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/refund/service/RefundRecordService.java @@ -16,7 +16,7 @@ import org.springframework.stereotype.Service; * 退款 * * @author xxm - * @date 2022/3/2 + * @since 2022/3/2 */ @Slf4j @Service diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/channel/alipay/AliPaymentDto.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/channel/alipay/AliPaymentDto.java index 85181eb45..1ce82d896 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/channel/alipay/AliPaymentDto.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/channel/alipay/AliPaymentDto.java @@ -10,7 +10,7 @@ import java.io.Serializable; /** * @author xxm - * @date 2021/2/27 + * @since 2021/2/27 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/channel/alipay/AlipayConfigDto.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/channel/alipay/AlipayConfigDto.java index 3b07fda75..564448790 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/channel/alipay/AlipayConfigDto.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/channel/alipay/AlipayConfigDto.java @@ -12,7 +12,7 @@ import java.util.List; /** * @author xxm - * @date 2021/2/26 + * @since 2021/2/26 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/channel/config/PayChannelConfigDto.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/channel/config/PayChannelConfigDto.java index 0210a59b4..38eb91049 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/channel/config/PayChannelConfigDto.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/channel/config/PayChannelConfigDto.java @@ -10,7 +10,7 @@ import lombok.experimental.Accessors; * 支付通道配置 * * @author xxm - * @date 2023-05-24 + * @since 2023-05-24 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/channel/union/UnionPayConfigDto.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/channel/union/UnionPayConfigDto.java index a4a814e9a..cb01c084f 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/channel/union/UnionPayConfigDto.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/channel/union/UnionPayConfigDto.java @@ -8,7 +8,7 @@ import lombok.experimental.Accessors; /** * @author xxm - * @date 2022/3/11 + * @since 2022/3/11 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/channel/voucher/VoucherDto.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/channel/voucher/VoucherDto.java index f8bb14c12..d096303fd 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/channel/voucher/VoucherDto.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/channel/voucher/VoucherDto.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; /** * @author xxm - * @date 2022/3/14 + * @since 2022/3/14 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/channel/voucher/VoucherPaymentDto.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/channel/voucher/VoucherPaymentDto.java index 69b4d2345..878fd1b46 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/channel/voucher/VoucherPaymentDto.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/channel/voucher/VoucherPaymentDto.java @@ -8,7 +8,7 @@ import lombok.experimental.Accessors; /** * @author xxm - * @date 2022/3/14 + * @since 2022/3/14 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/channel/wallet/WalletDto.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/channel/wallet/WalletDto.java index 5651abdc2..313eb66e4 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/channel/wallet/WalletDto.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/channel/wallet/WalletDto.java @@ -11,7 +11,7 @@ import java.math.BigDecimal; /** * @author xxm - * @date 2020/12/8 + * @since 2020/12/8 */ @EqualsAndHashCode(callSuper = true) @Data @@ -30,7 +30,10 @@ public class WalletDto extends BaseDto implements Serializable { @Schema(description = "钱包余额") private BigDecimal balance; - @Schema(description = "状态 1启用 2禁用") - private Integer status; + @Schema(description = "预冻结额度") + private BigDecimal freezeBalance; + + @Schema(description = "状态") + private String status; } diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/channel/wallet/WalletInfoDto.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/channel/wallet/WalletInfoDto.java index d301c72b9..804ad7557 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/channel/wallet/WalletInfoDto.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/channel/wallet/WalletInfoDto.java @@ -9,7 +9,7 @@ import lombok.experimental.Accessors; * 钱包综合信息 * * @author xxm - * @date 2022/3/13 + * @since 2022/3/13 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/channel/wallet/WalletLogDto.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/channel/wallet/WalletLogDto.java index 81c05a3ca..d2fa9d448 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/channel/wallet/WalletLogDto.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/channel/wallet/WalletLogDto.java @@ -13,7 +13,7 @@ import java.time.LocalDateTime; /** * @author xxm - * @date 2020/12/8 + * @since 2020/12/8 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/channel/wallet/WalletPaymentDto.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/channel/wallet/WalletPaymentDto.java index 34a1663f8..af23b29c6 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/channel/wallet/WalletPaymentDto.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/channel/wallet/WalletPaymentDto.java @@ -10,7 +10,7 @@ import java.io.Serializable; /** * @author xxm - * @date 2020/12/8 + * @since 2020/12/8 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/channel/wechat/WeChatPayConfigDto.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/channel/wechat/WeChatPayConfigDto.java index 532272a7e..71d1797f2 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/channel/wechat/WeChatPayConfigDto.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/channel/wechat/WeChatPayConfigDto.java @@ -12,7 +12,7 @@ import java.util.List; /** * @author xxm - * @date 2021/3/19 + * @since 2021/3/19 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/channel/wechat/WeChatPaymentDto.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/channel/wechat/WeChatPaymentDto.java index af6bbaff8..706dc4e62 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/channel/wechat/WeChatPaymentDto.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/channel/wechat/WeChatPaymentDto.java @@ -10,7 +10,7 @@ import java.io.Serializable; /** * @author xxm - * @date 2021/6/21 + * @since 2021/6/21 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/merchant/MchAppPayConfigResult.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/merchant/MchAppPayConfigResult.java index 192a9704c..7c34bfba7 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/merchant/MchAppPayConfigResult.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/merchant/MchAppPayConfigResult.java @@ -8,7 +8,7 @@ import lombok.experimental.Accessors; * 支付通道配置 * * @author xxm - * @date 2023/5/24 + * @since 2023/5/24 */ @Data @Accessors(chain = true) diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/merchant/MchApplicationDto.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/merchant/MchApplicationDto.java index fc925794c..095b03799 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/merchant/MchApplicationDto.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/merchant/MchApplicationDto.java @@ -10,7 +10,7 @@ import lombok.experimental.Accessors; * 商户应用 * * @author xxm - * @date 2023-05-19 + * @since 2023-05-19 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/merchant/MerchantInfoDto.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/merchant/MerchantInfoDto.java index 793588590..cdaa0ec47 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/merchant/MerchantInfoDto.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/merchant/MerchantInfoDto.java @@ -10,7 +10,7 @@ import lombok.experimental.Accessors; * 商户 * * @author xxm - * @date 2023-05-17 + * @since 2023-05-17 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/notify/PayNotifyRecordDto.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/notify/PayNotifyRecordDto.java index 9adb5afb2..594009679 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/notify/PayNotifyRecordDto.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/notify/PayNotifyRecordDto.java @@ -11,7 +11,7 @@ import java.time.LocalDateTime; /** * @author xxm - * @date 2021/6/22 + * @since 2021/6/22 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/pay/AsyncPayInfo.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/pay/AsyncPayInfo.java index b1e2a7636..9619b1017 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/pay/AsyncPayInfo.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/pay/AsyncPayInfo.java @@ -8,7 +8,7 @@ import java.io.Serializable; /** * @author xxm - * @date 2021/2/28 + * @since 2021/2/28 */ @Data @Accessors(chain = true) diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/pay/PayResult.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/pay/PayResult.java index 0870dd1f2..2ac9d7b45 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/pay/PayResult.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/pay/PayResult.java @@ -10,7 +10,7 @@ import java.io.Serializable; /** * @author xxm - * @date 2020/12/9 + * @since 2020/12/9 */ @Data @Accessors(chain = true) diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/payment/BasePaymentDto.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/payment/BasePaymentDto.java index 5a41da258..885573e2d 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/payment/BasePaymentDto.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/payment/BasePaymentDto.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; /** * @author xxm - * @date 2021/2/25 + * @since 2021/2/25 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/payment/PayChannelInfo.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/payment/PayChannelInfo.java index 64191cba9..27ddc4c6f 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/payment/PayChannelInfo.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/payment/PayChannelInfo.java @@ -11,7 +11,7 @@ import java.math.BigDecimal; * 支付通道信息 * * @author xxm - * @date 2020/12/8 + * @since 2020/12/8 */ @Data @Accessors(chain = true) diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/payment/PaymentDto.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/payment/PaymentDto.java index 001600f9a..ee384fbd6 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/payment/PaymentDto.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/payment/PaymentDto.java @@ -14,7 +14,7 @@ import java.util.List; /** * @author xxm - * @date 2020/12/9 + * @since 2020/12/9 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/payment/RefundableInfo.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/payment/RefundableInfo.java index e5aab6d2c..e1137d1e5 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/payment/RefundableInfo.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/payment/RefundableInfo.java @@ -10,7 +10,7 @@ import java.math.BigDecimal; * 可退款信息 * * @author xxm - * @date 2022/3/2 + * @since 2022/3/2 */ @Data @Accessors(chain = true) diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/refund/RefundRecordDto.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/refund/RefundRecordDto.java index 6343cf6fc..42d678b84 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/refund/RefundRecordDto.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/refund/RefundRecordDto.java @@ -16,7 +16,7 @@ import java.util.List; * 退款记录 * * @author xxm - * @date 2022/3/2 + * @since 2022/3/2 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/event/PayCancelEvent.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/event/PayCancelEvent.java index 50fd9d555..88bcc5df6 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/event/PayCancelEvent.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/event/PayCancelEvent.java @@ -7,7 +7,7 @@ import lombok.experimental.Accessors; * 支付撤销事件 * * @author xxm - * @date 2022/7/11 + * @since 2022/7/11 */ @Data @Accessors(chain = true) diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/event/PayCompleteEvent.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/event/PayCompleteEvent.java index 9e8fc5273..93faac7ca 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/event/PayCompleteEvent.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/event/PayCompleteEvent.java @@ -7,7 +7,7 @@ import lombok.experimental.Accessors; * 支付完成事件 * * @author xxm - * @date 2022/7/11 + * @since 2022/7/11 */ @Data @Accessors(chain = true) diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/event/PayRefundEvent.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/event/PayRefundEvent.java index 54a3ac6d4..55e9dc707 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/event/PayRefundEvent.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/event/PayRefundEvent.java @@ -7,7 +7,7 @@ import lombok.experimental.Accessors; * 支付退款事件 * * @author xxm - * @date 2022/7/11 + * @since 2022/7/11 */ @Data @Accessors(chain = true) diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/exception/payment/PayAmountAbnormalException.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/exception/payment/PayAmountAbnormalException.java index c8677e3d6..3b53176dd 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/exception/payment/PayAmountAbnormalException.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/exception/payment/PayAmountAbnormalException.java @@ -7,7 +7,7 @@ import cn.bootx.platform.daxpay.code.PaymentErrorCode; * 异常金额 * * @author xxm - * @date 2020/12/8 + * @since 2020/12/8 */ public class PayAmountAbnormalException extends FatalException { diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/exception/payment/PayFailureException.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/exception/payment/PayFailureException.java index ffb7d81b7..48cc654bf 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/exception/payment/PayFailureException.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/exception/payment/PayFailureException.java @@ -7,7 +7,7 @@ import cn.bootx.platform.daxpay.code.PaymentErrorCode; * 付款错误 * * @author xxm - * @date 2020/12/8 + * @since 2020/12/8 */ public class PayFailureException extends BizException { diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/exception/payment/PayHasExistedException.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/exception/payment/PayHasExistedException.java index 1dd985405..1df431190 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/exception/payment/PayHasExistedException.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/exception/payment/PayHasExistedException.java @@ -7,7 +7,7 @@ import cn.bootx.platform.daxpay.code.PaymentErrorCode; * 付款已存在 * * @author xxm - * @date 2020/12/8 + * @since 2020/12/8 */ public class PayHasExistedException extends BizException { diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/exception/payment/PayIsProcessingException.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/exception/payment/PayIsProcessingException.java index 6fe1a46d9..095d4cbc0 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/exception/payment/PayIsProcessingException.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/exception/payment/PayIsProcessingException.java @@ -7,7 +7,7 @@ import cn.bootx.platform.daxpay.code.PaymentErrorCode; * 付款正在处理中 * * @author xxm - * @date 2020/12/8 + * @since 2020/12/8 */ public class PayIsProcessingException extends BizException { diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/exception/payment/PayNotExistedException.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/exception/payment/PayNotExistedException.java index 82cd50196..719f9a947 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/exception/payment/PayNotExistedException.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/exception/payment/PayNotExistedException.java @@ -7,7 +7,7 @@ import cn.bootx.platform.daxpay.code.PaymentErrorCode; * 付款记录不存在 * * @author xxm - * @date 2020/12/8 + * @since 2020/12/8 */ public class PayNotExistedException extends BizException { diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/exception/payment/PayUnsupportedMethodException.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/exception/payment/PayUnsupportedMethodException.java index 30c0d0feb..145fc3af4 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/exception/payment/PayUnsupportedMethodException.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/exception/payment/PayUnsupportedMethodException.java @@ -7,7 +7,7 @@ import cn.bootx.platform.daxpay.code.PaymentErrorCode; * 付款方式不支持异常 * * @author xxm - * @date 2020/12/9 + * @since 2020/12/9 */ public class PayUnsupportedMethodException extends FatalException { diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/exception/waller/WalletBannedException.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/exception/waller/WalletBannedException.java index b9c15656c..b412dc943 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/exception/waller/WalletBannedException.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/exception/waller/WalletBannedException.java @@ -7,7 +7,7 @@ import cn.bootx.platform.daxpay.code.PaymentErrorCode; * 钱包被禁用 * * @author xxm - * @date 2020/12/8 + * @since 2020/12/8 */ public class WalletBannedException extends BizException { diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/exception/waller/WalletInfoNotExistException.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/exception/waller/WalletInfoNotExistException.java index f130eff41..1be32d7fd 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/exception/waller/WalletInfoNotExistException.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/exception/waller/WalletInfoNotExistException.java @@ -7,7 +7,7 @@ import cn.bootx.platform.daxpay.code.PaymentErrorCode; * 钱包信息不存在 * * @author xxm - * @date 2020/12/8 + * @since 2020/12/8 */ public class WalletInfoNotExistException extends FatalException { diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/exception/waller/WalletLackOfBalanceException.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/exception/waller/WalletLackOfBalanceException.java index b30adc553..552462922 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/exception/waller/WalletLackOfBalanceException.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/exception/waller/WalletLackOfBalanceException.java @@ -7,7 +7,7 @@ import cn.bootx.platform.daxpay.code.PaymentErrorCode; * 余额不足异常 * * @author xxm - * @date 2020/12/8 + * @since 2020/12/8 */ public class WalletLackOfBalanceException extends BizException { diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/exception/waller/WalletLogError.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/exception/waller/WalletLogError.java index 842233cea..1a9563667 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/exception/waller/WalletLogError.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/exception/waller/WalletLogError.java @@ -7,7 +7,7 @@ import cn.bootx.platform.daxpay.code.PaymentErrorCode; * 钱包日志错误 * * @author xxm - * @date 2020/12/8 + * @since 2020/12/8 */ public class WalletLogError extends FatalException { diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/exception/waller/WalletNotExistsException.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/exception/waller/WalletNotExistsException.java index 3f1dca1f7..e5df48338 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/exception/waller/WalletNotExistsException.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/exception/waller/WalletNotExistsException.java @@ -7,7 +7,7 @@ import cn.bootx.platform.daxpay.code.PaymentErrorCode; * 钱包不存在 * * @author xxm - * @date 2020/12/8 + * @since 2020/12/8 */ public class WalletNotExistsException extends BizException { diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/mq/PaymentEventSender.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/mq/PaymentEventSender.java index c60ee60e7..50cff3926 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/mq/PaymentEventSender.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/mq/PaymentEventSender.java @@ -15,7 +15,7 @@ import org.springframework.stereotype.Component; * 支付中心消息发送器 * * @author xxm - * @date 2021/4/22 + * @since 2021/4/22 */ @Slf4j @Component diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/mq/PaymentMessageListener.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/mq/PaymentMessageListener.java index ca31b7672..65452e1cb 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/mq/PaymentMessageListener.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/mq/PaymentMessageListener.java @@ -15,7 +15,7 @@ import org.springframework.stereotype.Component; * 消息接收 * * @author xxm - * @date 2021/4/22 + * @since 2021/4/22 */ @Slf4j @Component diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/cashier/CashierCombinationPayParam.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/cashier/CashierCombinationPayParam.java index fb6fed4a1..7dfdb4f05 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/cashier/CashierCombinationPayParam.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/cashier/CashierCombinationPayParam.java @@ -12,7 +12,7 @@ import java.util.List; * 结算台发起支付参数 * * @author xxm - * @date 2022/2/23 + * @since 2022/2/23 */ @Data @Accessors(chain = true) diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/cashier/CashierSinglePayParam.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/cashier/CashierSinglePayParam.java index 819936db0..4f46cc47d 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/cashier/CashierSinglePayParam.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/cashier/CashierSinglePayParam.java @@ -10,7 +10,7 @@ import java.math.BigDecimal; * 结算台发起支付参数 * * @author xxm - * @date 2022/2/23 + * @since 2022/2/23 */ @Data @Accessors(chain = true) @@ -47,4 +47,7 @@ public class CashierSinglePayParam { @Schema(description = "储值卡") private String voucherNo; + @Schema(description = "钱包ID") + private String walletId; + } diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/channel/alipay/AliPayParam.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/channel/alipay/AliPayParam.java index 88ba7147e..3821832ab 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/channel/alipay/AliPayParam.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/channel/alipay/AliPayParam.java @@ -8,7 +8,7 @@ import java.io.Serializable; /** * @author xxm - * @date 2021/2/27 + * @since 2021/2/27 */ @Data @Accessors(chain = true) diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/channel/alipay/AlipayConfigParam.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/channel/alipay/AlipayConfigParam.java index 5fc09e456..762c7b867 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/channel/alipay/AlipayConfigParam.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/channel/alipay/AlipayConfigParam.java @@ -9,7 +9,7 @@ import java.util.List; /** * @author xxm - * @date 2021/2/26 + * @since 2021/2/26 */ @Data @Accessors(chain = true) diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/channel/alipay/AlipayConfigQuery.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/channel/alipay/AlipayConfigQuery.java index 15cf92e53..94cbf0e9a 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/channel/alipay/AlipayConfigQuery.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/channel/alipay/AlipayConfigQuery.java @@ -8,7 +8,7 @@ import java.io.Serializable; /** * @author xxm - * @date 2021/7/22 + * @since 2021/7/22 */ @Data @Accessors(chain = true) diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/channel/config/PayChannelConfigParam.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/channel/config/PayChannelConfigParam.java index 577584c05..b4b72e407 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/channel/config/PayChannelConfigParam.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/channel/config/PayChannelConfigParam.java @@ -11,7 +11,7 @@ import static cn.bootx.platform.common.core.annotation.QueryParam.CompareTypeEnu * 支付通道配置 编码见 @see {@link cn.bootx.platform.daxpay.code.pay.PayChannelCode} * * @author xxm - * @date 2023-05-24 + * @since 2023-05-24 */ @Data @Schema(title = "支付通道配置") diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/channel/voucher/VoucherGenerationParam.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/channel/voucher/VoucherGenerationParam.java index e0ddc98db..b710a987f 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/channel/voucher/VoucherGenerationParam.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/channel/voucher/VoucherGenerationParam.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; /** * @author xxm - * @date 2022/3/14 + * @since 2022/3/14 */ @Data @Accessors(chain = true) diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/channel/voucher/VoucherImportParam.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/channel/voucher/VoucherImportParam.java index e03fbde52..9dcac1aef 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/channel/voucher/VoucherImportParam.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/channel/voucher/VoucherImportParam.java @@ -6,7 +6,7 @@ import lombok.experimental.Accessors; /** * @author xxm - * @date 2022/3/14 + * @since 2022/3/14 */ @Data @Accessors(chain = true) diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/channel/voucher/VoucherParam.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/channel/voucher/VoucherParam.java index d3c52eff8..edca8f932 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/channel/voucher/VoucherParam.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/channel/voucher/VoucherParam.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; /** * @author xxm - * @date 2022/3/14 + * @since 2022/3/14 */ @Data @Accessors(chain = true) diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/channel/voucher/VoucherPayParam.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/channel/voucher/VoucherPayParam.java index e6185badd..0b4796046 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/channel/voucher/VoucherPayParam.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/channel/voucher/VoucherPayParam.java @@ -10,7 +10,7 @@ import java.util.List; * 储值卡支付参数 * * @author xxm - * @date 2022/3/14 + * @since 2022/3/14 */ @Data @Accessors(chain = true) diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/channel/wallet/WalletLogQueryParam.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/channel/wallet/WalletLogQueryParam.java index 01e6449df..3b3e53acf 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/channel/wallet/WalletLogQueryParam.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/channel/wallet/WalletLogQueryParam.java @@ -10,7 +10,7 @@ import java.util.List; /** * @author xxm - * @date 2020/12/8 + * @since 2020/12/8 */ @Data @Accessors(chain = true) diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/channel/wallet/WalletPayParam.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/channel/wallet/WalletPayParam.java index e92b3290a..70de5321c 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/channel/wallet/WalletPayParam.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/channel/wallet/WalletPayParam.java @@ -10,7 +10,7 @@ import java.io.Serializable; * 钱包支付参数 * * @author xxm - * @date 2020/12/8 + * @since 2020/12/8 */ @Data @Accessors(chain = true) diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/channel/wallet/WalletRechargeParam.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/channel/wallet/WalletRechargeParam.java index cfb613803..b4ae2cd97 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/channel/wallet/WalletRechargeParam.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/channel/wallet/WalletRechargeParam.java @@ -4,12 +4,13 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.experimental.Accessors; +import javax.validation.constraints.NotNull; import java.io.Serializable; import java.math.BigDecimal; /** * @author xxm - * @date 2020/12/8 + * @since 2020/12/8 */ @Data @Accessors(chain = true) @@ -18,25 +19,11 @@ public class WalletRechargeParam implements Serializable { private static final long serialVersionUID = 73058709379178254L; + @NotNull(message = "钱包ID不可为空") @Schema(description = "钱包ID") private Long walletId; - @Schema(description = "支付记录ID") - private Long paymentId; - + @NotNull(message = "充值金额不可为空") @Schema(description = "充值金额") private BigDecimal amount; - - @Schema(description = "类型 2 主动充值 3 自动充值 4 admin充值") - private Integer type; - - @Schema(description = "业务ID，对应的充值订单ID等") - private String businessId; - - @Schema(description = "操作源") - private Integer operationSource; - - @Schema(description = "订单id") - private Long orderId; - } diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/channel/wechat/WeChatPayConfigParam.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/channel/wechat/WeChatPayConfigParam.java index 5232d9fc6..21e9b77b2 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/channel/wechat/WeChatPayConfigParam.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/channel/wechat/WeChatPayConfigParam.java @@ -11,7 +11,7 @@ import java.util.List; * 微信支付配置参数 * * @author xxm - * @date 2022/7/7 + * @since 2022/7/7 */ @Data @QueryParam(type = QueryParam.CompareTypeEnum.LIKE) diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/channel/wechat/WeChatPayParam.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/channel/wechat/WeChatPayParam.java index bfcfbf5b7..4040e34fa 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/channel/wechat/WeChatPayParam.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/channel/wechat/WeChatPayParam.java @@ -6,7 +6,7 @@ import lombok.experimental.Accessors; /** * @author xxm - * @date 2021/6/21 + * @since 2021/6/21 */ @Data @Accessors(chain = true) diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/merchant/MchApplicationParam.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/merchant/MchApplicationParam.java index ed63aaab4..589d9f316 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/merchant/MchApplicationParam.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/merchant/MchApplicationParam.java @@ -9,7 +9,7 @@ import lombok.experimental.Accessors; * 商户应用 * * @author xxm - * @date 2023-05-19 + * @since 2023-05-19 */ @Data @QueryParam(type = QueryParam.CompareTypeEnum.LIKE) diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/merchant/MerchantInfoParam.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/merchant/MerchantInfoParam.java index 67cbba033..b66e7c526 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/merchant/MerchantInfoParam.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/merchant/MerchantInfoParam.java @@ -11,7 +11,7 @@ import static cn.bootx.platform.common.core.annotation.QueryParam.CompareTypeEnu * 商户 * * @author xxm - * @date 2023-05-17 + * @since 2023-05-17 */ @Data @Schema(title = "商户") diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/pay/PayParam.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/pay/PayParam.java index 9d5b0dfc6..a2afb41e2 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/pay/PayParam.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/pay/PayParam.java @@ -14,7 +14,7 @@ import java.util.List; * 支付参数 * * @author xxm - * @date 2020/12/9 + * @since 2020/12/9 */ @Data @Accessors(chain = true) diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/pay/PayWayParam.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/pay/PayWayParam.java index f78507e97..27b087983 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/pay/PayWayParam.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/pay/PayWayParam.java @@ -22,7 +22,7 @@ import java.math.BigDecimal; * 不只是支付, 退款发起时也是这个参数 * * @author xxm - * @date 2020/12/8 + * @since 2020/12/8 */ @Data @Accessors(chain = true) diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/payment/PaymentQuery.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/payment/PaymentQuery.java index b4a7db75d..d2d6a41c3 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/payment/PaymentQuery.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/payment/PaymentQuery.java @@ -9,7 +9,7 @@ import java.io.Serializable; /** * @author xxm - * @date 2021/7/21 + * @since 2021/7/21 */ @Data @Accessors(chain = true) diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/refund/RefundModeParam.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/refund/RefundModeParam.java index 14c72010a..9db85e075 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/refund/RefundModeParam.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/refund/RefundModeParam.java @@ -13,7 +13,7 @@ import java.math.BigDecimal; * 退款方式参数 * * @author xxm - * @date 2022/3/2 + * @since 2022/3/2 */ @Data @Accessors(chain = true) diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/refund/RefundParam.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/refund/RefundParam.java index 725c36fd2..21398cd0a 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/refund/RefundParam.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/refund/RefundParam.java @@ -10,7 +10,7 @@ import java.util.List; * 退款参数 * * @author xxm - * @date 2020/12/10 + * @since 2020/12/10 */ @Data @Accessors(chain = true) diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/task/PayExpiredTimeTask.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/task/PayExpiredTimeTask.java index df87e9b78..d7238b897 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/task/PayExpiredTimeTask.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/task/PayExpiredTimeTask.java @@ -12,7 +12,7 @@ import org.springframework.stereotype.Component; * 超时支付单任务撤销(2-5秒轮训一次) * * @author xxm - * @date 2022/7/12 + * @since 2022/7/12 */ @Slf4j @Component diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/task/PayExpiredTimeTaskService.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/task/PayExpiredTimeTaskService.java index 28eeb778a..06a71965b 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/task/PayExpiredTimeTaskService.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/task/PayExpiredTimeTaskService.java @@ -15,7 +15,7 @@ import java.util.stream.Collectors; * 支付超时任务撤销消息注册 * * @author xxm - * @date 2022/7/12 + * @since 2022/7/12 */ @Slf4j @Service diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/util/PayWaylUtil.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/util/PayWaylUtil.java index dfa0fbc31..0730a5d09 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/util/PayWaylUtil.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/util/PayWaylUtil.java @@ -6,6 +6,7 @@ import cn.bootx.platform.daxpay.code.pay.PayChannelEnum; import cn.bootx.platform.daxpay.code.pay.PayWayExtraCode; import cn.bootx.platform.daxpay.exception.payment.PayAmountAbnormalException; import cn.bootx.platform.daxpay.exception.payment.PayFailureException; +import cn.bootx.platform.daxpay.param.channel.wallet.WalletPayParam; import cn.bootx.platform.daxpay.param.pay.PayWayParam; import cn.bootx.platform.daxpay.param.pay.PayParam; import cn.bootx.platform.daxpay.param.channel.alipay.AliPayParam; @@ -27,7 +28,7 @@ import java.util.Map; * 支付方式工具类 * * @author xxm - * @date 2022/7/12 + * @since 2022/7/12 */ @UtilityClass public class PayWaylUtil { @@ -98,6 +99,10 @@ public class PayWaylUtil { } return JSONUtil.toJsonStr(new VoucherPayParam().setCardNoList(list)); } + case WALLET: { + String walletId = map.get(PayWayExtraCode.WALLET_ID); + return JSONUtil.toJsonStr(new WalletPayParam().setWalletId(Long.valueOf(walletId))); + } default: { return null; } diff --git a/dax-pay/src/main/resources/mapper/wallet/WalletMapper.xml b/dax-pay/src/main/resources/mapper/wallet/WalletMapper.xml index 4f2936454..59be2a50d 100644 --- a/dax-pay/src/main/resources/mapper/wallet/WalletMapper.xml +++ b/dax-pay/src/main/resources/mapper/wallet/WalletMapper.xml @@ -2,6 +2,46 @@ + + + update pay_wallet + set freeze_balance = #{amount}, + last_modifier = #{operator}, + last_modified_time = #{date}, + version = (version+1) + where id = #{walletId} and (balance - freeze_balance - #{amount}) >= 0 + + + + update pay_wallet + set freeze_balance = (freeze_balance - #{amount}), + last_modifier = #{operator}, + last_modified_time = #{date}, + version = (version+1) + where id = #{walletId} and (freeze_balance - #{amount}) >= 0 + + + + + update pay_wallet + set balance = (balance - #{amount}), + last_modifier = #{operator}, + last_modified_time = #{date}, + version = (version+1) + where id = #{walletId} and (balance - freeze_balance- #{amount}) >= 0 + + + + + update pay_wallet + set balance = (balance - #{amount}), + freeze_balance = (freeze_balance - #{amount}), + last_modifier = #{operator}, + last_modified_time = #{date}, + version = (version+1) + where id = #{walletId} and (freeze_balance- #{amount}) >= 0 + + update pay_wallet @@ -11,15 +51,7 @@ version = (version+1) where id = #{walletId} - - - update pay_wallet - set balance = (balance - #{amount}), - last_modifier = #{operator}, - last_modified_time = #{date}, - version = (version+1) - where id = #{walletId} and (balance- #{amount}) >= 0 - + update pay_wallet @@ -44,4 +76,6 @@ iam_user_info.id = w.user_id ${ew.customSqlSegment} + +