Merge remote-tracking branch 'origin/master'

fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java

@@ -1246,6 +1246,10 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> 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");

fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue

@@ -1926,6 +1926,7 @@
                   this_.isQuery = false;
                   clearInterval(timer);
                 }
+                await this_.getMemberAfter();
               }
             })
           }, 1000);