From ae83dac42de8ac46d81c839a205df6e867930f75 Mon Sep 17 00:00:00 2001 From: cun-nan <19819293608@163.com> Date: Wed, 6 Mar 2024 14:55:15 +0800 Subject: [PATCH] bug --- .../fuint/module/AlipayApi/controller/AlipayController.java | 3 +++ gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/module/AlipayApi/controller/AlipayController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/module/AlipayApi/controller/AlipayController.java index fce0f6297..6e0c82627 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/module/AlipayApi/controller/AlipayController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/module/AlipayApi/controller/AlipayController.java @@ -128,6 +128,9 @@ public class AlipayController extends BaseController { if (ObjectUtil.isNotEmpty(storeId) && storeId!= "") { accountInfo.setStoreId(Integer.parseInt(storeId)); } + if (ObjectUtil.isNotEmpty(ljStore)){ + accountInfo.setChainStoreId(ljStore.getChainStoreId()); + } String token = TokenUtil.generateToken(userAgent, ljUser.getId()); accountInfo.setToken(token); TokenUtil.saveAccountToken(accountInfo); diff --git a/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue b/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue index b47801b23..0440226e5 100644 --- a/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue +++ b/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue @@ -377,10 +377,10 @@ }) } else { request({ - url: "/business/allOrderInfo/orderStatus", - method: 'post', + url: "/business/marketingActivity/activeExchange/cardValueOrders", + method: 'put', data: { - "orderNo": res.data.orderNo, + "orderNo": res.data.data.orderNo, "status": "payFail" }, }).then((res) => {