From 1b8ad0cc6a79f84fb32fdffae39742afa964748e Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 24 九月 2024 16:09:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-account/src/main/java/com/dsh/account/service/TAppUserService.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/TAppUserService.java b/cloud-server-account/src/main/java/com/dsh/account/service/TAppUserService.java
index 88dc565..339e7b0 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/TAppUserService.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/TAppUserService.java
@@ -97,6 +97,7 @@
* @throws Exception
*/
ResultUtil updatePassword(String phone, String code, String password) throws Exception;
+ ResultUtil updatePassword1(String phone, String code, String password) throws Exception;
/**
@@ -150,7 +151,17 @@
ResultUtil productRedemptionOperation(Integer userIdFormRedis, GoodsExchangeVo exchangeVo);
- ResultUtil exchangeAddPaymentCallback(String code, String orderNumber, Integer payType);
+ /**
+ * 优惠券支付回调处理
+ * @param code
+ * @param orderNumber
+ * @return
+ */
+ ResultUtil paymentCouponCallback(String code, String orderNumber);
+
+
+
+ ResultUtil exchangeAddPaymentCallback(String code, String orderNumber);
List<StoreResponse> queryStoresOfExchange(Integer goodsType, Integer pointsMerId);
--
Gitblit v1.7.1