1、优惠券模块修复

.idea/workspace.xml

@@ -6,10 +6,7 @@
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/admin-hanhai-vue/.env.development" beforeDir="false" afterPath="$PROJECT_DIR$/admin-hanhai-vue/.env.development" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/admin-hanhai-vue/.env.production" beforeDir="false" afterPath="$PROJECT_DIR$/admin-hanhai-vue/.env.production" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/ScoreController.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/ScoreController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ScoreService.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ScoreService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ScoreServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ScoreServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/UserInfoServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/UserInfoServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/VouchersServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/VouchersServiceImpl.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -85,7 +82,7 @@
       <recent name="D:\Projects\massage\massage-admin\han-hai-module-pay\src\main\resources" />
     </key>
   </component>
-  <component name="RunManager" selected="Application.CommonUtils">
+  <component name="RunManager" selected="Spring Boot.JeecgSystemApplication">
     <configuration name="CommonUtils" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="ALTERNATIVE_JRE_PATH" value="1.8" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
@@ -206,7 +203,9 @@
       <workItem from="1744268260382" duration="15845000" />
       <workItem from="1746000753098" duration="13433000" />
       <workItem from="1746752649258" duration="24956000" />
-      <workItem from="1747350180318" duration="82572000" />
+      <workItem from="1747350180318" duration="83391000" />
+      <workItem from="1747884147436" duration="593000" />
+      <workItem from="1747905027347" duration="19960000" />
     </task>
     <task id="LOCAL-00001" summary="1、项目初始化">
       <created>1741919155045</created>
@@ -369,7 +368,21 @@
       <option name="project" value="LOCAL" />
       <updated>1747809213012</updated>
     </task>
-    <option name="localTasksCounter" value="24" />
+    <task id="LOCAL-00024" summary="1、积分模块修复">
+      <created>1747815363401</created>
+      <option name="number" value="00024" />
+      <option name="presentableId" value="LOCAL-00024" />
+      <option name="project" value="LOCAL" />
+      <updated>1747815363401</updated>
+    </task>
+    <task id="LOCAL-00025" summary="1、订单模块修复&#10;2、优惠券模块修复&#10;3、商家模块修复">
+      <created>1748246664910</created>
+      <option name="number" value="00025" />
+      <option name="presentableId" value="LOCAL-00025" />
+      <option name="project" value="LOCAL" />
+      <updated>1748246664910</updated>
+    </task>
+    <option name="localTasksCounter" value="26" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -411,7 +424,9 @@
     <MESSAGE value="1、bug修复" />
     <MESSAGE value="1、基础数据bug修复" />
     <MESSAGE value="1、退款功能补充" />
-    <option name="LAST_COMMIT_MESSAGE" value="1、退款功能补充" />
+    <MESSAGE value="1、积分模块修复" />
+    <MESSAGE value="1、订单模块修复&#10;2、优惠券模块修复&#10;3、商家模块修复" />
+    <option name="LAST_COMMIT_MESSAGE" value="1、订单模块修复&#10;2、优惠券模块修复&#10;3、商家模块修复" />
   </component>
   <component name="WindowStateProjectService">
     <state x="734" y="358" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1743581020633">
@@ -422,10 +437,10 @@
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
     <state x="991" y="508" key="#com.intellij.fileTypes.FileTypeChooser/0.0.2560.1400@0.0.2560.1400" timestamp="1747709307430" />
-    <state x="1085" y="408" key="#com.intellij.ide.util.MemberChooser" timestamp="1747362074359">
+    <state x="1085" y="408" key="#com.intellij.ide.util.MemberChooser" timestamp="1748241389682">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state x="1085" y="408" key="#com.intellij.ide.util.MemberChooser/0.0.2560.1400@0.0.2560.1400" timestamp="1747362074359" />
+    <state x="1085" y="408" key="#com.intellij.ide.util.MemberChooser/0.0.2560.1400@0.0.2560.1400" timestamp="1748241389682" />
     <state x="1033" y="0" key="#com.intellij.refactoring.rename.AutomaticRenamingDialog" timestamp="1742351128151">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
@@ -434,66 +449,66 @@
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
     <state x="1010" y="449" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1741587414527" />
-    <state x="679" y="297" key="CommitChangelistDialog2" timestamp="1747815298289">
+    <state x="679" y="297" key="CommitChangelistDialog2" timestamp="1748246663870">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state x="679" y="297" key="CommitChangelistDialog2/0.0.2560.1400@0.0.2560.1400" timestamp="1747815298289" />
-    <state x="92" y="92" width="2376" height="1216" key="DiffContextDialog" timestamp="1747815295378">
+    <state x="679" y="297" key="CommitChangelistDialog2/0.0.2560.1400@0.0.2560.1400" timestamp="1748246663870" />
+    <state x="92" y="92" width="2376" height="1216" key="DiffContextDialog" timestamp="1748246640317">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state x="92" y="92" width="2376" height="1216" key="DiffContextDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1747815295378" />
-    <state x="1060" y="458" key="FileChooserDialogImpl" timestamp="1747551674976">
+    <state x="92" y="92" width="2376" height="1216" key="DiffContextDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1748246640317" />
+    <state x="1060" y="458" key="FileChooserDialogImpl" timestamp="1748181246387">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state x="1060" y="458" key="FileChooserDialogImpl/0.0.2560.1400@0.0.2560.1400" timestamp="1747551674976" />
-    <state width="2517" height="388" key="GridCell.Tab.0.bottom" timestamp="1747815277129">
+    <state x="1060" y="458" key="FileChooserDialogImpl/0.0.2560.1400@0.0.2560.1400" timestamp="1748181246387" />
+    <state width="2517" height="388" key="GridCell.Tab.0.bottom" timestamp="1748249637543">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2517" height="388" key="GridCell.Tab.0.bottom/0.0.2560.1400@0.0.2560.1400" timestamp="1747815277129" />
-    <state width="2517" height="388" key="GridCell.Tab.0.center" timestamp="1747815277129">
+    <state width="2517" height="388" key="GridCell.Tab.0.bottom/0.0.2560.1400@0.0.2560.1400" timestamp="1748249637543" />
+    <state width="2517" height="388" key="GridCell.Tab.0.center" timestamp="1748249637543">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2517" height="388" key="GridCell.Tab.0.center/0.0.2560.1400@0.0.2560.1400" timestamp="1747815277129" />
-    <state width="2517" height="388" key="GridCell.Tab.0.left" timestamp="1747815277129">
+    <state width="2517" height="388" key="GridCell.Tab.0.center/0.0.2560.1400@0.0.2560.1400" timestamp="1748249637543" />
+    <state width="2517" height="388" key="GridCell.Tab.0.left" timestamp="1748249637543">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2517" height="388" key="GridCell.Tab.0.left/0.0.2560.1400@0.0.2560.1400" timestamp="1747815277129" />
-    <state width="2517" height="388" key="GridCell.Tab.0.right" timestamp="1747815277129">
+    <state width="2517" height="388" key="GridCell.Tab.0.left/0.0.2560.1400@0.0.2560.1400" timestamp="1748249637543" />
+    <state width="2517" height="388" key="GridCell.Tab.0.right" timestamp="1748249637543">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2517" height="388" key="GridCell.Tab.0.right/0.0.2560.1400@0.0.2560.1400" timestamp="1747815277129" />
-    <state width="2517" height="388" key="GridCell.Tab.1.bottom" timestamp="1747815277130">
+    <state width="2517" height="388" key="GridCell.Tab.0.right/0.0.2560.1400@0.0.2560.1400" timestamp="1748249637543" />
+    <state width="2517" height="388" key="GridCell.Tab.1.bottom" timestamp="1748249637543">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2517" height="388" key="GridCell.Tab.1.bottom/0.0.2560.1400@0.0.2560.1400" timestamp="1747815277130" />
-    <state width="2517" height="388" key="GridCell.Tab.1.center" timestamp="1747815277129">
+    <state width="2517" height="388" key="GridCell.Tab.1.bottom/0.0.2560.1400@0.0.2560.1400" timestamp="1748249637543" />
+    <state width="2517" height="388" key="GridCell.Tab.1.center" timestamp="1748249637543">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2517" height="388" key="GridCell.Tab.1.center/0.0.2560.1400@0.0.2560.1400" timestamp="1747815277129" />
-    <state width="2517" height="388" key="GridCell.Tab.1.left" timestamp="1747815277129">
+    <state width="2517" height="388" key="GridCell.Tab.1.center/0.0.2560.1400@0.0.2560.1400" timestamp="1748249637543" />
+    <state width="2517" height="388" key="GridCell.Tab.1.left" timestamp="1748249637543">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2517" height="388" key="GridCell.Tab.1.left/0.0.2560.1400@0.0.2560.1400" timestamp="1747815277129" />
-    <state width="2517" height="388" key="GridCell.Tab.1.right" timestamp="1747815277129">
+    <state width="2517" height="388" key="GridCell.Tab.1.left/0.0.2560.1400@0.0.2560.1400" timestamp="1748249637543" />
+    <state width="2517" height="388" key="GridCell.Tab.1.right" timestamp="1748249637543">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2517" height="388" key="GridCell.Tab.1.right/0.0.2560.1400@0.0.2560.1400" timestamp="1747815277129" />
-    <state width="2517" height="388" key="GridCell.Tab.2.bottom" timestamp="1747815277130">
+    <state width="2517" height="388" key="GridCell.Tab.1.right/0.0.2560.1400@0.0.2560.1400" timestamp="1748249637543" />
+    <state width="2517" height="388" key="GridCell.Tab.2.bottom" timestamp="1748249637543">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2517" height="388" key="GridCell.Tab.2.bottom/0.0.2560.1400@0.0.2560.1400" timestamp="1747815277130" />
-    <state width="2517" height="388" key="GridCell.Tab.2.center" timestamp="1747815277130">
+    <state width="2517" height="388" key="GridCell.Tab.2.bottom/0.0.2560.1400@0.0.2560.1400" timestamp="1748249637543" />
+    <state width="2517" height="388" key="GridCell.Tab.2.center" timestamp="1748249637543">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2517" height="388" key="GridCell.Tab.2.center/0.0.2560.1400@0.0.2560.1400" timestamp="1747815277130" />
-    <state width="2517" height="388" key="GridCell.Tab.2.left" timestamp="1747815277130">
+    <state width="2517" height="388" key="GridCell.Tab.2.center/0.0.2560.1400@0.0.2560.1400" timestamp="1748249637543" />
+    <state width="2517" height="388" key="GridCell.Tab.2.left" timestamp="1748249637543">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2517" height="388" key="GridCell.Tab.2.left/0.0.2560.1400@0.0.2560.1400" timestamp="1747815277130" />
-    <state width="2517" height="388" key="GridCell.Tab.2.right" timestamp="1747815277130">
+    <state width="2517" height="388" key="GridCell.Tab.2.left/0.0.2560.1400@0.0.2560.1400" timestamp="1748249637543" />
+    <state width="2517" height="388" key="GridCell.Tab.2.right" timestamp="1748249637543">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2517" height="388" key="GridCell.Tab.2.right/0.0.2560.1400@0.0.2560.1400" timestamp="1747815277130" />
+    <state width="2517" height="388" key="GridCell.Tab.2.right/0.0.2560.1400@0.0.2560.1400" timestamp="1748249637543" />
     <state x="903" y="413" key="RollbackChangesDialog" timestamp="1747651622845">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
@@ -502,18 +517,18 @@
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
     <state x="783" y="345" key="SettingsEditor/0.0.2560.1400@0.0.2560.1400" timestamp="1741573035388" />
-    <state x="872" y="436" key="Vcs.Push.Dialog.v2" timestamp="1747809217067">
+    <state x="872" y="436" key="Vcs.Push.Dialog.v2" timestamp="1748246670238">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state x="872" y="436" key="Vcs.Push.Dialog.v2/0.0.2560.1400@0.0.2560.1400" timestamp="1747809217067" />
+    <state x="872" y="436" key="Vcs.Push.Dialog.v2/0.0.2560.1400@0.0.2560.1400" timestamp="1748246670238" />
     <state x="972" y="527" key="com.intellij.ide.util.TipDialog" timestamp="1741580728988">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
     <state x="972" y="527" key="com.intellij.ide.util.TipDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1741580728988" />
-    <state x="900" y="426" width="759" height="548" key="find.popup" timestamp="1742204627580">
+    <state x="900" y="426" width="800" height="548" key="find.popup" timestamp="1748181359016">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state x="900" y="426" width="759" height="548" key="find.popup/0.0.2560.1400@0.0.2560.1400" timestamp="1742204627580" />
+    <state x="900" y="426" width="800" height="548" key="find.popup/0.0.2560.1400@0.0.2560.1400" timestamp="1748181359016" />
     <state x="943" y="315" width="672" height="678" key="search.everywhere.popup" timestamp="1747351903626">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
@@ -524,7 +539,7 @@
       <breakpoints>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/OrderServiceImpl.java</url>
-          <line>471</line>
+          <line>520</line>
           <option name="timeStamp" value="31" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
@@ -537,11 +552,17 @@
           <line>162</line>
           <option name="timeStamp" value="43" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/OrderServiceImpl.java</url>
+          <line>344</line>
+          <option name="timeStamp" value="49" />
+        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
     <watches-manager>
       <configuration name="SpringBootApplicationConfigurationType">
         <watch expression="productId" />
+        <watch expression="pageList.countId" />
       </configuration>
     </watches-manager>
   </component>

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/VouchersServiceImpl.java

@@ -67,14 +67,11 @@ public class VouchersServiceImpl implements VouchersService {
                 //优惠券类型
                 query.eq(MassageVouchersUser::getType, massageVouchersUser.getType());
             }
-            if(StringUtils.isNotBlank(massageVouchersUser.getStatus())){
-                //优惠券使用状态
-                query.eq(MassageVouchersUser::getStatus, massageVouchersUser.getStatus());
-            }
             //优惠券使用状态：0-未使用 1-已使用 2-已失效
             if(StringUtils.isNotEmpty(massageVouchersUser.getStatus())){
                 if("2".equals(massageVouchersUser.getStatus())){
                     query.lt(MassageVouchersUser::getValidDate, CommonUtils.getCurrentTime());//已失效
+                    query.notIn(MassageVouchersUser::getStatus, "1");
                 }else {
                     query.eq(MassageVouchersUser::getStatus, massageVouchersUser.getStatus());
                     if("0".equals(massageVouchersUser.getStatus())){