From ccbd86bc5f747b748b5bde257a789d748b8cefbb Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 11 Sep 2025 17:41:35 +0800
Subject: [PATCH] ``` refactor(service): 在设置活动类别名称前增加非空检查在AdminHappyActivityServiceImpl.java中，对happyActivity的categoryId进行了非空检查，并且确认categoryMap中包含该categoryId后，再设置其categoryName。这样可以避免因为空值或不存在的键导致的潜在异常。 ```
---
src/main/java/cc/mrbird/febs/pay/service/IXcxPayService.java | 10 +++++++++-
1 files changed, 9 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..dd7fe9c 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,16 @@
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.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 +20,11 @@
* 发起支付（创建预付订单）
*/
BrandWCPayRequestData startPayment(MallOrderInfo mallOrderInfo) throws Exception;
+
+ /**
+ * 发起支付（创建预付订单）
+ */
+ BrandWCPayRequestData startPaymentActivity(HappyActivityOrder dto) throws Exception;
/**
* 发送订单送达消息
@@ -28,7 +36,7 @@
*/
void uniformMessageSend(OrderStateDto info);
- List<String> getTemplateId();
+ List<HashMap<String, String>> getTemplateId();
/**
* 生成小程序二维码
--
Gitblit v1.9.1