Merge branch 'qa/2025-04-10' into 'master'

Qa/2025 04 10



See merge request !18

@@ -70,6 +70,7 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.math.RoundingMode;
+import java.time.Instant;
 import java.time.LocalDate;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;
 import java.time.temporal.ChronoUnit;
@@ -343,6 +344,10 @@ public class SettlementServiceImpl implements SettlementService {
         Row titleRow = sheet.createRow(rowNum++);
         Row titleRow = sheet.createRow(rowNum++);
         int columnNum = 0;
         int columnNum = 0;
 
 
+        Cell cellPayTime = titleRow.createCell(columnNum++);
+        cellPayTime.setCellValue("支付时间");
+        cellPayTime.setCellStyle(headerStyle);
+
         Cell cell0 = titleRow.createCell(columnNum++);
         Cell cell0 = titleRow.createCell(columnNum++);
         cell0.setCellValue("用餐时间");
         cell0.setCellValue("用餐时间");
         cell0.setCellStyle(headerStyle);
         cell0.setCellStyle(headerStyle);
@@ -351,10 +356,6 @@ public class SettlementServiceImpl implements SettlementService {
         cell1.setCellValue("订单号");
         cell1.setCellValue("订单号");
         cell1.setCellStyle(headerStyle);
         cell1.setCellStyle(headerStyle);
 
 
-        Cell cellPayTime = titleRow.createCell(columnNum++);
-        cellPayTime.setCellValue("支付时间");
-        cellPayTime.setCellStyle(headerStyle);
-
         Cell cellOrderer = titleRow.createCell(columnNum++);
         Cell cellOrderer = titleRow.createCell(columnNum++);
         cellOrderer.setCellValue("下单人");
         cellOrderer.setCellValue("下单人");
         cellOrderer.setCellStyle(headerStyle);
         cellOrderer.setCellStyle(headerStyle);
@@ -426,6 +427,10 @@ public class SettlementServiceImpl implements SettlementService {
                 Row dataRow = sheet.createRow(rowNum++);
                 Row dataRow = sheet.createRow(rowNum++);
                 columnNum = 0;
                 columnNum = 0;
 
 
+                Cell dataCellPayTime = dataRow.createCell(columnNum++);
+                dataCellPayTime.setCellValue(orderDetail.getPayTime() != null ? orderDetail.getPayTime() : "");
+                dataCellPayTime.setCellStyle(dataStyle);
+
                 Cell dataCell0 = dataRow.createCell(columnNum++);
                 Cell dataCell0 = dataRow.createCell(columnNum++);
                 dataCell0.setCellValue(orderDetail.getMealTime() != null ? orderDetail.getMealTime() : "");
                 dataCell0.setCellValue(orderDetail.getMealTime() != null ? orderDetail.getMealTime() : "");
                 dataCell0.setCellStyle(dataStyle);
                 dataCell0.setCellStyle(dataStyle);
@@ -434,10 +439,6 @@ public class SettlementServiceImpl implements SettlementService {
                 dataCell1.setCellValue(orderDetail.getCode() != null ? orderDetail.getCode() : "");
                 dataCell1.setCellValue(orderDetail.getCode() != null ? orderDetail.getCode() : "");
                 dataCell1.setCellStyle(dataStyle);
                 dataCell1.setCellStyle(dataStyle);
 
 
-                Cell dataCellPayTime = dataRow.createCell(columnNum++);
-                dataCellPayTime.setCellValue(orderDetail.getPayTime() != null ? orderDetail.getPayTime() : "");
-                dataCellPayTime.setCellStyle(dataStyle);
-
                 Cell dataCellOrderer = dataRow.createCell(columnNum++);
                 Cell dataCellOrderer = dataRow.createCell(columnNum++);
                 dataCellOrderer.setCellValue(orderDetail.getOrderer() != null ? orderDetail.getOrderer() : "");
                 dataCellOrderer.setCellValue(orderDetail.getOrderer() != null ? orderDetail.getOrderer() : "");
                 dataCellOrderer.setCellStyle(dataStyle);
                 dataCellOrderer.setCellStyle(dataStyle);
@@ -1130,12 +1131,15 @@ public class SettlementServiceImpl implements SettlementService {
         return "";
         return "";
     }
     }
 
 
+    /** 与 PayServiceClient 支付/退款中 payTime 展示逻辑一致，避免多 8 小时。 */
     private static String formatSettlementPayTime(long payTimeMillis) {
     private static String formatSettlementPayTime(long payTimeMillis) {
         if (payTimeMillis == 0L) {
         if (payTimeMillis == 0L) {
             return "";
             return "";
         }
         }
-        final String formatted = DateUtil.formatDate(payTimeMillis, DateUtil.Y_M_D_H_M_S);
-        return formatted != null ? formatted : "";
+        return Instant.ofEpochMilli(payTimeMillis)
+                .atZone(DateUtil.CHINA_ZONE)
+                .minusHours(8)
+                .format(DateUtil.Y_M_D_H_M_S);
     }
     }
 
 
     /**
     /**

@@ -79,11 +79,9 @@ miniprogram.orderReminderTemplateId=xxx
 
 
 business-config.hisCustomerQueryUrl = http://localhost:8903/hiscustomers/current/query
 business-config.hisCustomerQueryUrl = http://localhost:8903/hiscustomers/current/query
 business-config.clientCustomerQueryUrl = http://localhost:8903/clientcustomers/current/query
 business-config.clientCustomerQueryUrl = http://localhost:8903/clientcustomers/current/query
-business-config.payUrl = http://36.110.128.86:21051/API/Microapp/CreateOrder?appid={0}
-business-config.payClientId = Order00001
-business-config.cancelPayUrl = http://10.2.5.162:21051/frame/requestbase64
-business-config.refundSecurityKey = 0987654321
-
+business-config.payUrl = https://itemtest.amcare.com.cn/API/Microapp/createWxOrder?appid={0}
+business-config.payClientId = Order0001
+business-config.cancelPayUrl = https://itemtest.amcare.com.cn/frame/requestbase64
 ##Actuator\u914D\u7F6E
 ##Actuator\u914D\u7F6E
 management.server.port=8088
 management.server.port=8088
 management.endpoints.web.exposure.include=*
 management.endpoints.web.exposure.include=*
@@ -103,6 +101,7 @@ sa-token.jwt-secret-key=Uz2BgKsquB3VZ99tvGb6HzQ1RcFMEsa5
 sa-token.sign.secret-key=4Jk2giMQw8D7lHJcU8fv8CXjSOhjp5Ee
 sa-token.sign.secret-key=4Jk2giMQw8D7lHJcU8fv8CXjSOhjp5Ee
 
 
 ##\u65E5\u5FD7\u914D\u7F6E
 ##\u65E5\u5FD7\u914D\u7F6E
+logging.file.path=logs
 logging.config=classpath:logback-spring.xml
 logging.config=classpath:logback-spring.xml
 
 
 aliyun.oss.endPoint=oss-cn-shanghai.aliyuncs.com
 aliyun.oss.endPoint=oss-cn-shanghai.aliyuncs.com