dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
齐天大圣 2024-03-06 15:00:34 +08:00
commit 7e35f59abc
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fuintBackend/fuint-application/src/main/java/com/fuint/module/AlipayApi/controller/AlipayController.java
View File

@ -128,6 +128,9 @@ public class AlipayController extends BaseController {
if (ObjectUtil.isNotEmpty(storeId) && storeId!= "") { if (ObjectUtil.isNotEmpty(storeId) && storeId!= "") {
accountInfo.setStoreId(Integer.parseInt(storeId)); accountInfo.setStoreId(Integer.parseInt(storeId));
} }
if (ObjectUtil.isNotEmpty(ljStore)){
accountInfo.setChainStoreId(ljStore.getChainStoreId());
}
String token = TokenUtil.generateToken(userAgent, ljUser.getId()); String token = TokenUtil.generateToken(userAgent, ljUser.getId());
accountInfo.setToken(token); accountInfo.setToken(token);
TokenUtil.saveAccountToken(accountInfo); TokenUtil.saveAccountToken(accountInfo);

6
gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue
View File

@ -377,10 +377,10 @@
}) })
} else { } else {
request({ request({
url: "/business/allOrderInfo/orderStatus", url: "/business/marketingActivity/activeExchange/cardValueOrders",
method: 'post', method: 'put',
data: { data: {
"orderNo": res.data.orderNo, "orderNo": res.data.data.orderNo,
"status": "payFail" "status": "payFail"
}, },
}).then((res) => { }).then((res) => {