更新：谷歌支付

2025-11-27 14:17:50 +08:00
parent 37b9a4d02a
commit f9cad8d740
4 changed files with 341 additions and 215 deletions
--- a/api/modules/user.ts
+++ b/api/modules/user.ts
@@ -194,11 +194,12 @@ 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) {
+	console.log(productId, purchaseToken, orderSn);
 	const res = await mainClient.request<IApiResponse>({
 		url: 'pay/googlepay/googleVerify',
 		method: 'POST',
-    data: { purchaseToken, orderSn, productId }
+		data: { productId, purchaseToken, orderSn }
 	})
 	return res
 }
@@ -256,9 +257,13 @@ export async function getActivityDescription() {
 }

 /**
- * 获取充值列表
+ * 充值记录列表
+ * @param current 当前页码
+ * @param limit 每页数量
+ * @param userId 用户id
+ * @return 
 */ 
-export async function getTransactionDetailsList(current: number, limit: number, userId: string,) {
+export async function getTransactionDetailsList(current : number, limit : number, userId : string) {
 	const res = await mainClient.request<IApiResponse>({
 		url: 'common/transactionDetails/getTransactionDetailsList',
 		method: 'POST',
@@ -266,3 +271,31 @@ export async function getTransactionDetailsList(current: number, limit: number,
 	})
 	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
+}
--- a/pages.json
+++ b/pages.json
@@ -79,6 +79,12 @@
 				"navigationBarTitleText": "%user.virtual%",
 				"navigationStyle": "custom"
 			}
+		},{
+			"path": "pages/user/points/index",
+			"style": {
+				"navigationBarTitleText": "%user.points%",
+				"navigationStyle": "custom"
+			}
 		},{
 			"path": "pages/user/myBook/index",
 			"style": {
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -47,14 +47,14 @@
 						<view class="assets_row">天医币</view>
 						<view>{{userInfo.peanutCoin ?? 1}}</view>
 					</view>
-					<view>
+					<view @click="goPointsList">
 						<view class="assets_row">积分</view>
 						<view>{{userInfo.jf ?? 1}}</view>
 					</view>
-					<view>
+					<!-- <view>
 						<view class="assets_row">优惠卷</view>
 						<view>0</view>
-					</view>
+					</view> -->
 				</view>
 				<view class="chong_btn" @click="goRecharge">充 值</view>
 				<!-- <text class="wallet_title">{{$t('my.coin')}}<uni-icons type="help" size="19" color="#666"></uni-icons></text>
@@ -81,6 +81,7 @@
 	import type { IVipInfo } from '@/types/user'
 	import { useI18n } from 'vue-i18n'
 	import { getNotchHeight } from '@/utils/system'
+	import { onShow } from '@dcloudio/uni-app'

 	const { t } = useI18n()
 	const userStore = useUserStore()
@@ -147,12 +148,13 @@
 	 * 获取数据
 	 */
 	const getData = async () => {
+		console.log(userInfo.value);
 		try {
 			// 获取用户信息
 			const userRes = await getUserInfo()
-			console.log(userRes);
-			if (userRes.user) {
-				userStore.setUserInfo(userRes.user)
+			console.log(userRes, '-----userRes');
+			if (userRes.result) {
+				userStore.setUserInfo(userRes.result)
 			}

 			// 获取VIP信息
@@ -228,11 +230,21 @@
 		})
 	}
 	
+	/**
+	 * 跳转积分列表
+	 */
+	const goPointsList = () => {
+		uni.navigateTo({
+			url: '/pages/user/points/index'
+		})
+	}
 	
+	onShow(() => {
+		getData()
+	})
 	
 	onMounted(() => {
 		getPlatform()
-		getData()
 	})
 </script>

@@ -375,7 +387,7 @@
 		border-radius: 50rpx;
 		color: #fffbf6;
 		padding: 10rpx 32rpx;
-		background-image: linear-gradient(90deg, #3ab3ae 0%, #d5ecdd 200%);
+		background-color: #007bff;
 	}

 	.assets {
--- a/pages/user/recharge/index.vue
+++ b/pages/user/recharge/index.vue
@@ -8,8 +8,8 @@
 				<view class="recharge_block" @click="chosPric(item)"
 					:class="aloneItem.priceTypeId === item.priceTypeId ? 'selected' : ''"
 					v-for="item in rechargeList.bookBuyConfigList" :key="item.priceTypeId">
-					<view class="recharge_money">￥{{item.money}}</view>
-					<view>{{item.realMoney}}{{$t('order.virtualCoin')}}</view>
+					<view class="recharge_money">￥{{item.realMoney}}</view>
+					<view>{{item.money}}{{$t('order.virtualCoin')}}</view>
 					<!-- 红框位置的618活动标签 -->
 					<!-- <view class="activity-tag">618活动</view> -->
 					<span class="activity-label" v-if="item.givejf >0">618充值活动</span>
@@ -23,25 +23,26 @@
 		<view class="cha_fangsh">
 			<view class="cf_title PM_font">{{$t('user.paymentMethod')}}</view>
 			<view class="cf_radio">
-				<radio-group v-for="item in iosPaylist" @click="choseType(item.id)">
+				<radio-group v-for="item in iosPaylist">
 					<view style="width: 100%">
 						<view :class="payType == item.id ? 'Tab_xf cf_xuanx' : 'cf_xuanx'">
 							<!-- <image class="pay_item_img" :src="item.imgUrl" mode="aspectFil">
 							</image> -->
 							<text>{{ item.title }}</text>
-							<radio :checked="payType === item.id"></radio>
+							<radio :checked="payType === item.id" @click="choseType(item.id)"></radio>
 						</view>
 					</view>
 				</radio-group>
 			</view>
 		</view>
 		<view class="agree_wo flexbox">
-			<radio-group class="agree" v-for="(item, index) in argee" :key="index" @click="radioCheck">
+			<radio-group class="agree" v-for="(item, index) in argee" :key="index">
 				<view>
-					<radio class="agreeRadio" :value="item.id" :checked="state" color="#007bff"></radio>
+					<radio class="agreeRadio" :value="item.id" :checked="state" @click="radioCheck" color="#007bff"></radio>
 				</view>
 			</radio-group>
-			<view>{{$t('order.readAgree')}}<span class="highlight" @click="showAgreement">《{{$t('order.valueAddedServices')}}》</span></view>
+			<view>{{$t('order.readAgree')}}<span class="highlight"
+					@click="showAgreement">《{{$t('order.valueAddedServices')}}》</span></view>
 		</view>
 		<view class="bottom-button-container">
 			<button class="recharge-button" @click="handleRecharge">{{$t('order.recharge')}}</button>
@@ -63,10 +64,13 @@
 	import { ref, computed, onMounted, toRefs, reactive } from 'vue'
 	import { useI18n } from 'vue-i18n'
 	import { useMessage } from '@/uni_modules/wot-design-uni'
-	import { getBookBuyConfigList, getAgreement, getActivityDescription } from '@/api/modules/user'
-	// const googlePay = uni.requireNativePlugin("sn-googlepay5");
+	import { getBookBuyConfigList, getAgreement, getActivityDescription, verifyGooglePay, getPlaceOrder } from '@/api/modules/user'
+	import { onLogin } from '../../../../项目/nuttyreading-hw/config/login';
+	import { useUserStore } from '@/stores/user'
+	const googlePay = uni.requireNativePlugin("sn-googlepay5");
 	const { t } = useI18n()
 	const message = useMessage()
+	const userStore = useUserStore()
 	const payType = ref('1')
 	const iosPaylist = ref([
 		{
@@ -107,6 +111,9 @@

 	const remark = ref({})
 	const isConnected = ref(false)
+	const purchaseToken = ref()
+	// 订单编号
+	const orderSn = ref('')


 	/**
@@ -125,6 +132,31 @@
 		getData()
 	}

+	/**
+	 * 获取订单编号
+	 */
+	const getPlaceOrderObj = async () => {
+		const {priceTypeId, realMoney, money} = toRefs(aloneItem.value)
+		const data = {
+			userId: userStore.userInfo.id, // 用户di
+			paymentMethod: '5', //支付方式4point 5google
+			orderMoney: money.value, //订单金额
+			realMoney: realMoney.value, //实际金额
+			come: '10', //订单来源 2医学吴门医述 10海外读书
+			orderType: 'point', //订单类型, point充值、order课程、书、vip 课vip、abroadVip 书vip、relearn 复读、trainingClass 培训班
+			productId: priceTypeId.value // 商品id
+		}
+		try {
+			const res = await getPlaceOrder(data)
+			orderSn.value = res.orderSn
+			console.log(orderSn.value, '获取订单号');
+			getGooglePay()
+		} catch (error) {
+			console.error('获取订单号失败', error)
+		}
+	}
+
+
 	// 点击金额
 	const chosPric = (item : any) => {
 		console.log(item, '金额每项');
@@ -136,7 +168,6 @@
 	 */
 	const radioCheck = () => {
 		state.value = !state.value
-		console.log('点击了', state.value);
 	}

 	/**
@@ -154,6 +185,7 @@
 			console.log(rechargeList.value.bookBuyConfigList, '充值列表');
 			// 默认选择第一个金额
 			aloneItem.value = rechargeList.value.bookBuyConfigList[0]
+			
 		} catch (error) {
 			console.error('获取订单列表失败:', error)
 		}
@@ -195,7 +227,8 @@
 		// payType.value = val;
 	}

-	const handleRecharge = () => {
+	const handleRecharge = async () => {
+		getPlaceOrderObj()
 		if (!state.value) {
 			uni.showToast({
 				title: t('order.readAgreeServices'),
@@ -203,9 +236,8 @@
 			})
 			return
 		}
-		uni.showLoading({ title: '加载中...' })
-		console.log('立即充值');
-		getGooglePay()
+		uni.showLoading({ title: '生成订单中...' })
+		
 	}

 	/**
@@ -218,7 +250,6 @@
 			if (e.code == 0) {
 				isConnected.value = true;
 				getQuerySku()
-				// 初始化成功
 			} else {
 				// 初始化失败
 				isConnected.value = false;
@@ -239,33 +270,77 @@
 			(e : any) => {
 				if (e.code == 0) {
 					// 查询成功.
-					console.log('查询成功',e);
-		      // e.list; // 查询结果, array
+					console.log('querySku查询成功', e);
+					uni.hideLoading()
+					getPayAll()
 				} else {
-					console.log('查询失败');
+					console.log('查询失败', e);
 					// 查询失败
 				}
 			}
 		)
 	}

+	/**
+	 * 发起支付
+	 */
 	const getPayAll = () => {
+		console.log(aloneItem.value.priceTypeId, orderSn.value, '发起支付传入产品id,订单id');
 		googlePay.payAll(
 			{
-		    productId: "", // 产品id
-		
+				productId: aloneItem.value.priceTypeId, // 产品id
+				accountId: orderSn.value // 订单编号
 			},
-		  (e) => {
+			(e : any) => {
 				if (e.code == 0) {
+					purchaseToken.value = e.data[0].original.purchaseToken
 					// 支付成功
-		      e.data; //支付结果, array [ {original:{ }, signature: ''} ]
+					console.log(e, 'payAll方法成功返参');
+					getConsume()
 				} else {
+					uni.showToast({ title: '支付失败', icon: 'success' })
+					console.log(e, 'e');
 					// 支付失败
 				}
 			},
 		)
 	}

+	/**
+	 * 消耗品 确认交易
+	 */
+	const getConsume = () => {
+		googlePay.consume(
+			{
+				purchaseToken: purchaseToken.value, // 来自支付结果的original.purchaseToken (或 original.token)
+			},
+			(e : any) => {
+				if (e.code == 0) {
+					console.log(e, '确认交易成功');
+					// 确认成功
+					googleVerify()
+				} else {
+					console.log(e, '确认交易失败');
+					// 确认失败
+				}
+			},
+		);
+	}
+
+	/**
+	 * 校验订单
+	 */
+	const googleVerify = async () => {
+		try {
+			const obj = await verifyGooglePay(aloneItem.value.priceTypeId, purchaseToken.value, orderSn.value)
+			uni.switchTab({
+				url: '/pages/user/index'
+			})
+			console.log(obj, '校验订单');
+		} catch (error) {
+			console.error('校验订单失败:', error)
+		}
+	}

 	onMounted(() => {
 		getDevName();