2024年5月13日16:31:21

blade-service-api/blade-data-api/src/main/java/org/springblade/data/extemalOrder/entity/ExternalOrder.java

@@ -94,7 +94,7 @@ public class ExternalOrder implements Serializable {
 	 */
 	@ApiModelProperty(value = "创建时间")
 	@TableField(value = "creationTime")
-	private Date creationTime;
+	private String creationTime;
 	/**
 	 * 客户名称
 	 */

blade-service/blade-data/src/main/java/org/springblade/data/michelinApi/service/impl/MichelinServiceImpl.java

@@ -16,10 +16,8 @@ import org.springblade.data.michelinApi.dto.SalesOrderR;
 import org.springblade.data.michelinApi.service.IMichelinService;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 /**
  * @author :jixinyuan
@@ -50,28 +48,41 @@ public class MichelinServiceImpl implements IMichelinService {
 		if (salesOrderR != null) {
 			if ("001".equals(salesOrderR.getCode())) {
 				SalesOrderDto salesOrderDto = salesOrderR.getSalesOrder();
-				List<ExternalOrder> externalOrderList = new ArrayList<>();
 				if (salesOrderDto != null) {
-					ExternalOrder order = new ExternalOrder();
-					BeanUtil.copyProperties(salesOrderDto, order);
+					String dateString = "2024-05-12";
+					SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 					boolean res = true;
-					if (!salesOrderDto.getLines().isEmpty()) {
-						for (LinesDto item : salesOrderDto.getLines()) {
-							order.setItemLineNo(item.getLineNo());
-							order.setSku(item.getSku());
-							order.setName(item.getName());
-							order.setBrand(item.getBrand());
-							order.setItemSize(item.getSize());
-							order.setPattern(item.getPattern());
-							order.setStructure(item.getStructure());
-							order.setUom(item.getUom());
-							order.setQuantity(item.getQuantity());
-							order.setUnitPrice(item.getUnitPrice());
-							if (ObjectUtils.isNotNull(order.getSalesOrderStatus()) && "complete".equals(order.getSalesOrderStatus())) {
-								externalOrderList.add(order);
+					if (ObjectUtils.isNotNull(salesOrderDto.getCreationTime())) {
+						Date date = sdf.parse(dateString);
+						Date date1 = sdf.parse(salesOrderDto.getCreationTime());
+						if (date1.compareTo(date) > 0) {
+							System.out.println("==============获取数据大于固定时间：===============");
+							if (!salesOrderDto.getLines().isEmpty()) {
+								for (LinesDto item : salesOrderDto.getLines()) {
+									ExternalOrder order = new ExternalOrder();
+									BeanUtil.copyProperties(salesOrderDto, order);
+									order.setItemLineNo(item.getLineNo());
+									order.setSku(item.getSku());
+									order.setName(item.getName());
+									order.setBrand(item.getBrand());
+									order.setItemSize(item.getSize());
+									order.setPattern(item.getPattern());
+									order.setStructure(item.getStructure());
+									order.setUom(item.getUom());
+									order.setQuantity(item.getQuantity());
+									order.setUnitPrice(item.getUnitPrice());
+									System.out.println("==============order保存数据：===============" + order);
+									if (ObjectUtils.isNotNull(order.getSalesOrderStatus()) && "complete".equals(order.getSalesOrderStatus())) {
+										res = externalOrderService.save(order);
+										System.out.println("==============保存数据是否成功：===============" + res);
+									}else{
+										System.out.println("==============废弃数据：===============" + order);
+									}
+								}
 							}
+						}else{
+							System.out.println("==============超时废弃数据：===============" + salesOrderDto);
 						}
-						res = externalOrderService.saveBatch(externalOrderList);
 					}
 					//设置请求体
 					Map<String, String> map1 = new HashMap<>();
@@ -79,6 +90,7 @@ public class MichelinServiceImpl implements IMichelinService {
 					map1.put("agentId", agentId);
 					map1.put("msgId", salesOrderR.getMsgId());
 					String geturl1 = MichelinValues.BASE_URL_DEV + "/AckSalesOrder";
+					System.out.println("==============保存数据===============" + res);
 					if (res) {
 						map1.put("code", "001");
 						map1.put("result", "success");
@@ -92,8 +104,9 @@ public class MichelinServiceImpl implements IMichelinService {
 					String result1 = HttpsUtils.sending(geturl1, map1);
 					System.out.println("==============result1===============" + result1);
 					//如果返回值是标准的JSON字符串进行转换
-					JSONObject jsonObject1 = JSONObject.parseObject(result);
+					JSONObject jsonObject1 = JSONObject.parseObject(result1);
 					AckSalesOrderR ackSalesOrderR = JSONObject.parseObject(jsonObject1.get("response").toString(), AckSalesOrderR.class);
+					System.out.println("==============ackSalesOrderR===============" + ackSalesOrderR);
 					if (ackSalesOrderR != null) {
 						if ("001".equals(ackSalesOrderR.getCode())) {
 							if ("true".equals(ackSalesOrderR.getHasNext())) {