Merge branch 'main' of https://git.nuttyreading.com/zm/taimed-international-app

api/modules/user.ts

@@ -194,11 +194,11 @@ export async function submitFeedback(data: IFeedbackForm) {
  * @param orderSn 订单号
  * @param productId 产品ID
  */
-export async function verifyGooglePay(purchaseToken: string, orderSn: string, productId: string) {
+export async function verifyGooglePay(productId: number, purchaseToken: string, orderSn: string) {
   const res = await mainClient.request<IApiResponse>({
     url: 'pay/googlepay/googleVerify',
     method: 'POST',
-    data: { purchaseToken, orderSn, productId }
+    data: { productId, purchaseToken, orderSn }
   })
   return res
 }
@@ -256,13 +256,45 @@ export async function getActivityDescription() {
 }
 
 /**
- * 获取充值列表
- */
-export async function getTransactionDetailsList(current: number, limit: number, userId: string,) {
-  const res = await mainClient.request<IApiResponse>({
-    url: 'common/transactionDetails/getTransactionDetailsList',
-    method: 'POST',
-		data: { current, limit,  userId, }
-  })
-  return res
+ * 充值记录列表
+ * @param current 当前页码
+ * @param limit 每页数量
+ * @param userId 用户id
+ * @return 
+ */ 
+export async function getTransactionDetailsList(current : number, limit : number, userId : string) {
+	const res = await mainClient.request<IApiResponse>({
+		url: 'common/transactionDetails/getTransactionDetailsList',
+		method: 'POST',
+		data: { current, limit, userId, }
+	})
+	return res
+}
+
+/**
+ * 获取订单编号
+ * @return 
+ */ 
+export async function getPlaceOrder(data: object) {
+	
+	const res = await mainClient.request<IApiResponse>({
+		url: '/book/buyOrder/placeOrder',
+		method: 'POST',
+		data: data
+	})
+	return res
+}
+
+/**
+ * 获取积分数据
+ * @return 
+ */ 
+export async function getPointsData(current : number, limit : number, userId : string,) {
+	
+	const res = await mainClient.request<IApiResponse>({
+		url: 'common/jfTransactionDetails/getJfTransactionDetailsList',
+		method: 'POST',
+		data: { current, limit, userId, }
+	})
+	return res
 }