2024年5月22日16:57:26

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

@@ -17,7 +17,9 @@ import org.springblade.data.michelinApi.service.IMichelinService;
 import org.springframework.stereotype.Service;
 
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * @author :jixinyuan
@@ -34,14 +36,15 @@ public class MichelinServiceImpl implements IMichelinService {
 
 	@Override
 	public R<String> getSalesOrder(String agentId) throws Exception {
-		System.out.println("==========================请求成功==============第" + count + "次");
 		String geturl = MichelinValues.BASE_URL_DEV + "/GetSalesOrder";
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		//设置请求体
 		Map<String, String> map = new HashMap<>();
 		//key-value的形式设置请求参数
 		map.put("agentId", agentId);
 		String result = HttpsUtils.sending(geturl, map);
 		System.out.println("==============result===============" + result);
+		System.out.println("==============请求成功时间：===============" + sdf.format(new Date()));
 		//如果返回值是标准的JSON字符串进行转换
 		JSONObject jsonObject = JSONObject.parseObject(result);
 		SalesOrderR salesOrderR = JSONObject.parseObject(jsonObject.get("response").toString(), SalesOrderR.class);
@@ -49,14 +52,12 @@ public class MichelinServiceImpl implements IMichelinService {
 			if ("001".equals(salesOrderR.getCode())) {
 				SalesOrderDto salesOrderDto = salesOrderR.getSalesOrder();
 				if (salesOrderDto != null) {
-					String dateString = "2024-05-12";
-					SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+					String dateString = "2024-05-12 00:00:00";
 					boolean res = false;
 					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();
@@ -71,17 +72,16 @@ public class MichelinServiceImpl implements IMichelinService {
 									order.setUom(item.getUom());
 									order.setQuantity(item.getQuantity());
 									order.setUnitPrice(item.getUnitPrice());
-									System.out.println("==============order保存数据：===============" + order);
 									if (ObjectUtils.isNotNull(order.getSalesOrderStatus()) && "confirm".equals(order.getSalesOrderStatus())) {
 										res = externalOrderService.save(order);
 										System.out.println("==============保存数据是否成功：===============" + res);
-									}else{
+									} else {
 										res = false;
-										System.out.println("==============废弃数据：===============" + order);
+										System.out.println("==============状态废弃数据：===============" + order);
 									}
 								}
 							}
-						}else{
+						} else {
 							System.out.println("==============超时废弃数据：===============" + salesOrderDto);
 						}
 					}
@@ -91,7 +91,6 @@ 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");
@@ -103,18 +102,15 @@ public class MichelinServiceImpl implements IMichelinService {
 					}
 					//获取了返回值
 					String result1 = HttpsUtils.sending(geturl1, map1);
-					System.out.println("==============result1===============" + result1);
+					System.out.println("==============回调接口返回数据===============" + result1);
 					//如果返回值是标准的JSON字符串进行转换
 					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())) {
-								count = count + 1;
 								this.getSalesOrder(agentId);
 							}
-							count = 1;
 							return R.success("同步成功");
 						} else {
 							return R.fail(ackSalesOrderR.getErrMsg());