瀏覽代碼

修改退款总金额计算错误问题

liu 2 年之前
父節點
當前提交
d6c6ff45da

+ 24 - 4
.idea/workspace.xml

@@ -4,7 +4,14 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="1da94ed8-6954-4dbc-8f54-8617863a9948" name="Default Changelist" comment="" />
+    <list default="true" id="1da94ed8-6954-4dbc-8f54-8617863a9948" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/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/core/JwtlnterceptorConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/core/JwtlnterceptorConfig.java" afterDir="false" />
+      <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/classes/META-INF/spring-configuration-metadata.json" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/META-INF/spring-configuration-metadata.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/mapper/repair/RepairPayRecordMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/repair/RepairPayRecordMapper.xml" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -72,10 +79,14 @@
       </list>
     </option>
   </component>
+  <component name="MarkdownSettingsMigration">
+    <option name="stateVersion" value="1" />
+  </component>
   <component name="MavenImportPreferences">
     <option name="generalSettings">
       <MavenGeneralSettings>
         <option name="mavenHome" value="D:/soft/maven/apache-maven-3.8.6" />
+        <option name="useMavenConfig" value="true" />
         <option name="userSettingsFile" value="D:/soft/maven/apache-maven-3.8.6\conf\settings.xml" />
       </MavenGeneralSettings>
     </option>
@@ -341,6 +352,10 @@
   <component name="PropertiesComponent"><![CDATA[{
   "keyToString": {
     "WebServerToolWindowFactoryState": "false",
+    "node.js.detected.package.eslint": "true",
+    "node.js.detected.package.tslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)",
+    "node.js.selected.package.tslint": "(autodetect)",
     "settings.editor.selected.configurable": "MavenSettings"
   }
 }]]></component>
@@ -422,7 +437,7 @@
       <workItem from="1704348824442" duration="277000" />
       <workItem from="1704349398193" duration="82000" />
       <workItem from="1704767932421" duration="1298000" />
-      <workItem from="1704783020212" duration="37000" />
+      <workItem from="1704783020212" duration="1956000" />
     </task>
     <servers />
   </component>
@@ -505,14 +520,19 @@
         </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>
+          <line>680</line>
           <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>
+          <line>678</line>
           <option name="timeStamp" value="7" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairPayRecordController.java</url>
+          <line>574</line>
+          <option name="timeStamp" value="8" />
+        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>

+ 2 - 5
src/main/java/com/repair/controller/RepairPayRecordController.java

@@ -8,10 +8,7 @@ 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.*;
-import com.repair.model.enumModel.eIsSuccess;
-import com.repair.model.enumModel.eIsSuper;
-import com.repair.model.enumModel.ePayPageStatu;
-import com.repair.model.enumModel.eRecordStatu;
+import com.repair.model.enumModel.*;
 import com.repair.model.pojo.*;
 import com.repair.model.request.RefundReviewRequest;
 import com.repair.model.request.RefundableAmountRequest;
@@ -587,7 +584,7 @@ public class RepairPayRecordController implements RepairPayRecordControllerAPI {
         }
 
         LambdaQueryWrapper<RepairRefundRecord> refundWrapper=new LambdaQueryWrapper<>();
-        refundWrapper.eq(RepairRefundRecord::getIsSuccess, eRefundStatu.Refundsuccess);
+        refundWrapper.eq(RepairRefundRecord::getIsSuccess, eRefundStatu.Refundsuccess.getValue());
         List<RepairRefundRecord> list = repairRefundRecordService.list(refundWrapper);
         BigDecimal refundTotalPrice = new BigDecimal(0);
         for (RepairRefundRecord repairRefundRecord : list) {

+ 1 - 1
src/main/java/com/repair/core/JwtlnterceptorConfig.java

@@ -14,7 +14,7 @@ public class JwtlnterceptorConfig implements WebMvcConfigurer {
         //目前测试下来 使用 /**所有的话,response.sendError浏览器获取不到响应的信息
         //默认拦截所有路径
         registry.addInterceptor(authenticationInterceptor())
-                .addPathPatterns("/api/**");
+                .addPathPatterns("/api0/**");
         //endregion
     }
 

+ 1 - 0
src/main/resources/mapper/repair/RepairPayRecordMapper.xml

@@ -55,6 +55,7 @@
         <result property="payPrice" column="pay_price"/>
         <result property="state" column="state"/>
     </resultMap>
+
     <select id="queryPayPage" resultType="com.repair.model.vo.ProsperityRepairPayRecordsVo" resultMap="repairPayPage">
         select rpr.id,rpr.create_time as pay_time,rpr.record_id,rr.record_no,rpr.pay_no,ru.user_name,rpr.pay_price,rpr.is_success as state from repair_pay_record rpr
         left join repair_record rr on rr.deleted = 0 and rr.id = rpr.record_id

+ 1 - 0
target/classes/mapper/repair/RepairPayRecordMapper.xml

@@ -55,6 +55,7 @@
         <result property="payPrice" column="pay_price"/>
         <result property="state" column="state"/>
     </resultMap>
+
     <select id="queryPayPage" resultType="com.repair.model.vo.ProsperityRepairPayRecordsVo" resultMap="repairPayPage">
         select rpr.id,rpr.create_time as pay_time,rpr.record_id,rr.record_no,rpr.pay_no,ru.user_name,rpr.pay_price,rpr.is_success as state from repair_pay_record rpr
         left join repair_record rr on rr.deleted = 0 and rr.id = rpr.record_id