From 9fef5e91afa0073f95dd203159b5eccf68555536 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 19 Aug 2025 11:20:12 +0800
Subject: [PATCH] refactor(mall): 修改 WxxcxJob 类的条件加载配置- 将 @ConditionalOnProperty 注解的 havingValue 属性从 "true" 改为 "false"- 此修改改变了 WxxcxJob 类的加载条件，根据配置项 system.job 的值来决定是否加载该类
---
src/main/java/cc/mrbird/febs/pay/service/IXcxPayService.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/pay/service/IXcxPayService.java b/src/main/java/cc/mrbird/febs/pay/service/IXcxPayService.java
index 4736056..ff46a48 100644
--- a/src/main/java/cc/mrbird/febs/pay/service/IXcxPayService.java
+++ b/src/main/java/cc/mrbird/febs/pay/service/IXcxPayService.java
@@ -3,13 +3,17 @@
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.mall.dto.ApiRechargeWalletDto;
import cc.mrbird.febs.mall.dto.RechargeWalletMessageSendDto;
+import cc.mrbird.febs.mall.entity.ClothesOrder;
+import cc.mrbird.febs.mall.entity.HappyActivityOrder;
import cc.mrbird.febs.mall.entity.MallOrderInfo;
import cc.mrbird.febs.pay.model.BrandWCPayRequestData;
import cc.mrbird.febs.pay.model.MemberWithdrawalDto;
import cc.mrbird.febs.pay.model.OrderStateDto;
import cc.mrbird.febs.pay.model.WxGenerateQrCodeDto;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
public interface IXcxPayService {
@@ -17,6 +21,12 @@
* 发起支付（创建预付订单）
*/
BrandWCPayRequestData startPayment(MallOrderInfo mallOrderInfo) throws Exception;
+ BrandWCPayRequestData startPayment(ClothesOrder orderInfo) throws Exception;
+
+ /**
+ * 发起支付（创建预付订单）
+ */
+ BrandWCPayRequestData startPaymentActivity(HappyActivityOrder dto) throws Exception;
/**
* 发送订单送达消息
@@ -28,7 +38,7 @@
*/
void uniformMessageSend(OrderStateDto info);
- List<String> getTemplateId();
+ List<HashMap<String, String>> getTemplateId();
/**
* 生成小程序二维码
--
Gitblit v1.9.1