夏文涛 %!s(int64=2) %!d(string=hai) anos
pai
achega
cf8b50cea2
Modificáronse 24 ficheiros con 907 adicións e 386 borrados
  1. 300 221
      .idea/workspace.xml
  2. 6 0
      src/main/java/com/repair/api/RepairPayRecordControllerAPI.java
  3. 6 1
      src/main/java/com/repair/api/RepairRecordControllerAPI.java
  4. 92 0
      src/main/java/com/repair/common/utils/UUIDUtils.java
  5. 1 1
      src/main/java/com/repair/controller/LoginController.java
  6. 138 16
      src/main/java/com/repair/controller/RepairPayRecordController.java
  7. 28 23
      src/main/java/com/repair/controller/RepairRecordController.java
  8. 1 0
      src/main/java/com/repair/controller/RepairUserController.java
  9. 2 0
      src/main/java/com/repair/mapper/RepairRecordMapper.java
  10. 2 0
      src/main/java/com/repair/model/enumModel/eIsSuccess.java
  11. 19 0
      src/main/java/com/repair/model/enumModel/ePayPageStatu.java
  12. 6 17
      src/main/java/com/repair/model/request/AlterPriceRequest.java
  13. 17 0
      src/main/java/com/repair/model/request/RefundableAmountRequest.java
  14. 7 0
      src/main/java/com/repair/model/request/updateAddressBookRequest.java
  15. 32 0
      src/main/java/com/repair/model/vo/MasterHomepageVo.java
  16. 4 3
      src/main/java/com/repair/model/vo/ProsperityRepairPayRecordsVo.java
  17. 16 0
      src/main/java/com/repair/model/vo/RepairTechnicianVo.java
  18. 2 0
      src/main/java/com/repair/services/RepairRecordService.java
  19. 6 0
      src/main/java/com/repair/services/impl/RepairRecordServiceImpl.java
  20. 107 52
      src/main/resources/mapper/repair/RepairRecordMapper.xml
  21. 107 52
      target/classes/mapper/repair/RepairRecordMapper.xml
  22. 4 0
      target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
  23. 4 0
      target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
  24. BIN=BIN
      target/repair_system-0.0.1-SNAPSHOT.jar.original

+ 300 - 221
.idea/workspace.xml

@@ -2,9 +2,23 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="33456f28-da03-4d10-99dd-fd9bd193cf84" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/MasterHomepageVo.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/api/RepairPayRecordControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/api/RepairPayRecordControllerAPI.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/api/RepairRecordControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/api/RepairRecordControllerAPI.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/LoginController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/LoginController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/LoginVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/LoginVo.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairPayRecordController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairPayRecordController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairUserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairUserController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairRecordMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairRecordMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/eIsSuccess.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/eIsSuccess.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/model/request/AlterPriceRequest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/request/AlterPriceRequest.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/model/request/updateAddressBookRequest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/request/updateAddressBookRequest.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/ProsperityRepairPayRecordsVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/ProsperityRepairPayRecordsVo.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairTechnicianVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairTechnicianVo.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/services/RepairRecordService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/services/RepairRecordService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairRecordServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairRecordServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/mapper/repair/RepairRecordMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/repair/RepairRecordMapper.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/repair_system-0.0.1-SNAPSHOT.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/target/repair_system-0.0.1-SNAPSHOT.jar.original" afterDir="false" />
@@ -23,31 +37,51 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java">
+        <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="522">
-              <caret line="493" column="22" selection-start-line="493" selection-start-column="22" selection-end-line="493" selection-end-column="22" />
+            <state relative-caret-position="601">
+              <caret line="192" column="13" selection-start-line="192" selection-start-column="13" selection-end-line="192" selection-end-column="13" />
               <folding>
-                <element signature="imports" expanded="true" />
+                <element signature="e#2873#2877#0" expanded="true" />
+                <element signature="e#12102#12106#0" expanded="true" />
+                <element signature="e#41254#41258#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/LoginController.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="299">
+              <caret line="130" lean-forward="true" selection-start-line="130" selection-end-line="130" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairUserController.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="453">
-              <caret line="329" column="13" selection-start-line="329" selection-start-column="13" selection-end-line="329" selection-end-column="13" />
+              <caret line="232" column="43" selection-start-line="232" selection-start-column="43" selection-end-line="232" selection-end-column="43" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairRecordControllerAPI.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/updateAddressBookRequest.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="575">
+              <caret line="28" column="24" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="24" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/AlterPriceRequest.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="407">
-              <caret line="70" column="32" selection-start-line="70" selection-start-column="17" selection-end-line="70" selection-end-column="32" />
+            <state relative-caret-position="253">
+              <caret line="11" column="3" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -55,11 +89,53 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/LoginController.java">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairTechnicianVo.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="447">
+              <caret line="96" column="35" selection-start-line="96" selection-start-column="19" selection-end-line="96" selection-end-column="35" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairRecordService.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="65">
+              <caret line="37" selection-start-line="37" selection-end-line="37" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="476">
+              <caret line="419" column="73" selection-start-line="419" selection-start-column="57" selection-end-line="419" selection-end-column="73" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairRecordServiceImpl.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="24">
+              <caret line="90" column="5" selection-start-line="90" selection-start-column="5" selection-end-line="90" selection-end-column="5" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairRecordControllerAPI.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="377">
-              <caret line="139" lean-forward="true" selection-start-line="139" selection-end-line="139" />
+            <state relative-caret-position="315">
+              <caret line="66" column="33" selection-start-line="66" selection-start-column="17" selection-end-line="66" selection-end-column="33" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -76,36 +152,36 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>importRepairConsumeExcel</find>
-      <find>datas</find>
-      <find>协作申请</find>
-      <find>转单申请</find>
-      <find>cooperationDetail</find>
-      <find>recordId</find>
-      <find>queryPageRepairUsers</find>
-      <find>autoDispatchUser</find>
-      <find>.startDa</find>
-      <find>派单</find>
-      <find>user.startDate</find>
-      <find>auto</find>
-      <find>acceptanceAssessTime</find>
-      <find>queryRepairCardNumber</find>
-      <find>receiveSendOrders</find>
-      <find>repairUserService.autoDispatchUser</find>
-      <find>延时</find>
-      <find>DelayedRequest</find>
-      <find>delayed</find>
-      <find>cooperationOrders</find>
-      <find>repairUsers</find>
-      <find>getCollaborator</find>
-      <find>transferOrder</find>
-      <find>queryCollaborator</find>
-      <find>queryRepairTechnicianCount</find>
-      <find>Login</find>
-      <find>转单审核</find>
+      <find>or or</find>
+      <find>examine_count</find>
+      <find>maintenance_count</find>
+      <find>receiving_count</find>
+      <find>select rr3.*</find>
+      <find>Now()</find>
+      <find>()</find>
+      <find>15</find>
+      <find>date_add</find>
+      <find>ReportExportVo</find>
+      <find>queryTeamWorkPending</find>
+      <find>queryTeamWorkMaintenance</find>
+      <find>queryTeamWorkTimeout</find>
+      <find>queryTeamWorkLogistics</find>
+      <find>queryTeamWorkExamine</find>
+      <find>getAddressBook</find>
+      <find>queryTeamWorkClosed</find>
+      <find>queryPendingOrderList</find>
+      <find>queryPendingOrder</find>
+      <find>queryTeamWorkPage</find>
+      <find>repairRecordTechnicianDataMap</find>
+      <find>getRepairRecordsByUserId</find>
+      <find>queryMyRepairRecordList</find>
+      <find>getTechniciansByUserId</find>
+      <find>queryTimeoutOrderList</find>
+      <find>school</find>
+      <find>queryManagePage</find>
       <find>queryNotTimeout</find>
       <find>queryManageCount</find>
-      <find>queryManagePage</find>
+      <find>updateAddressBook</find>
     </findStrings>
     <replaceStrings>
       <replace>Consume</replace>
@@ -146,18 +222,11 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/request/repairPayRequest.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/request/transferOrderRequest.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/request/transferRequest.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairTransferRecord.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/request/cooperationOrdersRequest.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/eDispatchResult.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairCollaborateRecord.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/MyRepairRecordVo.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairRecordMapper.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/RepairRecordService.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairRecordServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/common/utils/TimeExchange.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/services/RepairClassesSettingsService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairClassesSettingsServiceImpl.java" />
@@ -178,7 +247,6 @@
         <option value="$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairTransferRecordMapper.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/services/RepairTransferRecordService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairTransferRecordServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/request/AlterPriceRequest.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/AutoDispatchUserVo.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/request/ReceiveSendOrdersRequest.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/request/DelayedRequest.java" />
@@ -186,17 +254,25 @@
         <option value="$PROJECT_DIR$/src/main/java/com/repair/services/RepairDispatchRecordService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/services/RepairReceivingService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairReceivingServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairUserControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairUserMapper.java" />
         <option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairUserMapper.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairUserServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/services/RepairUserService.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairUserController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairPayRecordController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/LoginVo.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/MasterHomepageVo.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairRecordMapper.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairTechnicianVo.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairRecordControllerAPI.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/RepairRecordService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairRecordServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/request/AlterPriceRequest.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/LoginController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/request/updateAddressBookRequest.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairUserController.java" />
       </list>
     </option>
   </component>
@@ -228,9 +304,9 @@
   <component name="MavenRunner">
     <option name="skipTests" value="true" />
   </component>
-  <component name="ProjectFrameBounds" extendedState="6">
+  <component name="ProjectFrameBounds">
     <option name="x" value="-7" />
-    <option name="width" value="974" />
+    <option name="width" value="972" />
     <option name="height" value="1039" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
@@ -239,8 +315,8 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -299,15 +375,6 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="repair" type="462c0819:PsiDirectoryNode" />
-              <item name="api" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="repair_report" type="b2602c69:ProjectViewProjectNode" />
-              <item name="repair_backend" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="repair" type="462c0819:PsiDirectoryNode" />
               <item name="common" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -411,6 +478,16 @@
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="repair" type="462c0819:PsiDirectoryNode" />
               <item name="model" type="462c0819:PsiDirectoryNode" />
+              <item name="enumModel" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="repair_report" type="b2602c69:ProjectViewProjectNode" />
+              <item name="repair_backend" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="repair" type="462c0819:PsiDirectoryNode" />
+              <item name="model" type="462c0819:PsiDirectoryNode" />
               <item name="request" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -490,24 +567,24 @@
     <selection>jr</selection>
   </component>
   <component name="RecentsManager">
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\resources\mapper\repair" />
+      <recent name="D:\Bingo\Desktop\工作内容\报修系统\BackRepairSystem\src\main\resources\mapper\repair" />
+      <recent name="D:\Bingo\Desktop\工作内容\报修系统\BackRepairSystem\src\main\resources" />
+      <recent name="D:\Bingo\Desktop\工作内容\报修系统\Back-endDevelopmentFramework\src\main\resources\mapper\video" />
+    </key>
     <key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
       <recent name="com.template" />
     </key>
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="D:\Bingo\Desktop\工作内容\报修系统\BackRepairSystem\src\main\resources\excelFile" />
-    </key>
     <key name="CopyClassDialog.RECENTS_KEY">
-      <recent name="com.repair.model.vo" />
       <recent name="com.repair.model.request" />
+      <recent name="com.repair.model.vo" />
       <recent name="com.repair.api" />
       <recent name="com.repair.model.enumModel" />
       <recent name="com.repair.common.utils" />
     </key>
-    <key name="MoveFile.RECENT_KEYS">
-      <recent name="D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\resources\mapper\repair" />
-      <recent name="D:\Bingo\Desktop\工作内容\报修系统\BackRepairSystem\src\main\resources\mapper\repair" />
-      <recent name="D:\Bingo\Desktop\工作内容\报修系统\BackRepairSystem\src\main\resources" />
-      <recent name="D:\Bingo\Desktop\工作内容\报修系统\Back-endDevelopmentFramework\src\main\resources\mapper\video" />
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="D:\Bingo\Desktop\工作内容\报修系统\BackRepairSystem\src\main\resources\excelFile" />
     </key>
   </component>
   <component name="RunDashboard">
@@ -631,12 +708,13 @@
       <workItem from="1690506045062" duration="61277000" />
       <workItem from="1690850680543" duration="167784000" />
       <workItem from="1691462847133" duration="36999000" />
-      <workItem from="1691630777837" duration="54046000" />
+      <workItem from="1691630777837" duration="65575000" />
+      <workItem from="1691996170067" duration="6706000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="683407000" />
+    <option name="totallyTimeSpent" value="701642000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -651,7 +729,7 @@
     <frame x="-8" y="-8" width="1936" height="1048" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.13432837" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.12526652" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="JRebel" order="3" side_tool="true" />
@@ -662,8 +740,8 @@
       <window_info id="Web" order="8" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.32603937" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.4573304" />
-      <window_info active="true" anchor="bottom" id="Debug" order="3" visible="true" weight="0.10940919" />
+      <window_info anchor="bottom" id="Run" order="2" weight="0.55138123" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.71933705" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.32932165" />
@@ -680,7 +758,7 @@
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Maven" order="3" weight="0.8238512" />
+      <window_info anchor="right" id="Maven" order="3" weight="0.74413645" />
       <window_info anchor="right" id="Palette" order="4" />
       <window_info anchor="right" id="Capture Analysis" order="5" />
       <window_info anchor="right" id="Database" order="6" />
@@ -722,7 +800,7 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairTechnicianVo.java</url>
-          <line>75</line>
+          <line>76</line>
           <properties />
           <option name="timeStamp" value="154" />
         </line-breakpoint>
@@ -764,25 +842,25 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairPayRecordController.java</url>
-          <line>112</line>
+          <line>115</line>
           <properties />
           <option name="timeStamp" value="244" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairPayRecordController.java</url>
-          <line>159</line>
+          <line>162</line>
           <properties />
           <option name="timeStamp" value="245" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairPayRecordController.java</url>
-          <line>98</line>
+          <line>101</line>
           <properties />
           <option name="timeStamp" value="246" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java</url>
-          <line>790</line>
+          <line>789</line>
           <properties />
           <option name="timeStamp" value="247" />
         </line-breakpoint>
@@ -800,13 +878,13 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java</url>
-          <line>929</line>
+          <line>928</line>
           <properties />
           <option name="timeStamp" value="263" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java</url>
-          <line>1593</line>
+          <line>1592</line>
           <properties />
           <option name="timeStamp" value="264" />
         </line-breakpoint>
@@ -824,107 +902,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairClassesSettingsService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="548">
-          <caret line="31" column="32" selection-start-line="31" selection-start-column="32" selection-end-line="31" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairClassesSettingsController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3310">
-          <caret line="412" column="48" selection-start-line="412" selection-start-column="48" selection-end-line="412" selection-end-column="48" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/eRecordStatu.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="272">
-          <caret line="14" column="12" selection-start-line="14" selection-start-column="4" selection-end-line="14" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/CollaborateDataVo.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="253">
-          <caret line="11" column="30" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairCollaborateRecordServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="631">
-          <caret line="76" column="53" selection-start-line="76" selection-start-column="31" selection-end-line="76" selection-end-column="53" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairCollaborateRecordMapper.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="368">
-          <caret line="23" column="82" lean-forward="true" selection-start-line="23" selection-start-column="66" selection-end-line="23" selection-end-column="82" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairCollaborateRecordService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="621">
-          <caret line="35" column="23" selection-start-line="35" selection-start-column="4" selection-end-line="35" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/CollaborateDetailVo.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="631">
-          <caret line="41" column="9" selection-start-line="41" selection-start-column="9" selection-end-line="41" selection-end-column="9" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/TransferDetailVo.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="253">
-          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairTransferRecordService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="575">
-          <caret line="32" column="20" selection-start-line="32" selection-start-column="4" selection-end-line="32" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairTransferRecordMapper.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="207">
-          <caret line="9" column="85" selection-start-line="9" selection-start-column="69" selection-end-line="9" selection-end-column="85" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairTransferRecordServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="608">
-          <caret line="71" column="47" selection-start-line="71" selection-start-column="28" selection-end-line="71" selection-end-column="47" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairTransferRecordMapper.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="322">
-          <caret line="18" column="78" selection-start-line="18" selection-start-column="4" selection-end-line="18" selection-end-column="78" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/AutoDispatchUserVo.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1197">
-          <caret line="67" column="15" selection-start-line="67" selection-start-column="15" selection-end-line="67" selection-end-column="15" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairCardNumberVo.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="115">
@@ -1081,13 +1058,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairUserController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="482">
-          <caret line="244" column="126" selection-start-line="244" selection-start-column="126" selection-end-line="244" selection-end-column="126" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumeController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="231">
@@ -1098,20 +1068,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/MaintenanceTechnicianVo.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="253">
-          <caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/AlterPriceRequest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="31" column="57" selection-start-line="31" selection-start-column="57" selection-end-line="31" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairPayRecordController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="217">
@@ -1147,44 +1103,167 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairAdmin.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="453">
-          <caret line="329" column="13" selection-start-line="329" selection-start-column="13" selection-end-line="329" selection-end-column="13" />
+        <state relative-caret-position="-429">
+          <caret line="39" column="13" selection-start-line="39" selection-start-column="13" selection-end-line="39" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairSchoolMapper.xml">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/MaintenanceTechnicianVo.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="345">
+          <caret line="15" column="30" selection-start-line="15" selection-start-column="16" selection-end-line="15" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/eRecordStatu.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="522">
-          <caret line="493" column="22" selection-start-line="493" selection-start-column="22" selection-end-line="493" selection-end-column="22" />
+        <state relative-caret-position="216">
+          <caret line="14" column="12" selection-start-line="14" selection-start-column="4" selection-end-line="14" selection-end-column="12" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/AddressBookListVo.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="253">
+          <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairRecordMapper.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1288">
+          <caret line="63" column="41" selection-start-line="63" selection-start-column="41" selection-end-line="63" selection-end-column="41" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/WxAccessTokenServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="299">
+          <caret line="21" column="13" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/mapper/WxAccessTokenMapper.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="299">
+          <caret line="15" column="17" selection-start-line="15" selection-start-column="17" selection-end-line="15" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/MasterHomepageVo.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="161">
+          <caret line="9" column="36" lean-forward="true" selection-start-line="9" selection-start-column="36" selection-end-line="9" selection-end-column="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/pendingOrderVo.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-818">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairConsumables.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-298">
+          <caret line="34" column="13" selection-start-line="34" selection-start-column="13" selection-end-line="34" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/MyRepairRecordVo.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-1403">
+          <caret line="19" column="13" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairRecordService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="65">
+          <caret line="37" selection-start-line="37" selection-end-line="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairRecordServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="24">
+          <caret line="90" column="5" selection-start-line="90" selection-start-column="5" selection-end-line="90" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/AlterPriceRequest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="253">
+          <caret line="11" column="3" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairTechnicianVo.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="447">
+          <caret line="96" column="35" selection-start-line="96" selection-start-column="19" selection-end-line="96" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairRecordControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="407">
-          <caret line="70" column="32" selection-start-line="70" selection-start-column="17" selection-end-line="70" selection-end-column="32" />
+        <state relative-caret-position="315">
+          <caret line="66" column="33" selection-start-line="66" selection-start-column="17" selection-end-line="66" selection-end-column="33" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairAdmin.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-429">
-          <caret line="39" column="13" selection-start-line="39" selection-start-column="13" selection-end-line="39" selection-end-column="13" />
+        <state relative-caret-position="476">
+          <caret line="419" column="73" selection-start-line="419" selection-start-column="57" selection-end-line="419" selection-end-column="73" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="601">
+          <caret line="192" column="13" selection-start-line="192" selection-start-column="13" selection-end-line="192" selection-end-column="13" />
+          <folding>
+            <element signature="e#2873#2877#0" expanded="true" />
+            <element signature="e#12102#12106#0" expanded="true" />
+            <element signature="e#41254#41258#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/LoginController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="377">
-          <caret line="139" lean-forward="true" selection-start-line="139" selection-end-line="139" />
+        <state relative-caret-position="299">
+          <caret line="130" lean-forward="true" selection-start-line="130" selection-end-line="130" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/updateAddressBookRequest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="575">
+          <caret line="28" column="24" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairUserController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="453">
+          <caret line="232" column="43" selection-start-line="232" selection-start-column="43" selection-end-line="232" selection-end-column="43" />
         </state>
       </provider>
     </entry>

+ 6 - 0
src/main/java/com/repair/api/RepairPayRecordControllerAPI.java

@@ -1,6 +1,7 @@
 package com.repair.api;
 
 import com.repair.model.pojo.RepairPayRecord;
+import com.repair.model.request.RefundableAmountRequest;
 import com.repair.model.request.repairPayRequest;
 import com.repair.model.result.CommonResult;
 import io.swagger.annotations.Api;
@@ -37,4 +38,9 @@ public interface RepairPayRecordControllerAPI {
     @ApiOperation(value = "支付成功记录分页数据", notes = "支付成功记录分页数据", httpMethod = "GET")
     CommonResult queryProsperityRepairPayRecords(  @RequestParam int currentPage, @RequestParam int pageCount, String keyWord,String startTime,String endTime);
 
+    @PostMapping(value = "/refundableAmount")
+    @ApiOperation(value = "实退", notes = "实退", httpMethod = "POST")
+    CommonResult refundableAmount(@RequestBody RefundableAmountRequest rar, BindingResult bindingResult);
+
+
 }

+ 6 - 1
src/main/java/com/repair/api/RepairRecordControllerAPI.java

@@ -164,5 +164,10 @@ public interface RepairRecordControllerAPI {
 
     @GetMapping(value = "/reportExport")
     @ApiOperation(value = "报表导出", notes = "报表导出", httpMethod = "GET")
-    void reportExport(HttpServletResponse response,String keyWord, String startTime, String endTime, @RequestParam Integer schoolId, @RequestParam Integer state, @RequestHeader("user_head") String userhead) throws Exception;
+void reportExport(HttpServletResponse response,String keyWord, String startTime, String endTime, Integer schoolId, @RequestParam Integer state, @RequestHeader("user_head") String userhead) throws Exception;
+
+    @GetMapping(value = "/queryMasterHomeCount")
+    @ApiOperation(value = "维修师傅首页头部数量", notes = "维修师傅首页头部数量", httpMethod = "GET")
+    CommonResult queryMasterHomeCount(@RequestParam int userId);
+
 }

+ 92 - 0
src/main/java/com/repair/common/utils/UUIDUtils.java

@@ -0,0 +1,92 @@
+package com.repair.common.utils;
+
+import java.math.BigInteger;
+import java.security.SecureRandom;
+import java.util.Random;
+import java.util.UUID;
+import java.util.concurrent.locks.ReentrantLock;
+
+/**
+ * @author root
+ * @create 2020-12-24 19:45
+ */
+public class UUIDUtils {
+    private static boolean IS_THREADLOCALRANDOM_AVAILABLE = false;
+    private static Random random;
+    private static final long leastSigBits;
+    private static final ReentrantLock lock = new ReentrantLock();
+    private static long lastTime;
+    static {
+        try {
+            IS_THREADLOCALRANDOM_AVAILABLE = null != UUIDUtils.class.getClassLoader().loadClass(
+                    "java.util.concurrent.ThreadLocalRandom");
+        } catch (ClassNotFoundException e) {
+        }
+
+        byte[] seed = new SecureRandom().generateSeed(8);
+        leastSigBits = new BigInteger(seed).longValue();
+        if (!IS_THREADLOCALRANDOM_AVAILABLE) {
+            random = new Random(leastSigBits);
+        }
+    }
+
+    private UUIDUtils() {
+    }
+    /**
+     * Create a new random UUID.
+     *
+     * @return the new UUID
+     */
+    public static String random() {
+        byte[] randomBytes = new byte[16];
+        if (IS_THREADLOCALRANDOM_AVAILABLE) {
+            java.util.concurrent.ThreadLocalRandom.current().nextBytes(randomBytes);
+        } else {
+            random.nextBytes(randomBytes);
+        }
+
+        long mostSigBits = 0;
+        for (int i = 0; i < 8; i++) {
+            mostSigBits = (mostSigBits << 8) | (randomBytes[i] & 0xff);
+        }
+        long leastSigBits = 0;
+        for (int i = 8; i < 16; i++) {
+            leastSigBits = (leastSigBits << 8) | (randomBytes[i] & 0xff);
+        }
+
+        return new UUID(mostSigBits, leastSigBits).toString().replaceAll("-", "");
+    }
+
+    /**
+     * Create a new time-based UUID.
+     *
+     * @return the new UUID
+     */
+    public static String create() {
+        long timeMillis = (System.currentTimeMillis() * 10000) + 0x01B21DD213814000L;
+
+        lock.lock();
+        try {
+            if (timeMillis > lastTime) {
+                lastTime = timeMillis;
+            } else {
+                timeMillis = ++lastTime;
+            }
+        } finally {
+            lock.unlock();
+        }
+
+        // time low
+        long mostSigBits = timeMillis << 32;
+
+        // time mid
+        mostSigBits |= (timeMillis & 0xFFFF00000000L) >> 16;
+
+        // time hi and version
+        mostSigBits |= 0x1000 | ((timeMillis >> 48) & 0x0FFF); // version 1
+
+        return new UUID(mostSigBits, leastSigBits).toString().replaceAll("-", "");
+    }
+
+    
+}

+ 1 - 1
src/main/java/com/repair/controller/LoginController.java

@@ -140,7 +140,7 @@ public class LoginController implements LoginControllerAPI {
 
         String token = JWTUtil.getToken(result, null);
         LoginVo login = new LoginVo();
-        login.setSchoolId(result.getIsSuper() == 1 ? null : result.getSchoolId());
+        login.setSchoolId(result.getIsSuper() == 1 ? 0 : result.getSchoolId());
         login.setToken(token);
         login.setTokenTtl(JWTUtil.getExpired());
         login.setUserName(result.getUsername());

+ 138 - 16
src/main/java/com/repair/controller/RepairPayRecordController.java

@@ -8,13 +8,16 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.repair.api.RepairPayRecordControllerAPI;
 import com.repair.common.utils.TimeExchange;
+import com.repair.common.utils.UUIDUtils;
 import com.repair.common.utils.paramUtils;
 import com.repair.model.enumModel.eIsSuccess;
+import com.repair.model.enumModel.ePayPageStatu;
 import com.repair.model.enumModel.eRecordStatu;
 import com.repair.model.pojo.RepairPayRecord;
 import com.repair.model.pojo.RepairRecord;
 import com.repair.model.pojo.RepairRefundRecord;
 import com.repair.model.pojo.RepairUser;
+import com.repair.model.request.RefundableAmountRequest;
 import com.repair.model.request.repairPayRequest;
 import com.repair.model.result.CommonResult;
 import com.repair.model.result.PageUtils;
@@ -221,8 +224,18 @@ public class RepairPayRecordController implements RepairPayRecordControllerAPI {
         return "success";
     }
 
-	@Override
-    public CommonResult queryProsperityRepairPayRecords(int currentPage, int pageCount, String keyWord, String startTime, String endTime) {
+    /**
+     * 支付成功分页
+     *
+     * @param currentPage
+     * @param pageCount
+     * @param keyWord
+     * @param startTime
+     * @param endTime
+     * @return
+     */
+    @Override
+    public CommonResult     queryProsperityRepairPayRecords(int currentPage, int pageCount, String keyWord, String startTime, String endTime) {
 
         if (startTime != null && endTime != null) {
             try {
@@ -234,8 +247,8 @@ public class RepairPayRecordController implements RepairPayRecordControllerAPI {
 
 
         if (currentPage <= 0 && pageCount <= 0) {
-            currentPage=1;
-            pageCount=10;
+            currentPage = 1;
+            pageCount = 10;
         }
 
 //      判断是否为名字
@@ -255,34 +268,143 @@ public class RepairPayRecordController implements RepairPayRecordControllerAPI {
         LambdaQueryWrapper<RepairPayRecord> wrapper = new LambdaQueryWrapper<>();
 
         wrapper.in(ObjectUtils.isNotEmpty(keyWord) && userIdList.size() > 0, RepairPayRecord::getUserId, userIdList)
-                .between(ObjectUtils.isNotEmpty(startTime)&&ObjectUtils.isNotEmpty(endTime),RepairPayRecord::getCreateTime, startTime, endTime)
+                .between(ObjectUtils.isNotEmpty(startTime) && ObjectUtils.isNotEmpty(endTime), RepairPayRecord::getCreateTime, startTime, endTime)
                 .eq(RepairPayRecord::getIsSuccess, eIsSuccess.Succeed.getValue())
                 .or()
                 .like(ObjectUtils.isNotEmpty(keyWord), RepairPayRecord::getRecordId, keyWord)
-                .between(ObjectUtils.isNotEmpty(startTime)&&ObjectUtils.isNotEmpty(endTime),RepairPayRecord::getCreateTime, startTime, endTime)
+                .between(ObjectUtils.isNotEmpty(startTime) && ObjectUtils.isNotEmpty(endTime), RepairPayRecord::getCreateTime, startTime, endTime)
                 .eq(RepairPayRecord::getIsSuccess, eIsSuccess.Succeed.getValue());
 
         IPage<RepairPayRecord> page = repairPayRecordService.page(new Page<>(currentPage, pageCount), wrapper);
-        IPage<ProsperityRepairPayRecordsVo> prpr=new Page<>();
-        BeanUtils.copyProperties(page,prpr);
 
-//    流水号
-        ArrayList<String> payOnList = new ArrayList<>();
+        IPage<ProsperityRepairPayRecordsVo> prpr = new Page<>();
+        BeanUtils.copyProperties(page, prpr);
+
+
+        ArrayList<ProsperityRepairPayRecordsVo> vos = new ArrayList<>();
+
+//    订单号
+        ArrayList<Integer> recordIdList = new ArrayList<>();
+
+//        报修人id
+        List<Integer> userIds = new ArrayList<>();
 
         List<RepairPayRecord> records = page.getRecords();
+//        获取所有订单号
         if (ObjectUtils.isEmpty(records)) {
             records.forEach(repairPayRecord -> {
-                ProsperityRepairPayRecordsVo prrpv = new ProsperityRepairPayRecordsVo();
-                BeanUtils.copyProperties(repairPayRecord,prrpv);
-                payOnList.add(repairPayRecord.getPayNo());
+                recordIdList.add(repairPayRecord.getRecordId());
+                userIds.add(repairPayRecord.getUserId());
             });
         }
 
-        LambdaQueryWrapper<RepairRefundRecord> rrrsWrapepr=new LambdaQueryWrapper<>();
-        repairRefundRecordService.list(rrrsWrapepr);
+//        通过订单号查询退款记录
+        LambdaQueryWrapper<RepairRefundRecord> rrrsWrapepr = new LambdaQueryWrapper<>();
+        rrrsWrapepr.in(RepairRefundRecord::getRecordId, recordIdList)
+                .eq(RepairRefundRecord::getIsSuccess, eIsSuccess.Succeed.getValue());
+
+        List<RepairRefundRecord> refundRecords = repairRefundRecordService.list(rrrsWrapepr);
+
+//        通过人员id查询用户
+        LambdaQueryWrapper<RepairUser> userListWrapper = new LambdaQueryWrapper<>();
+        userListWrapper.in(RepairUser::getId, userIds)
+                .select(RepairUser::getId, RepairUser::getUserName);
+
+        List<RepairUser> users = repairUserService.list(userListWrapper);
 
 
-        return null;
+        records.forEach(rpr -> {
+            ProsperityRepairPayRecordsVo prrpv = new ProsperityRepairPayRecordsVo();
+            BeanUtils.copyProperties(rpr, prrpv);
+//            交易时间
+            prrpv.setPayTime(rpr.getCreateTime());
+
+            Integer recordId = rpr.getRecordId();
+
+            List<RepairRefundRecord> repairRefundRecords = new ArrayList<>();
+
+//            报修人id
+            Integer userId = rpr.getUserId();
+
+//            名字
+            if (ObjectUtils.isNotEmpty(users) && users.size() > 0) {
+                for (RepairUser user : users) {
+                    if (userId.equals(user.getId())) {
+                        prrpv.setUserName(user.getUserName());
+                    }
+                }
+            }
+
+
+//            退款总金额
+            BigDecimal refundPrice = BigDecimal.valueOf(0);
+//            退款记录
+            if (ObjectUtils.isNotEmpty(refundRecords) && refundRecords.size() > 0) {
+                for (RepairRefundRecord refundRecord : refundRecords) {
+                    if (recordId.equals(refundRecord.getRecordId())) {
+                        repairRefundRecords.add(refundRecord);
+                        refundPrice = refundPrice.add(refundRecord.getRefundPrice());
+                    }
+                }
+            }
+//      状态
+            if (repairRefundRecords.size() > 0) {
+                BigDecimal payPrice = rpr.getPayPrice();
+//
+                if (payPrice.compareTo(refundPrice) == 0) {
+                    prrpv.setState(ePayPageStatu.Refunded.getValue());
+                } else {
+                    prrpv.setState(ePayPageStatu.Rebates.getValue());
+                }
+            } else {
+                prrpv.setState(ePayPageStatu.HavePaid.getValue());
+            }
+
+            prrpv.setRepairRefundRecordList(repairRefundRecords);
+
+            vos.add(prrpv);
+        });
+
+        prpr.setRecords(vos);
+
+        return CommonResult.ok(prpr);
+    }
+
+    /**
+     * 实退
+     *
+     * @return
+     */
+    @Override
+    public CommonResult refundableAmount(RefundableAmountRequest rar, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            String st = paramUtils.getParamError(bindingResult);
+            return CommonResult.fail(st);
+        }
+//      支付订单ID
+        Integer repairPayRecordId = rar.getRepairPayRecordId();
+//      总金额
+        BigDecimal refundPrice = rar.getRefundPrice();
+
+        RepairPayRecord repairPayRecord = repairPayRecordService.getById(repairPayRecordId);
+
+        RepairRefundRecord repairRefundRecord = new RepairRefundRecord();
+
+        repairRefundRecord.setRecordId(repairPayRecord.getRecordId());
+        repairRefundRecord.setUserId(repairPayRecord.getUserId());
+        repairRefundRecord.setWxNo(repairPayRecord.getPayNo());
+        repairRefundRecord.setRefundNo("ST"+ UUIDUtils.create());
+        repairRefundRecord.setRefundPrice(refundPrice);
+        repairRefundRecord.setIsSuccess(eIsSuccess.Succeed.getValue());
+        repairRefundRecord.setRemark("实退");
+
+        boolean save = repairRefundRecordService.save(repairRefundRecord);
+
+        if (save) {
+            return CommonResult.ok("实退成功");
+        }
+
+        return CommonResult.fail("实退失败");
     }
 }
 

+ 28 - 23
src/main/java/com/repair/controller/RepairRecordController.java

@@ -336,7 +336,6 @@ public class RepairRecordController implements RepairRecordControllerAPI {
         return CommonResult.ok(result);
     }
 
-
     @Override
     public CommonResult getRepairRecordCountByUserId(int userId) {
         RepairRecordCountVo result = repairRecordService.getRepairRecordCount(userId);
@@ -410,14 +409,14 @@ public class RepairRecordController implements RepairRecordControllerAPI {
 
     @Override
     public CommonResult queryManageCount(Integer schoolId, @RequestHeader("user_head") String userhead) {
-        String userID = AesUtils.decrypt(userhead);
-        RepairAdmin operateData = repairAdminService.getRepairById(userID);
-        if (operateData == null) {
-            return CommonResult.fail("操作人信息不合法,无法获取工单数据!");
-        }
-        if (operateData.getIsSuper().equals(eIsSuper.Super.getValue())) {
-            schoolId = null;
-        }
+//        String userID = AesUtils.decrypt(userhead);
+//        RepairAdmin operateData = repairAdminService.getRepairById(userID);
+//        if (operateData == null) {
+//            return CommonResult.fail("操作人信息不合法,无法获取工单数据!");
+//        }
+//        if (operateData.getIsSuper().equals(eIsSuper.Super.getValue())) {
+//            schoolId = null;
+//        }
         RepairManageCountVo result = repairRecordService.queryManageCount(schoolId);
         return CommonResult.ok(result);
     }
@@ -445,14 +444,14 @@ public class RepairRecordController implements RepairRecordControllerAPI {
             }
         }
 
-        String userID = AesUtils.decrypt(userhead);
-        RepairAdmin operateData = repairAdminService.getRepairById(userID);
-        if (operateData == null) {
-            return CommonResult.fail("操作人信息不合法,无法获取工单数据!");
-        }
-        if (operateData.getIsSuper().equals(eIsSuper.Super.getValue())) {
-            schoolId = null;
-        }
+//        String userID = AesUtils.decrypt(userhead);
+//        RepairAdmin operateData = repairAdminService.getRepairById(userID);
+//        if (operateData == null) {
+//            return CommonResult.fail("操作人信息不合法,无法获取工单数据!");
+//        }
+//        if (operateData.getIsSuper().equals(eIsSuper.Super.getValue())) {
+//            schoolId = null;
+//        }
 
         PageUtils<RepairRecordPageVo> result = null;
         /**
@@ -1889,6 +1888,12 @@ public class RepairRecordController implements RepairRecordControllerAPI {
     }
 
     @Override
+    public CommonResult queryMasterHomeCount(int userId) {
+        MasterHomepageVo result = repairRecordService.queryMasterHomeCount(userId);
+        return CommonResult.ok(result);
+    }
+
+    @Override
     public CommonResult mobileReply(MobileRevertRequest mrr, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
@@ -2180,22 +2185,22 @@ public class RepairRecordController implements RepairRecordControllerAPI {
         String dateNow = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
         switch (state) {
             case 1:
-                result = repairRecordService.queryTeamWorkExamine(currentPage, pageCount, schoolId);
+                result = repairRecordService.queryTeamWorkPending(currentPage, pageCount, schoolId, dateNow);
                 break;
             case 2:
-                result = repairRecordService.queryTeamWorkPending(currentPage, pageCount, schoolId, dateNow);
+                result = repairRecordService.queryTeamWorkMaintenance(currentPage, pageCount, schoolId, dateNow);
                 break;
             case 3:
-                result = repairRecordService.queryTeamWorkMaintenance(currentPage, pageCount, schoolId, dateNow);
+                result = repairRecordService.queryTeamWorkTimeout(currentPage, pageCount, schoolId, dateNow);
                 break;
             case 4:
-                result = repairRecordService.queryTeamWorkFinished(currentPage, pageCount, schoolId);
+                result = repairRecordService.queryTeamWorkExamine(currentPage, pageCount, schoolId);
                 break;
             case 5:
-                result = repairRecordService.queryTeamWorkLogistics(currentPage, pageCount, schoolId);
+                result = repairRecordService.queryTeamWorkFinished(currentPage, pageCount, schoolId);
                 break;
             case 6:
-                result = repairRecordService.queryTeamWorkTimeout(currentPage, pageCount, schoolId, dateNow);
+                result = repairRecordService.queryTeamWorkLogistics(currentPage, pageCount, schoolId);
                 break;
             case 7:
                 result = repairRecordService.queryTeamWorkClosed(currentPage, pageCount, schoolId);

+ 1 - 0
src/main/java/com/repair/controller/RepairUserController.java

@@ -230,6 +230,7 @@ public class RepairUserController implements RepairUserControllerAPI {
             return CommonResult.fail("当前数据不存在,编辑失败!");
         }
 
+        data.setUserPhone(uabp.getPhone());
         data.setState(uabp.getState());
         data.setWorkType(uabp.getWorkType());
         data.setAcceptanceAssessTime(uabp.getAcceptanceTime());

+ 2 - 0
src/main/java/com/repair/mapper/RepairRecordMapper.java

@@ -60,4 +60,6 @@ public interface RepairRecordMapper extends BaseMapper<RepairRecord> {
     List<ReportExportVo> queryNotTimeoutReportExport(String stateStr, String keyWord, String startTime, String endTime, Integer schoolId);
 
     List<ReportExportVo> queryTimeoutReportExport(String keyWord, String startTime, String endTime, Integer schoolId);
+
+    MasterHomepageVo queryMasterHomeCount(@Param("userId") Integer userId);
 }

+ 2 - 0
src/main/java/com/repair/model/enumModel/eIsSuccess.java

@@ -1,6 +1,8 @@
 package com.repair.model.enumModel;
 
 public enum eIsSuccess {
+//    进行中
+    UnderWay(0),
     //    成功
     Succeed(1),
     //    失败

+ 19 - 0
src/main/java/com/repair/model/enumModel/ePayPageStatu.java

@@ -0,0 +1,19 @@
+package com.repair.model.enumModel;
+
+public enum ePayPageStatu {
+    //    已支付
+    HavePaid(0),
+//部分退款
+    Rebates(1),
+//    已退款
+    Refunded(2);
+
+    private int value;
+    ePayPageStatu(int value) {
+        this.value=value;
+    }
+
+    public int getValue() {
+        return value;
+    }
+}

+ 6 - 17
src/main/java/com/repair/model/request/AlterPriceRequest.java

@@ -1,36 +1,25 @@
 package com.repair.model.request;
 
 import com.repair.model.pojo.RepairConsumables;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.util.List;
 
+/**
+ * 淇�敼瀵嗙爜
+ */
 @Data
 public class AlterPriceRequest {
-//
-//    private Integer articleId;
-//
-//    private Integer consumeId;
-//
-//    private String consumeName;
-//
-//    private BigDecimal price;
-//
-//    private Double number;
-//
-//    private BigDecimal totalPrice;
-
-    @NotNull(message = "维修id不能为空")
+    @NotNull(message = "缁翠慨id涓嶈兘涓虹┖")
     private Integer recordId;
 
-    //所属维修表id
+    //鎵€灞炵淮淇�〃id
     private List<Integer> ids;
 
     private List<RepairConsumables> repairConsumablesList;
 
-    @NotNull(message = "总金额不能为空")
+    @NotNull(message = "总金额不能为空")
     private BigDecimal totalPrice;
 }

+ 17 - 0
src/main/java/com/repair/model/request/RefundableAmountRequest.java

@@ -0,0 +1,17 @@
+package com.repair.model.request;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+
+@Data
+public class RefundableAmountRequest {
+
+    @NotNull(message = "支付订单记录ID不能为空")
+    private Integer repairPayRecordId;
+
+    @NotNull(message = "实退金额不能为空")
+    private BigDecimal refundPrice;
+
+}

+ 7 - 0
src/main/java/com/repair/model/request/updateAddressBookRequest.java

@@ -2,6 +2,7 @@ package com.repair.model.request;
 
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 /**
@@ -22,6 +23,12 @@ public class updateAddressBookRequest {
     private Integer state;
 
     /**
+     * 手机号
+     */
+    @NotBlank(message = "手机号不能为空")
+    private String phone;
+
+    /**
      * 工种
      */
     @NotNull(message = "工种不能为空")

+ 32 - 0
src/main/java/com/repair/model/vo/MasterHomepageVo.java

@@ -0,0 +1,32 @@
+package com.repair.model.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author: binguo
+ * @Date: 2023/8/7 星期一 8:48
+ * @Description: com.repair.model.vo
+ * @Version: 1.0
+ */
+@Data
+public class MasterHomepageVo {
+    /**
+     * 工单数
+     */
+    private int workCount;
+    /**
+     * 处理中
+     */
+    private int processCount;
+    /**
+     * 已完成
+     */
+    private int finishCount;
+    /**
+     * 已超时
+     */
+    private int timeoutCount;
+
+}

+ 4 - 3
src/main/java/com/repair/model/vo/ProsperityRepairPayRecordsVo.java

@@ -9,19 +9,20 @@ import java.util.List;
 
 @Data
 public class ProsperityRepairPayRecordsVo {
+//    支付成功订单id
     private int id;
 //    交易时间
-    private Date createTime;
+    private Date payTime;
 //    工单号
     private Integer recordId;
 //    交易流水号
     private String payNo;
 //    支付人
-    private Integer userName;
+    private String userName;
 //   交易金额
     private BigDecimal payPrice;
 //    退款记录
-    private List<RepairRefundRecord> repairRefundRecords;
+    private List<RepairRefundRecord> repairRefundRecordList;
 //    状态 0已支付 1 部分退款 3 已退款
     private Integer state;
 //    实退按钮

+ 16 - 0
src/main/java/com/repair/model/vo/RepairTechnicianVo.java

@@ -3,6 +3,7 @@ package com.repair.model.vo;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
@@ -89,4 +90,19 @@ public class RepairTechnicianVo {
      * 工单超时状态
      */
     private String timeoutStr;
+
+    /**
+     * 维修师傅
+     */
+    private String maintenancerName;
+
+    /**
+     * 师傅电话
+     */
+    private String maintenancerPhone;
+
+    /**
+     * 维修费用
+     */
+    private BigDecimal price;
 }

+ 2 - 0
src/main/java/com/repair/services/RepairRecordService.java

@@ -75,4 +75,6 @@ public interface RepairRecordService extends IService<RepairRecord> {
     RepairRecord queryRepairByRecordno(String recordNo);
 
     List<ReportExportVo> queryTimeoutReportExport(String keyWord, String startTime, String endTime, Integer schoolId);
+
+    MasterHomepageVo queryMasterHomeCount(Integer userId);
 }

+ 6 - 0
src/main/java/com/repair/services/impl/RepairRecordServiceImpl.java

@@ -254,4 +254,10 @@ public class RepairRecordServiceImpl extends ServiceImpl<RepairRecordMapper, Rep
         return reportExportVos;
     }
 
+    @Override
+    public MasterHomepageVo queryMasterHomeCount(Integer userId) {
+        MasterHomepageVo result = repairRecordMapper.queryMasterHomeCount(userId);
+        return result;
+    }
+
 }

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 107 - 52
src/main/resources/mapper/repair/RepairRecordMapper.xml


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 107 - 52
target/classes/mapper/repair/RepairRecordMapper.xml


+ 4 - 0
target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -7,8 +7,10 @@ com\repair\api\RepairEvaluateControllerAPI.class
 com\repair\common\utils\ExcelExportUtil.class
 com\repair\core\JwtAuthenticationInterceptor.class
 com\repair\services\RepairCollaborateRecordService.class
+com\repair\model\vo\MasterHomepageVo.class
 com\repair\api\LoginControllerAPI.class
 com\repair\mapper\RepairTrackRecordMapper.class
+com\repair\model\enumModel\ePayPageStatu.class
 com\repair\api\RepairTransferRecordControllerAPI.class
 com\repair\mapper\RepairEvaluateMapper.class
 com\repair\model\vo\MaintenanceTechnicianVo.class
@@ -65,6 +67,7 @@ com\repair\model\vo\pendingOrderVo.class
 com\repair\model\pojo\UnitTimeHelpModel.class
 com\repair\services\impl\RepairDispatchRecordServiceImpl.class
 com\repair\common\utils\WxUtil$1.class
+com\repair\common\utils\UUIDUtils.class
 com\repair\mapper\RepairSchoolMapper.class
 com\repair\model\vo\routeDataVo.class
 com\repair\model\enumModel\eStatu.class
@@ -133,6 +136,7 @@ com\repair\common\utils\ExcelUtils.class
 com\repair\common\utils\StrUtils.class
 com\repair\services\impl\RepairCloseServiceImpl.class
 com\repair\model\vo\LoginVo.class
+com\repair\model\request\RefundableAmountRequest.class
 com\repair\services\impl\RepairSystemSettingServiceImpl.class
 com\repair\common\result\Code.class
 com\repair\controller\LoginController$2.class

+ 4 - 0
target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -42,6 +42,7 @@ D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repa
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairConsumeControllerAPI.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\SHA1.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\RepairWorkTypeVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\enumModel\ePayPageStatu.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairAreaService.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\updateRepairArticleTypeRequest.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairEvaluateServiceImpl.java
@@ -148,6 +149,7 @@ D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repa
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairReceivingControllerAPI.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\WxUtil.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairConsumeServiceImpl.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\MasterHomepageVo.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairTransferRecordServiceImpl.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairRefundRecordService.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\RepairAreaTreeVo.java
@@ -164,6 +166,7 @@ D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repa
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\insertRepairClassesRequest.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairClassesSettings.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairNoticeSettingServiceImpl.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\UUIDUtils.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\result\CommonResult.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\UserDataVo.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\updateRepairClassesRequest.java
@@ -265,6 +268,7 @@ D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repa
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\RepairRecordCountVo.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairLeaveMessageControllerAPI.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairWorkTypeService.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\RefundableAmountRequest.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\updateRepairAreaRequest.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\RepairRecordPageVo.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairClassesSettingsServiceImpl.java

BIN=BIN
target/repair_system-0.0.1-SNAPSHOT.jar.original