From c309d2bf72a9c780bc07b9ead57a044818fe0a29 Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Wed, 12 Jun 2024 11:16:37 +0800
Subject: [PATCH] bug

---
 .../com/fuint/api/fuyou/controller/OilConfigController.java  | 2 +-
 .../java/com/fuint/api/fuyou/service/OilConfigService.java   | 2 +-
 .../fuint/api/fuyou/service/impl/OilConfigServiceImpl.java   | 5 ++---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/controller/OilConfigController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/controller/OilConfigController.java
index c8448e5eb..678632015 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/controller/OilConfigController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/controller/OilConfigController.java
@@ -60,7 +60,7 @@ public class OilConfigController extends BaseController {
         int result = 2;
 //        isOpen=1开启规则
         if (isOpen.equals("1")){
-            result = oilConfigService.judgmentProportion();
+            result = oilConfigService.judgmentProportion(storeId);
             if (result==1){
                 oilConfigService.oilRule(storeId);
 //                开启定时关闭规则
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/OilConfigService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/OilConfigService.java
index 5d20695a4..2be232fff 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/OilConfigService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/OilConfigService.java
@@ -19,7 +19,7 @@ public interface OilConfigService extends IService<OilConfig> {
      * 判断占比相加是否为100% 是返回1 不是返回0
      * @return
      */
-    public int judgmentProportion();
+    public int judgmentProportion(Integer storeId);
 
     /**
      * 规则周期是否为当日
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/OilConfigServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/OilConfigServiceImpl.java
index 493b88c8e..9b57b7d34 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/OilConfigServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/OilConfigServiceImpl.java
@@ -68,12 +68,11 @@ public class OilConfigServiceImpl extends ServiceImpl<OilConfigMapper, OilConfig
     }
 
     @Override
-    public int judgmentProportion() {
+    public int judgmentProportion(Integer storeId) {
         int result = 0;
         int percentage = 0;
-        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
         QueryWrapper queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("store_id",nowAccountInfo.getStoreId());
+        queryWrapper.eq("store_id",storeId);
         List<OilConfig> list = baseMapper.selectList(queryWrapper);
         for (OilConfig config : list) {
             percentage += config.getProportion();