支付回调调整

.idea/workspace.xml

@@ -2,6 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="33456f28-da03-4d10-99dd-fd9bd193cf84" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/common/utils/TimeExchange.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/common/utils/TimeExchange.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$/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>
@@ -38,8 +39,8 @@
       <file pinned="false" current-in-tab="true">
         <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="1542">
-              <caret line="182" column="23" selection-start-line="182" selection-start-column="15" selection-end-line="182" selection-end-column="23" />
+            <state relative-caret-position="43">
+              <caret line="301" column="67" selection-start-line="301" selection-start-column="67" selection-end-line="301" selection-end-column="67" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -48,6 +49,28 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/TimeExchange.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="113">
+              <caret line="643" column="87" selection-start-line="643" selection-start-column="87" selection-end-line="643" selection-end-column="87" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="jar://C:/Program Files/Java/jdk1.8.0_181/src.zip!/java/math/BigDecimal.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="188">
+              <caret line="2510" column="22" selection-start-line="2510" selection-start-column="22" selection-end-line="2510" selection-end-column="22" />
+              <folding>
+                <element signature="e#106317#106318#0" expanded="true" />
+                <element signature="e#106377#106378#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
         <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="295">
@@ -110,15 +133,6 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/config/SmsConfig.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="295">
-              <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -131,7 +145,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>Sim</find>
       <find>pay</find>
       <find>用户信息</find>
       <find>queryMasterHomeCount</find>
@@ -161,6 +174,7 @@
       <find>weixin</find>
       <find>@Pass</find>
       <find>金额不一致</find>
+      <find>nonceStr</find>
     </findStrings>
     <replaceStrings>
       <replace>repairConsumables</replace>
@@ -238,7 +252,6 @@
         <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairSystemMessagesServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairDispatchRecordServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairEvaluateServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/common/utils/TimeExchange.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairUserControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairUserController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairUserServiceImpl.java" />
@@ -251,6 +264,7 @@
         <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairRecordServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairRecordMapper.java" />
         <option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/common/utils/TimeExchange.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java" />
       </list>
     </option>
@@ -583,7 +597,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Spring Boot.MybatisPlusApplication">
+  <component name="RunManager" selected="Application.TimeExchange">
     <configuration name="AutoCode" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="com.repair.AutoCode" />
       <module name="repair_backend" />
@@ -718,12 +732,12 @@
       <workItem from="1694155605252" duration="2798000" />
       <workItem from="1694483448254" duration="3243000" />
       <workItem from="1694575708078" duration="6153000" />
-      <workItem from="1694997999891" duration="25331000" />
+      <workItem from="1694997999891" duration="27790000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="1075509000" />
+    <option name="totallyTimeSpent" value="1077968000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -747,19 +761,19 @@
       <window_info id="Ant Build" order="6" sideWeight="0.50547045" side_tool="true" weight="0.13219616" />
       <window_info id="Favorites" order="7" sideWeight="0.50547045" side_tool="true" weight="0.13219616" />
       <window_info id="Web" order="8" sideWeight="0.50547045" side_tool="true" weight="0.13219616" />
-      <window_info content_ui="combo" id="Project" order="9" sideWeight="0.5021882" weight="0.35448578" />
+      <window_info content_ui="combo" id="Project" order="9" sideWeight="0.5021882" visible="true" weight="0.14765458" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.32603937" />
-      <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.12582056" />
+      <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.51641136" />
       <window_info anchor="bottom" id="Event Log" order="3" weight="0.32822758" />
-      <window_info anchor="bottom" id="Debug" order="4" weight="0.35027623" />
+      <window_info anchor="bottom" id="Debug" order="4" weight="0.3501094" />
       <window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="6" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="7" weight="0.32932165" />
       <window_info anchor="bottom" id="Spring" order="8" weight="0.32603937" />
       <window_info anchor="bottom" id="Terminal" order="9" weight="0.32928178" />
       <window_info anchor="bottom" id="Docker" order="10" />
-      <window_info anchor="bottom" id="Messages" order="11" weight="0.2872928" />
+      <window_info anchor="bottom" id="Messages" order="11" weight="0.2866521" />
       <window_info anchor="bottom" id="Java Enterprise" order="12" />
       <window_info anchor="bottom" id="Database Changes" order="13" />
       <window_info anchor="bottom" id="Version Control" order="14" />
@@ -767,7 +781,7 @@
       <window_info anchor="bottom" id="JRebel Console" order="16" side_tool="true" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="1" weight="0.25" />
-      <window_info anchor="right" id="Maven" order="2" weight="0.53829324" />
+      <window_info anchor="right" id="Maven" order="2" weight="0.76148796" />
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="right" id="Capture Analysis" order="4" />
       <window_info anchor="right" id="Database" order="5" weight="0.32889125" />
@@ -890,19 +904,19 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/TimeExchange.java</url>
-          <line>646</line>
+          <line>654</line>
           <properties />
           <option name="timeStamp" value="358" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/TimeExchange.java</url>
-          <line>433</line>
+          <line>434</line>
           <properties />
           <option name="timeStamp" value="361" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/TimeExchange.java</url>
-          <line>453</line>
+          <line>454</line>
           <properties />
           <option name="timeStamp" value="363" />
         </line-breakpoint>
@@ -912,6 +926,12 @@
           <properties />
           <option name="timeStamp" value="369" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/TimeExchange.java</url>
+          <line>649</line>
+          <properties />
+          <option name="timeStamp" value="371" />
+        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>
@@ -920,20 +940,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.0.5/mybatis-plus-extension-3.0.5.jar!/com/baomidou/mybatisplus/extension/service/IService.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="207">
-          <caret line="17" column="20" selection-start-line="17" selection-start-column="20" selection-end-line="17" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairLeaveMessageServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="426">
-          <caret line="71" column="5" selection-start-line="71" selection-start-column="5" selection-end-line="71" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/LoginControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="276">
@@ -969,13 +975,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/TimeExchange.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="295">
-          <caret line="57" column="75" selection-start-line="57" selection-start-column="32" selection-end-line="57" selection-end-column="75" />
-        </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="318">
@@ -1270,10 +1269,35 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/result/PayResult.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="295">
+          <caret line="30" column="16" selection-start-line="30" selection-start-column="16" selection-end-line="30" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/TimeExchange.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="113">
+          <caret line="643" column="87" selection-start-line="643" selection-start-column="87" selection-end-line="643" selection-end-column="87" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://C:/Program Files/Java/jdk1.8.0_181/src.zip!/java/math/BigDecimal.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="188">
+          <caret line="2510" column="22" selection-start-line="2510" selection-start-column="22" selection-end-line="2510" selection-end-column="22" />
+          <folding>
+            <element signature="e#106317#106318#0" expanded="true" />
+            <element signature="e#106377#106378#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <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="1542">
-          <caret line="182" column="23" selection-start-line="182" selection-start-column="15" selection-end-line="182" selection-end-column="23" />
+        <state relative-caret-position="43">
+          <caret line="301" column="67" selection-start-line="301" selection-start-column="67" selection-end-line="301" selection-end-column="67" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>

src/main/java/com/repair/common/utils/TimeExchange.java

@@ -6,6 +6,7 @@ import com.repair.model.vo.ClassSettingDateVo;
 import org.apache.commons.lang3.time.DateFormatUtils;
 import org.apache.commons.lang3.time.DateUtils;
 
+import java.math.BigDecimal;
 import java.sql.Timestamp;
 import java.text.DateFormat;
 import java.text.ParseException;
@@ -639,6 +640,13 @@ public class TimeExchange {
     }
 
     public static void main(String[] args) throws ParseException {
+
+        BigDecimal amountPay = (new BigDecimal(15).divide(new BigDecimal("100"))).setScale(2);
+        BigDecimal price = new BigDecimal(16 / 100.0);
+        BigDecimal amountPays = (new BigDecimal(17).divide(new BigDecimal("100")));
+        double ssss = price.doubleValue();
+        double sdad = amountPay.doubleValue();
+        double sdads = amountPays.doubleValue();
           Integer userId = 0;
           String ss = userId.toString();
         int sss = getMonthDays("2023-09-13",7);

src/main/java/com/repair/controller/RepairRecordController.java

@@ -262,7 +262,8 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                     rpr.setRecordId(rr.getId());
                     rpr.setUserId(rr.getUserId());
                     rpr.setPayNo(result.getNonce_str());
-                    rpr.setPayPrice(new BigDecimal(result.getTotal_fee() / 100));
+                    System.out.println("回调的金额："+result.getTotal_fee());
+                    rpr.setPayPrice(new BigDecimal(result.getTotal_fee()).divide(new BigDecimal("100")).setScale(2));
                     rpr.setIsSuccess(ePayStatu.Paysuccess.getValue());
                     rpr.setRemark("微信支付支付成功");
                     int insertRpr = repairPayRecordService.insertRepairPayRecord(rpr);
@@ -273,7 +274,8 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                     }
                 } else if (rpr.getIsSuccess() != ePayStatu.Paysuccess.getValue()) {
                     rpr.setPayNo(result.getNonce_str());
-                    rpr.setPayPrice(new BigDecimal(result.getTotal_fee() / 100));
+                    System.out.println("回调的金额："+result.getTotal_fee());
+                    rpr.setPayPrice(new BigDecimal(result.getTotal_fee()).divide(new BigDecimal("100")).setScale(2));
                     rpr.setIsSuccess(ePayStatu.Paysuccess.getValue());
                     rpr.setRemark(rpr.getRemark() + "微信支付支付成功");
                     int updateRpr = repairPayRecordService.updateRepairPayRecord(rpr);
@@ -297,7 +299,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                 RepairTrackRecord rtr = new RepairTrackRecord();
                 rtr.setRecordId(rr.getId());
                 rtr.setMaintenanceState(eRecordStatu.Maintenance.getValue());
-                rtr.setContent("订单支付");
+                rtr.setContent("订单支付："+rpr.getPayPrice().toString());
                 rtr.setUserId(rr.getUserId());
                 rtr.setUserZzstr("用户");
                 int insertRtr = repairTrackRecordService.insertRepairTrackRecord(rtr);