From 7613fbecb15cb63981f47ccad2db1c258a51beb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=AD=E5=9B=BD=E4=BA=AC?= <565321099@qq.com>
Date: Wed, 25 Jun 2025 10:24:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E5=B7=A5=E5=8D=95=E5=88=9B=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/service/impl/StoreOrderServiceImpl.java | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreOrderServiceImpl.java b/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreOrderServiceImpl.java
index 360f907..2416d37 100644
--- a/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreOrderServiceImpl.java
+++ b/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreOrderServiceImpl.java
@@ -61,6 +61,9 @@ import org.springframework.transaction.support.TransactionTemplate;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -1811,6 +1814,8 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderDao, StoreOrder
     public boolean add(TradeOrderRespDTO request) {
         List<StoreOrderInfo> storeOrderInfos=new ArrayList<>();
         String orderNo=CrmebUtil.getOrderNo("order1");
+        SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        DateTimeFormatter dateTimeFormatter= DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         Integer totalNum=0;
         BigDecimal totalPrice=BigDecimal.ZERO;
         for(TradeOrderDetailRespDTO detail:request.getItem()){
@@ -1873,9 +1878,13 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderDao, StoreOrder
         storeOrder.setTotalPostage(BigDecimal.ZERO);
         storeOrder.setPayPrice(totalPrice);
         storeOrder.setPaid(true);
-        storeOrder.setPayTime(new Date());
+        try {
+            storeOrder.setPayTime(simpleDateFormat.parse(request.getOrderTime().format(dateTimeFormatter)));
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
         storeOrder.setPayType("weixin");
-        storeOrder.setCreateTime(new Date());
+        storeOrder.setCreateTime(storeOrder.getPayTime());
         storeOrder.setStatus(0);
         storeOrder.setCost(totalPrice);
         storeOrder.setIsChannel(4);