From 527cbd85e37842d93d081f33916dca5c6f7156e0 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期日, 24 九月 2023 09:53:58 +0800
Subject: [PATCH] 修改 9.22
---
inventory-server/src/main/java/com/yuanchu/mom/Task/DataPullTask.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/Task/DataPullTask.java b/inventory-server/src/main/java/com/yuanchu/mom/Task/DataPullTask.java
index d28113e..48f4d8e 100644
--- a/inventory-server/src/main/java/com/yuanchu/mom/Task/DataPullTask.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/Task/DataPullTask.java
@@ -1,6 +1,8 @@
package com.yuanchu.mom.Task;
import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.yuanchu.mom.pojo.Sale;
import com.yuanchu.mom.pojo.SaleMaterial;
import com.yuanchu.mom.service.SaleMaterialService;
@@ -10,6 +12,8 @@
import javax.annotation.Resource;
import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -25,8 +29,12 @@
@Scheduled(cron = "0 0 4 * * ?") // 姣忓ぉ鍑屾櫒4鐐硅Е鍙�
public void pullDataFromOtherSystem() {
+ //鑾峰彇鍓嶄竴澶╁噷鏅ㄦ椂闂�
+ String pattern = "yyyy-MM-dd HH:mm:ss";
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern(pattern);
+ String dateTime = LocalDateTime.now().minusDays(1).with(LocalTime.of(4, 0, 0)).format(formatter);
//鑾峰彇涓婚攢鍞暟鎹�
- List<Map<String, Object>> order = SyncOrder.getMainOrder("2023-08-01 10:00:00 ");
+ List<Map<String, Object>> order = SyncOrder.getMainOrder(dateTime);
List<Sale> list = order.stream().map(orde -> {
Sale sale = new Sale();
sale.setOrderNumber(orde.get("orderNo").toString());//璁㈠崟缂栧彿
@@ -38,11 +46,15 @@
sale.setDelTime(DateUtil.parseDate(orde.get("wantedDeliveryDate").toString()));//浜よ揣鏃ユ湡
sale.setCreateTime(DateUtil.parseDate(orde.get("orderDate").toString()));//涓嬪崟鏃ユ湡
sale.setNote(String.valueOf(orde.get("comment")));//澶囨敞
+ sale.setOrderId((Integer) orde.get("id"));
+ sale.setOrderType(orde.get("orderClassification").toString());
return sale;
}).collect(Collectors.toList());
+ //鍘婚噸
+ list.removeIf(sale -> ObjectUtils.isNotEmpty(saleService.getOne(Wrappers.<Sale>query().eq("order_number", sale.getOrderNumber()))));
saleService.saveBatch(list);
for (Sale sale : list) {
- List<Map<String, Object>> innerOrder = SyncOrder.getInnerOrder("2023-08-01 10:00:00", sale.getOrderNumber());
+ List<Map<String, Object>> innerOrder = SyncOrder.getInnerOrder(dateTime, sale.getOrderNumber());
List<SaleMaterial> saleMaterials = innerOrder.stream().map(inorder -> {
SaleMaterial saleMaterial = new SaleMaterial();
saleMaterial.setName(inorder.get("productName").toString()); //浜у搧鍚嶇О
--
Gitblit v1.9.3