From a941ddcaf60d4b4185716efe459055332dd09a6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E7=BE=8E=E5=B9=B3?= <1102247926@qq.com>
Date: Fri, 12 Sep 2025 11:45:21 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=95=86=E6=88=B7=E6=80=BB?=
 =?UTF-8?q?=E7=A7=AF=E5=88=86=E6=9F=A5=E8=AF=A2=E5=A4=B1=E8=B4=A5=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 26 +++++++++++++------
 .../service/impl/QCodeInfoServiceImpl.java    |  6 ++++-
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 99be687..f488523 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -10,12 +10,9 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="29bcb86b-1634-41e0-a498-79481163cba8" name="Changes" comment="数据同步功能修改">
+    <list default="true" id="29bcb86b-1634-41e0-a498-79481163cba8" name="Changes" comment="解决轮播图查询报错的问题">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/config/DBSrcBak.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/config/DBSrcBak.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/config/DBSrcPetrol.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/config/DBSrcPetrol.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/RotationServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/RotationServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/ServiceAreaServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/ServiceAreaServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/QCodeInfoServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/QCodeInfoServiceImpl.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -643,7 +640,11 @@
       <workItem from="1757035222265" duration="949000" />
       <workItem from="1757037212634" duration="6713000" />
       <workItem from="1757314801573" duration="3854000" />
-      <workItem from="1757319421832" duration="713000" />
+      <workItem from="1757319421832" duration="1877000" />
+      <workItem from="1757377185874" duration="47000" />
+      <workItem from="1757493113742" duration="2736000" />
+      <workItem from="1757559975874" duration="2606000" />
+      <workItem from="1757636618124" duration="1103000" />
     </task>
     <task id="LOCAL-00001" summary="特请处理">
       <option name="closed" value="true" />
@@ -909,7 +910,15 @@
       <option name="project" value="LOCAL" />
       <updated>1756797525902</updated>
     </task>
-    <option name="localTasksCounter" value="34" />
+    <task id="LOCAL-00034" summary="解决轮播图查询报错的问题">
+      <option name="closed" value="true" />
+      <created>1757320171471</created>
+      <option name="number" value="00034" />
+      <option name="presentableId" value="LOCAL-00034" />
+      <option name="project" value="LOCAL" />
+      <updated>1757320171471</updated>
+    </task>
+    <option name="localTasksCounter" value="35" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -950,7 +959,8 @@
     <MESSAGE value="修改积分核销失败的问题" />
     <MESSAGE value="数据同步" />
     <MESSAGE value="数据同步功能修改" />
-    <option name="LAST_COMMIT_MESSAGE" value="数据同步功能修改" />
+    <MESSAGE value="解决轮播图查询报错的问题" />
+    <option name="LAST_COMMIT_MESSAGE" value="解决轮播图查询报错的问题" />
   </component>
   <component name="VgoProject">
     <integration-enabled>false</integration-enabled>
diff --git a/src/main/java/com/nmgs/service/impl/QCodeInfoServiceImpl.java b/src/main/java/com/nmgs/service/impl/QCodeInfoServiceImpl.java
index 55855dd..660f806 100644
--- a/src/main/java/com/nmgs/service/impl/QCodeInfoServiceImpl.java
+++ b/src/main/java/com/nmgs/service/impl/QCodeInfoServiceImpl.java
@@ -552,10 +552,14 @@ public class QCodeInfoServiceImpl {
                     "\tSERVICE_AREA_OPERATORS_TABLE soat,\n" +
                     "  PEYTYPE_TEXT pt\t\n" +
                     "WHERE\n" +
-                    "\t( ct.INTEGRATIONLISTID = ilt.ID OR ct.INTEGRALROLLBACK = ilt.ID ) \n" +
+                    "\t ct.INTEGRATIONLISTID = ilt.ID \n" +
                     "\tAND ilt.PAYTYPE = pt.VALUE\n" +
                     "\tAND ct.USERJOBNUMBER = soat.JOBNUMBER\n" +
                     "\tAND ct.USERJOBNUMBER = '"+serverOperationId+"' AND (ct.INTEGRALROLLBACK is null or ct.INTEGRALROLLBACK ='') group by ct.USERJOBNUMBER";
+
+            if(PropertiesUtil.getValue("INTEGRAL_SERVICE").equals("YES")){
+                sqlTemp="select sum(FCTOTAL+FPTOTAL+FSOTAL+FGOTAL+FCAOTAL)/100 as PAYINTEGRATION from integral_service_scorefee_collection where userjobnumber ='"+serverOperationId+"'";
+            }
             ret = this.mapperI.selectforlist(sqlTemp);
         }catch (Exception e){
             LogUtil.WriteLog_Error("根据商户查询总积分失败","QCodeInfoServiceImpl");