From c2229eb2288f3088a81fbb7f295ebc3ea4c940ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BD=90=E5=A4=A9=E5=A4=A7=E5=9C=A3?= <17615834396@163.com>
Date: Tue, 2 Apr 2024 17:23:09 +0800
Subject: [PATCH] bug

---
 fuintAdmin/src/views/staff/list.vue             |  2 +-
 .../order/mapper/xml/OilOrderMapper.xml         |  2 ++
 .../order/service/impl/OilOrderServiceImpl.java |  4 ++--
 .../controller/BackendLoginController.java      | 17 +++++++++++++++++
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/fuintAdmin/src/views/staff/list.vue b/fuintAdmin/src/views/staff/list.vue
index afb9d21cb..c414e742d 100644
--- a/fuintAdmin/src/views/staff/list.vue
+++ b/fuintAdmin/src/views/staff/list.vue
@@ -327,7 +327,7 @@
             厂商名称
           </div>
           <div class="rw">
-            二维码SN号
+            二维码ID
           </div>
           <div class="rw">
             码牌SN号
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml
index cb73d4ffb..fc11cd44a 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml
@@ -223,6 +223,8 @@
                 FROM
                     oil_order
                 WHERE
+                    order_status = 'paid'
+                    and
                     store_id = #{storeId}
                     ) oil_order ON date_range.date = oil_order.order_date
         WHERE
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 69a85e656..090e39392 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
@@ -1743,8 +1743,8 @@ return stringDoubleMap;
 
         AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
         Integer storeId = nowAccountInfo.getStoreId();
-
-        return oilOrderMapper.oilSales(storeId);
+        List<Map<String, String>> maps = oilOrderMapper.oilSales(storeId);
+        return maps;
     }
 
     @Resource
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendLoginController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendLoginController.java
index b775bf1e4..90f8007f7 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendLoginController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendLoginController.java
@@ -25,6 +25,8 @@ import com.fuint.framework.web.ResponseObject;
 import com.fuint.module.backendApi.response.LoginResponse;
 import com.fuint.repository.model.TAccount;
 import com.fuint.repository.model.TDutySource;
+import com.fuint.system.dept.entity.SysDept;
+import com.fuint.system.dept.service.ISysDeptService;
 import com.fuint.system.role.entity.TDuty;
 import com.fuint.repository.model.TSource;
 import com.fuint.system.role.service.DutyService;
@@ -91,6 +93,9 @@ public class BackendLoginController extends BaseController {
     @Resource
     private LJDutyMapper ljDutyMapper;
 
+    @Resource
+    private ISysDeptService iSysDeptService;
+
 
     /**
      * 后台登录
@@ -165,6 +170,18 @@ public class BackendLoginController extends BaseController {
             return getFailureResult(201,"请登录油站端！");
         }
 
+        LambdaQueryWrapper<SysDept> queryWrapper1 = new LambdaQueryWrapper<>();
+        queryWrapper1.eq(SysDept::getDeptId,one.getDeptId());
+        SysDept one1 = iSysDeptService.getOne(queryWrapper1);
+        if (ObjectUtils.isNotEmpty(one1) && ObjectUtils.isNotEmpty(one1.getTurnoverType()) &&  one1.getTurnoverType().equals("2")){
+            if (ObjectUtils.isNotEmpty(one1.getTurnoverEndTime())){
+                Date date = new Date();
+                Date turnoverEndTime = one1.getTurnoverEndTime();
+                if (date.compareTo(turnoverEndTime)<0){
+                    return getFailureResult(201,"请付费后再登录！");
+                }
+            }
+        }
         //不知道是哪个平台过来的请求
         /*LambdaQueryWrapper<TAccount> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(TAccount::getAccountName, accountName);