From 9335d317a74df7b1d02d9128a34f413e33d0b631 Mon Sep 17 00:00:00 2001 From: cun-nan <19819293608@163.com> Date: Wed, 5 Jun 2024 17:38:30 +0800 Subject: [PATCH 1/2] bug --- .../business/order/service/impl/OilOrderServiceImpl.java | 4 ++++ fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue | 1 + gasStation-uni/pages/index/index.vue | 4 ++-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java index 09ef61ac6..627cd4e15 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java @@ -1246,6 +1246,10 @@ public class OilOrderServiceImpl extends ServiceImpl i UserBalance balance = userBalanceService.selectUserBalance(userId, store.getChainStoreId()); // 根据用户id查询用户信息 LJUserVo userVo1 = userService.selectUserById(userId, storeId); + if (ObjectUtil.isEmpty(userVo1)){ + res.put("error", "当前会员不存在！"); + return res; + } // 根据日期生成订单信息 SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss"); diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue index 7420ef80b..6ebaf5759 100644 --- a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue +++ b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue @@ -1926,6 +1926,7 @@ this_.isQuery = false; clearInterval(timer); } + await this_.getMemberAfter(); } }) }, 1000); diff --git a/gasStation-uni/pages/index/index.vue b/gasStation-uni/pages/index/index.vue index fe0f1960a..ab8152df3 100644 --- a/gasStation-uni/pages/index/index.vue +++ b/gasStation-uni/pages/index/index.vue @@ -102,10 +102,10 @@ {{store.name}}{{store.description ? "("+store.description+")" : ""}} - + From 517ab6d9b47601fdee0678c5e68dd7e420eb1490 Mon Sep 17 00:00:00 2001 From: cun-nan <19819293608@163.com> Date: Wed, 5 Jun 2024 17:38:50 +0800 Subject: [PATCH 2/2] bug --- gasStation-uni/pages/index/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gasStation-uni/pages/index/index.vue b/gasStation-uni/pages/index/index.vue index ab8152df3..fe0f1960a 100644 --- a/gasStation-uni/pages/index/index.vue +++ b/gasStation-uni/pages/index/index.vue @@ -102,10 +102,10 @@ {{store.name}}{{store.description ? "("+store.description+")" : ""}} - +