From 0f7e97cd12c2a971d09e3d6ad9d2bad9800f4207 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 25 三月 2024 17:20:41 +0800
Subject: [PATCH] 合并代码
---
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