用户端代码提交

pz-admin/src/main/resources/application-dev.yml

@@ -49,7 +49,7 @@ spring:
           driverClassName: com.mysql.cj.jdbc.Driver
           # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
           # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
-          url: jdbc:mysql://db1.prd.jianghuxx.com:3317/pz?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
+          url: jdbc:mysql://db1.prd.jianghuxx.com:3317/pz-stg?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
           username: root
           password: 4f9fa23639242790
         # 从库数据源

pz-system/src/main/java/com/pz/system/service/impl/TotalOrderServiceImpl.java

@@ -880,7 +880,12 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
                 // 一般订单开始服务时间
                 String serveTime = orderService.getFinishTime(totalOrder.getId().intValue());
                 if (StringUtils.isNotEmpty(serveTime)) {
+                    try {
                         money = getMoney(serveTime, totalOrder.getPayMoney());// 计算退款金额
+                    } catch (Exception e) {
+                        money = totalOrder.getPayMoney();
+                        e.printStackTrace();
+                    }
                 } else {
                     money = totalOrder.getPayMoney();
                 }
@@ -1237,7 +1242,7 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
     }
 
     public static void main(String[] args) {
-        String serveTime = "2023-09-20 20:45:42";
+        String serveTime = "2023-09-21 16:45:42";
         double payMoney = 0.5;
 
         double money = 0;