|
|
@@ -2,7 +2,7 @@
|
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="1da94ed8-6954-4dbc-8f54-8617863a9948" name="Default Changelist" comment="">
|
|
|
- <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairPayRecordMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairPayRecordMapper.xml" 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" />
|
|
|
</list>
|
|
|
<ignored path="$PROJECT_DIR$/classes/" />
|
|
|
<ignored path="$PROJECT_DIR$/target/" />
|
|
|
@@ -18,60 +18,59 @@
|
|
|
<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/RepairConsumeController.java">
|
|
|
+ <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="5014">
|
|
|
- <caret line="255" column="24" selection-start-line="255" selection-start-column="24" selection-end-line="255" selection-end-column="24" />
|
|
|
+ <state relative-caret-position="9292">
|
|
|
+ <caret line="594" column="65" selection-start-line="594" selection-start-column="65" selection-end-line="594" selection-end-column="65" />
|
|
|
+ <folding>
|
|
|
+ <element signature="method#refundableAmount#0;class#RepairPayRecordController#0" />
|
|
|
+ <element signature="method#refundReview#0;class#RepairPayRecordController#0" />
|
|
|
+ <element signature="method#restrict#0;class#RepairPayRecordController#0" />
|
|
|
+ </folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairConsumeControllerAPI.java">
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/ePayStatu.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="782">
|
|
|
- <caret line="47" column="40" selection-start-line="47" selection-start-column="9" selection-end-line="47" selection-end-column="40" />
|
|
|
+ <state relative-caret-position="184">
|
|
|
+ <caret line="8" column="12" selection-start-line="8" selection-start-column="12" selection-end-line="8" selection-end-column="12" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<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/java/com/repair/model/enumModel/eRecordStatu.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="4600">
|
|
|
- <caret line="244" column="25" selection-start-line="244" selection-start-column="16" selection-end-line="244" selection-end-column="25" />
|
|
|
+ <state relative-caret-position="1288">
|
|
|
+ <caret line="60" column="43" selection-start-line="60" selection-start-column="43" selection-end-line="60" 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/core/JwtAuthenticationInterceptor.java">
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairRecord.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="807">
|
|
|
- <caret line="69" column="32" selection-start-line="69" selection-start-column="13" selection-end-line="69" selection-end-column="32" />
|
|
|
+ <state relative-caret-position="368">
|
|
|
+ <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairPayRecordController.java">
|
|
|
+ <file pinned="false" current-in-tab="true">
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairRefundRecord.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="370">
|
|
|
- <caret line="661" column="82" selection-start-line="661" selection-start-column="71" selection-end-line="661" selection-end-column="82" />
|
|
|
- <folding>
|
|
|
- <element signature="method#refundableAmount#0;class#RepairPayRecordController#0" />
|
|
|
- <element signature="method#refundReview#0;class#RepairPayRecordController#0" />
|
|
|
- <element signature="method#statistics#0;class#RepairPayRecordController#0" />
|
|
|
- <element signature="method#restrict#0;class#RepairPayRecordController#0" />
|
|
|
- </folding>
|
|
|
+ <state relative-caret-position="502">
|
|
|
+ <caret line="52" column="15" selection-start-line="52" selection-start-column="15" selection-end-line="52" selection-end-column="15" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file pinned="false" current-in-tab="true">
|
|
|
+ <file pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairPayRecordMapper.xml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="239">
|
|
|
+ <state relative-caret-position="621">
|
|
|
<caret line="27" column="23" selection-start-line="27" selection-start-column="23" selection-end-line="27" selection-end-column="23" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
@@ -137,8 +136,8 @@
|
|
|
<find>微信支付</find>
|
|
|
<find>downloadRepairConsumeModelExcel</find>
|
|
|
<find>returnPay</find>
|
|
|
- <find>queryExport</find>
|
|
|
<find>queryE</find>
|
|
|
+ <find>queryExport</find>
|
|
|
</findStrings>
|
|
|
<replaceStrings>
|
|
|
<replace />
|
|
|
@@ -196,7 +195,7 @@
|
|
|
</component>
|
|
|
<component name="ProjectFrameBounds">
|
|
|
<option name="x" value="-7" />
|
|
|
- <option name="width" value="958" />
|
|
|
+ <option name="width" value="974" />
|
|
|
<option name="height" value="1039" />
|
|
|
</component>
|
|
|
<component name="ProjectView">
|
|
|
@@ -356,16 +355,6 @@
|
|
|
<item name="java" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="repair" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="model" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="pojo" type="462c0819:PsiDirectoryNode" />
|
|
|
- </path>
|
|
|
- <path>
|
|
|
- <item name="repair_system" 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>
|
|
|
@@ -420,12 +409,17 @@
|
|
|
<item name="resources" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="repair" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
+ <path>
|
|
|
+ <item name="repair_system" type="b2602c69:ProjectViewProjectNode" />
|
|
|
+ <item name="repair_backend" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="target" type="462c0819:PsiDirectoryNode" />
|
|
|
+ </path>
|
|
|
</expand>
|
|
|
<select />
|
|
|
</subPane>
|
|
|
</pane>
|
|
|
- <pane id="PackagesPane" />
|
|
|
<pane id="Scope" />
|
|
|
+ <pane id="PackagesPane" />
|
|
|
</panes>
|
|
|
</component>
|
|
|
<component name="PropertiesComponent">
|
|
|
@@ -518,12 +512,16 @@
|
|
|
<workItem from="1703559777337" duration="33320000" />
|
|
|
<workItem from="1704348824442" duration="277000" />
|
|
|
<workItem from="1704349398193" duration="82000" />
|
|
|
- <workItem from="1704767932421" duration="1298000" />
|
|
|
+ <workItem from="1704767932421" duration="1771000" />
|
|
|
+ <workItem from="1704770873140" duration="45000" />
|
|
|
+ <workItem from="1704771344487" duration="627000" />
|
|
|
+ <workItem from="1704783277575" duration="366000" />
|
|
|
+ <workItem from="1704788101380" duration="920000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
- <option name="totallyTimeSpent" value="91551000" />
|
|
|
+ <option name="totallyTimeSpent" value="93982000" />
|
|
|
</component>
|
|
|
<component name="TodoView">
|
|
|
<todo-panel id="selected-file">
|
|
|
@@ -535,10 +533,9 @@
|
|
|
</todo-panel>
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
- <frame x="-8" y="-8" width="1936" height="1048" extended-state="6" />
|
|
|
- <editor active="true" />
|
|
|
+ <frame x="-7" y="0" width="974" height="1039" extended-state="0" />
|
|
|
<layout>
|
|
|
- <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.20522387" />
|
|
|
+ <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.29431072" />
|
|
|
<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" />
|
|
|
@@ -549,7 +546,7 @@
|
|
|
<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" />
|
|
|
- <window_info anchor="bottom" id="Run" order="2" weight="0.33812153" />
|
|
|
+ <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.3447514" />
|
|
|
<window_info anchor="bottom" id="Debug" order="3" weight="0.64113784" />
|
|
|
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
|
|
|
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
|
|
|
@@ -567,7 +564,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.24945295" />
|
|
|
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
|
|
|
- <window_info anchor="right" id="Maven" order="3" weight="0.80196935" />
|
|
|
+ <window_info anchor="right" id="Maven" order="3" weight="0.69584244" />
|
|
|
<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" />
|
|
|
@@ -589,18 +586,6 @@
|
|
|
<properties />
|
|
|
<option name="timeStamp" value="4" />
|
|
|
</line-breakpoint>
|
|
|
- <line-breakpoint enabled="true" type="java-line">
|
|
|
- <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairPayRecordController.java</url>
|
|
|
- <line>683</line>
|
|
|
- <properties />
|
|
|
- <option name="timeStamp" value="6" />
|
|
|
- </line-breakpoint>
|
|
|
- <line-breakpoint enabled="true" type="java-line">
|
|
|
- <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairPayRecordController.java</url>
|
|
|
- <line>681</line>
|
|
|
- <properties />
|
|
|
- <option name="timeStamp" value="7" />
|
|
|
- </line-breakpoint>
|
|
|
</breakpoints>
|
|
|
</breakpoint-manager>
|
|
|
</component>
|
|
|
@@ -609,20 +594,6 @@
|
|
|
<option name="FILTER_TARGETS" value="false" />
|
|
|
</component>
|
|
|
<component name="editorHistoryManager">
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/WxUtil.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="292">
|
|
|
- <caret line="424" column="25" selection-start-line="424" selection-start-column="25" selection-end-line="424" selection-end-column="25" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/HttpUtils.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="284">
|
|
|
- <caret line="78" column="53" selection-start-line="78" selection-start-column="49" selection-end-line="78" selection-end-column="53" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairDispatchRecordMapper.xml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="575">
|
|
|
@@ -700,20 +671,6 @@
|
|
|
</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="47">
|
|
|
- <caret line="60" column="43" lean-forward="true" selection-start-line="60" selection-start-column="43" selection-end-line="60" selection-end-column="43" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/ePayStatu.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="184">
|
|
|
- <caret line="8" column="12" selection-start-line="8" selection-start-column="12" selection-end-line="8" selection-end-column="12" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/ePayPageStatu.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="46">
|
|
|
@@ -933,21 +890,54 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairRecordControllerAPI.java">
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/core/JwtAuthenticationInterceptor.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="345">
|
|
|
- <caret line="26" column="18" selection-start-line="26" selection-start-column="9" selection-end-line="26" selection-end-column="18" />
|
|
|
+ <state relative-caret-position="1196">
|
|
|
+ <caret line="69" column="32" selection-start-line="69" selection-start-column="13" selection-end-line="69" selection-end-column="32" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/core/JwtAuthenticationInterceptor.java">
|
|
|
+ <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="807">
|
|
|
- <caret line="69" column="32" selection-start-line="69" selection-start-column="13" selection-end-line="69" selection-end-column="32" />
|
|
|
+ <state relative-caret-position="9292">
|
|
|
+ <caret line="594" column="65" selection-start-line="594" selection-start-column="65" selection-end-line="594" selection-end-column="65" />
|
|
|
+ <folding>
|
|
|
+ <element signature="method#refundableAmount#0;class#RepairPayRecordController#0" />
|
|
|
+ <element signature="method#refundReview#0;class#RepairPayRecordController#0" />
|
|
|
+ <element signature="method#restrict#0;class#RepairPayRecordController#0" />
|
|
|
+ </folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/resources/application-prod.yml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/ePayStatu.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="184">
|
|
|
+ <caret line="8" column="12" selection-start-line="8" selection-start-column="12" selection-end-line="8" selection-end-column="12" />
|
|
|
+ </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="1288">
|
|
|
+ <caret line="60" column="43" selection-start-line="60" selection-start-column="43" selection-end-line="60" selection-end-column="43" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairRecord.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="368">
|
|
|
+ <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairPayRecordMapper.xml">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="621">
|
|
|
+ <caret line="27" column="23" selection-start-line="27" selection-start-column="23" selection-end-line="27" selection-end-column="23" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/resources/application-dev.yml">
|
|
|
<provider selected="true" editor-type-id="text-editor" />
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
|
|
|
@@ -957,26 +947,20 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/resources/application-dev.yml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/resources/application-prod.yml">
|
|
|
<provider selected="true" editor-type-id="text-editor" />
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairPayRecordController.java">
|
|
|
+ <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="370">
|
|
|
- <caret line="661" column="82" selection-start-line="661" selection-start-column="71" selection-end-line="661" selection-end-column="82" />
|
|
|
- <folding>
|
|
|
- <element signature="method#refundableAmount#0;class#RepairPayRecordController#0" />
|
|
|
- <element signature="method#refundReview#0;class#RepairPayRecordController#0" />
|
|
|
- <element signature="method#statistics#0;class#RepairPayRecordController#0" />
|
|
|
- <element signature="method#restrict#0;class#RepairPayRecordController#0" />
|
|
|
- </folding>
|
|
|
+ <state relative-caret-position="345">
|
|
|
+ <caret line="26" column="18" selection-start-line="26" selection-start-column="9" selection-end-line="26" selection-end-column="18" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairPayRecordMapper.xml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairRefundRecord.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="239">
|
|
|
- <caret line="27" column="23" selection-start-line="27" selection-start-column="23" selection-end-line="27" selection-end-column="23" />
|
|
|
+ <state relative-caret-position="502">
|
|
|
+ <caret line="52" column="15" selection-start-line="52" selection-start-column="15" selection-end-line="52" selection-end-column="15" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|