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/service/impl/SaleServiceImpl.java | 38 +++++++++++++++++++++++++++++++++-----
1 files changed, 33 insertions(+), 5 deletions(-)
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java b/inventory-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java
index 956c217..85abcc8 100644
--- a/inventory-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java
@@ -2,6 +2,7 @@
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.Task.SyncOrder;
@@ -23,6 +24,9 @@
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.stream.Collectors;
@@ -59,6 +63,7 @@
Sale sale = new Sale();
BeanUtils.copyProperties(saleDto, sale);
sale.setSaleman(saleman);
+ sale.setOrderType("鎵嬪伐璁㈠崟");
saleMapper.insert(sale);
//娣诲姞閿�鍞骇鍝佸崟
List<SaleMaterialDto> saleMaterialDtoList = saleDto.getSaleMaterialList();
@@ -182,9 +187,6 @@
.orderCode(orderNumber)
.customerCode(sale.getCode())
.proname(sale.getProname())
- //.adress(sale.getAdress())
- //.username(sale.getUsername())
- //.phone(sale.getPhone())
.messages(dto2List)
.build();
return consignmentDto1;
@@ -194,8 +196,12 @@
@Override
@Transactional(rollbackFor = Exception.class)
public String synchronization() {
+ //褰撳ぉ鏃堕棿鐨勫噷鏅�4鐐瑰紑濮嬪悓姝�
+ String pattern = "yyyy-MM-dd HH:mm:ss";
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern(pattern);
+ String dateTime = LocalDateTime.now().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());//璁㈠崟缂栧彿
@@ -207,11 +213,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")); //otc璁㈠崟id
+ sale.setOrderType(orde.get("orderClassification").toString()); //璁㈠崟绫诲瀷
return sale;
}).collect(Collectors.toList());
+ //鍘婚噸
+ list.removeIf(sale -> ObjectUtils.isNotEmpty(saleMapper.selectOne(Wrappers.<Sale>query().eq("order_number", sale.getOrderNumber()))));
this.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()); //浜у搧鍚嶇О
@@ -229,4 +239,22 @@
}
return "鍚屾鎴愬姛!";
}
+
+
+ //涓嬭浇闄勪欢
+ @Override
+ public List<String> download(Integer id) {
+ Integer orderId = saleMapper.selectById(id).getOrderId();
+ List<Map<String, Object>> attachment = SyncOrder.getAttachmentByOrderId(orderId);
+ List<String> list = new ArrayList<>();
+ if (ObjectUtils.isEmpty(attachment)) {
+ list.add("璇ヨ鍗曟病鏈夐檮浠�");
+ return list;
+ }
+ for (Map<String, Object> attch : attachment) {
+ String path = attch.get("path").toString();
+ list.add(path);
+ }
+ return list;
+ }
}
--
Gitblit v1.9.3