1、积分模块修复

.idea/workspace.xml

@@ -2,51 +2,14 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="8b88b979-c3fa-4858-8fa6-d3a5d334cf69" name="Default Changelist" comment="1、">
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_wechatpay_apiv3_wechatpay_java_0_2_15.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_wechatpay_apiv3_wechatpay_java_core_0_2_15.xml" afterDir="false" />
       <change afterPath="$PROJECT_DIR$/admin-hanhai-vue/dist.zip" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageRefoundLog/controller/MassageRefoundLogController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageRefoundLog/entity/MassageRefoundLog.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageRefoundLog/mapper/MassageRefoundLogMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageRefoundLog/mapper/xml/MassageRefoundLogMapper.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageRefoundLog/service/IMassageRefoundLogService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageRefoundLog/service/impl/MassageRefoundLogServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageRefoundLog/vue/MassageRefoundLogList.vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageRefoundLog/vue/modules/MassageRefoundLogForm.vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageRefoundLog/vue/modules/MassageRefoundLogModal.Style#Drawer.vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageRefoundLog/vue/modules/MassageRefoundLogModal.vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageRefoundLog/vue3/MassageRefoundLog.api.ts" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageRefoundLog/vue3/MassageRefoundLog.data.ts" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageRefoundLog/vue3/MassageRefoundLogList.vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageRefoundLog/vue3/components/MassageRefoundLogModal.vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/RefoundController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/WxMiniappPayService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/WxMiniappPayServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wxUtils/CreateOrderReq.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wxUtils/HttpServletUtils.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wxUtils/PayOrderInfo.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wxUtils/QueryOrderReq.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wxUtils/RefundOrderReq.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wxUtils/Response.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wxUtils/WxPayAutoCertificateConfig.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wxUtils/WxPayConfig.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/resources/apiclient_key.pem" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/resources/pub_key.pem" afterDir="false" />
       <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-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageOrder/controller/MassageOrderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageOrder/controller/MassageOrderController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageOrder/entity/MassageOrder.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageOrder/entity/MassageOrder.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageOrder/mapper/MassageOrderMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageOrder/mapper/MassageOrderMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageOrder/service/IMassageOrderService.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageOrder/service/IMassageOrderService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageOrder/service/impl/MassageOrderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageOrder/service/impl/MassageOrderServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageOrder/vue/MassageOrderList.vue" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageOrder/vue/MassageOrderList.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageOrder/vue/modules/MassageOrderForm.vue" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageOrder/vue/modules/MassageOrderForm.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageOrder/vue3/MassageOrder.data.ts" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageOrder/vue3/MassageOrder.data.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/jeecg-boot-module-system.iml" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/jeecg-boot-module-system.iml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/pom.xml" 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/resources/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/resources/application-dev.yml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -243,7 +206,7 @@
       <workItem from="1744268260382" duration="15845000" />
       <workItem from="1746000753098" duration="13433000" />
       <workItem from="1746752649258" duration="24956000" />
-      <workItem from="1747350180318" duration="76266000" />
+      <workItem from="1747350180318" duration="82572000" />
     </task>
     <task id="LOCAL-00001" summary="1、项目初始化">
       <created>1741919155045</created>
@@ -399,7 +362,14 @@
       <option name="project" value="LOCAL" />
       <updated>1747651365497</updated>
     </task>
-    <option name="localTasksCounter" value="23" />
+    <task id="LOCAL-00023" summary="1、退款功能补充">
+      <created>1747809213012</created>
+      <option name="number" value="00023" />
+      <option name="presentableId" value="LOCAL-00023" />
+      <option name="project" value="LOCAL" />
+      <updated>1747809213012</updated>
+    </task>
+    <option name="localTasksCounter" value="24" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -440,7 +410,8 @@
     <MESSAGE value="1、支付模块修复" />
     <MESSAGE value="1、bug修复" />
     <MESSAGE value="1、基础数据bug修复" />
-    <option name="LAST_COMMIT_MESSAGE" value="1、基础数据bug修复" />
+    <MESSAGE value="1、退款功能补充" />
+    <option name="LAST_COMMIT_MESSAGE" value="1、退款功能补充" />
   </component>
   <component name="WindowStateProjectService">
     <state x="734" y="358" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1743581020633">
@@ -463,66 +434,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="1747796047643">
+    <state x="679" y="297" key="CommitChangelistDialog2" timestamp="1747815298289">
       <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="1747796047643" />
-    <state x="92" y="92" width="2376" height="1216" key="DiffContextDialog" timestamp="1747796045011">
+    <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">
       <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="1747796045011" />
+    <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">
       <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="1747808992777">
+    <state width="2517" height="388" key="GridCell.Tab.0.bottom" timestamp="1747815277129">
       <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="1747808992777" />
-    <state width="2517" height="388" key="GridCell.Tab.0.center" timestamp="1747808992777">
+    <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">
       <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="1747808992777" />
-    <state width="2517" height="388" key="GridCell.Tab.0.left" timestamp="1747808992777">
+    <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">
       <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="1747808992777" />
-    <state width="2517" height="388" key="GridCell.Tab.0.right" timestamp="1747808992777">
+    <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">
       <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="1747808992777" />
-    <state width="2517" height="388" key="GridCell.Tab.1.bottom" timestamp="1747808992698">
+    <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">
       <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="1747808992698" />
-    <state width="2517" height="388" key="GridCell.Tab.1.center" timestamp="1747808992698">
+    <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">
       <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="1747808992698" />
-    <state width="2517" height="388" key="GridCell.Tab.1.left" timestamp="1747808992698">
+    <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">
       <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="1747808992698" />
-    <state width="2517" height="388" key="GridCell.Tab.1.right" timestamp="1747808992698">
+    <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">
       <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="1747808992698" />
-    <state width="2517" height="388" key="GridCell.Tab.2.bottom" timestamp="1747808992698">
+    <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">
       <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="1747808992698" />
-    <state width="2517" height="388" key="GridCell.Tab.2.center" timestamp="1747808992698">
+    <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">
       <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="1747808992698" />
-    <state width="2517" height="388" key="GridCell.Tab.2.left" timestamp="1747808992698">
+    <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">
       <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="1747808992698" />
-    <state width="2517" height="388" key="GridCell.Tab.2.right" timestamp="1747808992698">
+    <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">
       <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="1747808992698" />
+    <state width="2517" height="388" key="GridCell.Tab.2.right/0.0.2560.1400@0.0.2560.1400" timestamp="1747815277130" />
     <state x="903" y="413" key="RollbackChangesDialog" timestamp="1747651622845">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
@@ -531,10 +502,10 @@
       <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="1747651367913">
+    <state x="872" y="436" key="Vcs.Push.Dialog.v2" timestamp="1747809217067">
       <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="1747651367913" />
+    <state x="872" y="436" key="Vcs.Push.Dialog.v2/0.0.2560.1400@0.0.2560.1400" timestamp="1747809217067" />
     <state x="972" y="527" key="com.intellij.ide.util.TipDialog" timestamp="1741580728988">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
@@ -561,6 +532,11 @@
           <line>249</line>
           <option name="timeStamp" value="36" />
         </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/ScoreServiceImpl.java</url>
+          <line>162</line>
+          <option name="timeStamp" value="43" />
+        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
     <watches-manager>

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/ScoreController.java

@@ -30,8 +30,8 @@ public class ScoreController {
     //查看积分列表
     @ApiOperation(value="积分-查询积分列表", notes="积分-查询积分列表")
     @RequestMapping(value = "/queryScoreList", method = {RequestMethod.GET})
-    public Result<?> queryScoreList(@RequestHeader("X-Access-Token") String token, MassageScore massageScore, PageBean pageBean){
-        return scoreService.queryScoreList(token, massageScore, pageBean);
+    public Result<?> queryScoreList(@RequestHeader("X-Access-Token") String token, String type, String createTime, PageBean pageBean){
+        return scoreService.queryScoreList(token, type, createTime, pageBean);
     }
 
     //签到获取积分
@@ -41,4 +41,11 @@ public class ScoreController {
         return scoreService.sign(token);
     }
 
+    //查看连续签到天数
+    @ApiOperation(value="积分-查看连续签到天数", notes="积分-查看连续签到天数")
+    @RequestMapping(value = "/getContinuDay", method = {RequestMethod.POST})
+    public Result<?> getContinuDay(@RequestHeader("X-Access-Token") String token){
+        return scoreService.getContinuDay(token);
+    }
+
 }

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

@@ -11,8 +11,11 @@ import org.springframework.web.bind.annotation.RequestMethod;
 
 public interface ScoreService {
     //查看积分列表
-    public Result<?> queryScoreList(@RequestHeader("X-Access-Token") String token, MassageScore massageScore, PageBean pageBean);
+    public Result<?> queryScoreList(@RequestHeader("X-Access-Token") String token, String type, String createTime, PageBean pageBean);
 
     //签到获取积分
     public Result<?> sign(@RequestHeader("X-Access-Token") String token);
+
+    //查看连续签到天数
+    public Result<?> getContinuDay(String token);
 }

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

@@ -17,6 +17,10 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
 
 @Service
 public class ScoreServiceImpl implements ScoreService {
@@ -37,9 +41,10 @@ public class ScoreServiceImpl implements ScoreService {
 
     //查看积分列表
     @Override
-    public Result<?> queryScoreList(String token, MassageScore massageScore, PageBean pageBean) {
+    public Result<?> queryScoreList(String token, String type, String createTime, PageBean pageBean) {
         //权限验证
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        //HanHaiMember hanHaiMember = hanHaiMemberService.getById("1919044608477175810");
         //返回信息
         String massege = "";
         //分页信息
@@ -56,9 +61,12 @@ public class ScoreServiceImpl implements ScoreService {
                     .lambdaQuery();
 
             //组装查询条件
-            if(StringUtils.isNotBlank(massageScore.getType())){
+            if(StringUtils.isNotBlank(type)){
                 //积分类型
-                query.eq(MassageScore::getType, massageScore.getType());
+                query.eq(MassageScore::getType, type);
+            }
+            if(StringUtils.isNotEmpty(createTime)){
+                query.like(MassageScore::getCreateTime, createTime);
             }
 
             //积分所属
@@ -81,10 +89,26 @@ public class ScoreServiceImpl implements ScoreService {
     public Result<?> sign(String token) {
         //权限验证
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        //HanHaiMember hanHaiMember = hanHaiMemberService.getById("1919044608477175810");
         //返回信息
         String massege = "";
 
         try{
+            //判断用户今日是否已签到
+            //获取今天日期
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            Date now = new Date();
+            String formattedDate = sdf.format(now);
+            //查询用户是否有今日签到记录
+            MassageScore scoreLog = massageScoreService
+                    .lambdaQuery()
+                    .eq(MassageScore::getUserId, hanHaiMember.getId())
+                    .like(MassageScore::getCreateTime, formattedDate)
+                    .one();
+            if(null != scoreLog){
+                return Result.error("今日已签过到，不能重复签到");
+            }
+
             //获取签到积分数量
             MassageConfig  config = massageConfigService
                     .lambdaQuery()
@@ -125,4 +149,52 @@ public class ScoreServiceImpl implements ScoreService {
             return Result.error("签到失败");
         }
     }
+
+    //查看连续签到天数
+    @Override
+    public Result<?> getContinuDay(String token){
+        //权限验证
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        //HanHaiMember hanHaiMember = hanHaiMemberService.getById("1919044608477175810");
+
+        try {
+            int num = 0;
+            //获取今天日期
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            Date now = new Date();
+            String today = sdf.format(now);
+
+            //获取签到列表
+            List<MassageScore> scoreList = massageScoreService
+                    .lambdaQuery()
+                    .eq(MassageScore::getUserId, hanHaiMember.getId())
+                    .orderByDesc(MassageScore::getCreateTime)
+                    .list();
+            for (MassageScore score : scoreList) {
+                String createTime = sdf.format(score.getCreateTime());
+                if(createTime.contains(today)){
+                    num++;
+                    //当前天数减1
+                    // 创建Calendar实例
+                    Calendar cal = Calendar.getInstance();
+                    cal.setTime(now); // 设置当前时间
+
+                    // 在当前时间基础上加n个月
+                    cal.add(Calendar.DATE, -1);
+                    Date newTime = cal.getTime();
+                    now = newTime;
+                    today = sdf.format(newTime);
+                }else {
+                    break;
+                }
+            }
+
+            return Result.OK("连续签到天数", num);
+        }catch (Exception e){
+            e.printStackTrace();
+            return Result.error("查询连续签到天数失败");
+        }
+
+    }
+
 }

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

@@ -85,7 +85,7 @@ public class UserInfoServiceImpl implements UserInfoService {
     public Result<?> getUserCenterData(String token){
         //权限验证
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
-        //HanHaiMember hanHaiMember = hanHaiMemberService.getById("1920785149671268353");
+        //HanHaiMember hanHaiMember = hanHaiMemberService.getById("1919297392365035521");
         //返回信息
         Map map = new HashMap();
 

jeecg-boot-module-system/src/main/resources/application-dev.yml

@@ -335,10 +335,10 @@ wx:
     appid: wx77ba4c7131677a74 # 微信小程序appid
     secret: fb915d623f92d455f2e70934f75fb96c # 微信小程序密钥
     merchantId: 1712378227 # 商户号
-    privateKeyPath: jeecg-boot-module-system/src/main/resources/apiclient_key.pem #本地私钥路径
-    publicKeyPath: jeecg-boot-module-system/src/main/resources/pub_key.pem #本地公钥路径
-#    privateKeyPath: /root/massage/cerFile/apiclient_key.pem #线上私钥路径
-#    publicKeyPath: /root/massage/cerFile/pub_key.pem #线上公钥路径
+#    privateKeyPath: jeecg-boot-module-system/src/main/resources/apiclient_key.pem #本地私钥路径
+#    publicKeyPath: jeecg-boot-module-system/src/main/resources/pub_key.pem #本地公钥路径
+    privateKeyPath: /root/massage/cerFile/apiclient_key.pem #线上私钥路径
+    publicKeyPath: /root/massage/cerFile/pub_key.pem #线上公钥路径
     publicKeyId: PUB_KEY_ID_0117123782272025033100396400002931 #公钥
     merchantSerialNumber: 33E9FE8076531A7C7AD401DC34E053DBD7C28E22  # 商户API证书序列号
     apiV3Key: 0fdb77429ffdf206c151af76a663041c # 商户APIV3密钥