From 14d67508d21d18e4b8d8d5874efe9ef946115b04 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Fri, 16 May 2025 14:17:45 +0800
Subject: [PATCH] fix(mall): 修复订单积分计算错误

---
 src/main/java/cc/mrbird/febs/pay/service/IXcxPayService.java |   19 ++++++++++++++++++-
 1 files changed, 18 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 f433b50..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,12 +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 {
 
@@ -16,6 +20,11 @@
      * 发起支付(创建预付订单)
      */
     BrandWCPayRequestData startPayment(MallOrderInfo mallOrderInfo) throws Exception;
+
+    /**
+     * 发起支付(创建预付订单)
+     */
+    BrandWCPayRequestData startPaymentActivity(HappyActivityOrder dto) throws Exception;
 
     /**
      * 发送订单送达消息
@@ -27,7 +36,7 @@
      */
     void uniformMessageSend(OrderStateDto info);
 
-    List<String> getTemplateId();
+    List<HashMap<String, String>> getTemplateId();
 
     /**
      * 生成小程序二维码
@@ -44,4 +53,12 @@
      * 充值到账消息
      */
     void rechargeWalletMessageSend(RechargeWalletMessageSendDto info);
+
+
+    /**
+     * 用户提现到零钱
+     */
+    Boolean memberWithdrawal(MemberWithdrawalDto info);
+
+    FebsResponse getQrCode(WxGenerateQrCodeDto wxGenerateQrCodeDto);
 }

--
Gitblit v1.9.1