From 8845492d4603326f1a06b86e7900d7bd1bb3464c Mon Sep 17 00:00:00 2001
From: xjm <xjm@cloudowr.com>
Date: Wed, 6 Mar 2024 16:59:27 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=8A=9F=E8=83=BD=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/cowr/common/utils/DateTimeUtil.java    | 5 +++++
 .../java/com/cowr/ssjygl/order/orderend/OrderEndService.java | 2 +-
 .../service/ssjygl/order/ordertemp/OrderTempSyncService.java | 5 +++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/utils/DateTimeUtil.java b/ssjygl-xsx-common/src/main/java/com/cowr/common/utils/DateTimeUtil.java
index 15f82fd..a513f17 100644
--- a/ssjygl-xsx-common/src/main/java/com/cowr/common/utils/DateTimeUtil.java
+++ b/ssjygl-xsx-common/src/main/java/com/cowr/common/utils/DateTimeUtil.java
@@ -188,4 +188,9 @@ public class DateTimeUtil {
     public static LocalDate now(){
         return LocalDate.now();
     }
+
+    public static String convertDateToString(Date date, String pattern) {
+        SimpleDateFormat dateFormat = new SimpleDateFormat(pattern);
+        return dateFormat.format(date);
+    }
 }
diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/orderend/OrderEndService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/orderend/OrderEndService.java
index 46ab371..2217313 100644
--- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/orderend/OrderEndService.java
+++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/orderend/OrderEndService.java
@@ -219,7 +219,7 @@ public class OrderEndService extends BaseService {
 
         boolean add = Db.tx(() -> OrderEnd.dao.deleteByIds(orderEnds));
 
-        log.info("更新数据结果: %s %s", add, orderEnds.size());
+        log.info("删除数据结果: %s %s", add, orderEnds.size());
     }
 
 
diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordertemp/OrderTempSyncService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordertemp/OrderTempSyncService.java
index 6853ba5..c6e495d 100644
--- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordertemp/OrderTempSyncService.java
+++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordertemp/OrderTempSyncService.java
@@ -202,6 +202,11 @@ public class OrderTempSyncService {
 
                   synctask.addUpdateData(stock);
 
+                    String tm = DateTimeUtil.convertDateToString(order.getCreateTime(), "yyyy-MM-dd");
+
+                    // 取消订单删除统计
+                    OrderEndService.me.queryList(tm,String.valueOf( order.getCustomerId()),String.valueOf(order.getSupermarketId()) , null,null); // 訂單取消
+
                   return ret && SyncTaskService.me.save(synctask, order.getSupermarketId())
                           && ModifyLogService.me.save(order.tablename, "sn", logrecord.toJson(), Enums.DataOpType.UPDATE.getId(), sysuser);
                 } catch (Exception e) {