From f1a3b627bb7b048ebeaba3fcbc1ded3a287ec7ab Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 08 六月 2022 13:40:00 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/OrderMapper.xml | 9 +++++++++
src/main/java/com/zy/asrs/service/OrderService.java | 2 ++
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 5 +++++
src/main/java/com/zy/asrs/mapper/OrderMapper.java | 5 +++--
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 3 +--
5 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/OrderMapper.java b/src/main/java/com/zy/asrs/mapper/OrderMapper.java
index 2e52b23..05ee681 100644
--- a/src/main/java/com/zy/asrs/mapper/OrderMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/OrderMapper.java
@@ -1,8 +1,7 @@
package com.zy.asrs.mapper;
-import com.zy.asrs.entity.Order;
import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.entity.Order;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
@@ -15,4 +14,6 @@
int updateSettle(@Param("orderId")Long orderId, @Param("settle")Long settle, @Param("userId")Long userId);
+ List<Order> selectComplete();
+
}
diff --git a/src/main/java/com/zy/asrs/service/OrderService.java b/src/main/java/com/zy/asrs/service/OrderService.java
index 588f64b..d29343c 100644
--- a/src/main/java/com/zy/asrs/service/OrderService.java
+++ b/src/main/java/com/zy/asrs/service/OrderService.java
@@ -22,4 +22,6 @@
void remove(Long orderId);
+ List<Order> selectComplete();
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
index 5c6a79b..2f34254 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -156,4 +156,9 @@
orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", orderId));
}
+ @Override
+ public List<Order> selectComplete() {
+ return this.baseMapper.selectComplete();
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index 19876f6..1619b74 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -1,6 +1,5 @@
package com.zy.asrs.task;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.zy.asrs.entity.Order;
import com.zy.asrs.service.ApiLogService;
@@ -44,7 +43,7 @@
public void completeAndReport(){
String erpReport = Parameter.get().getErpReport();
if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
- List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L).eq("status", 1));
+ List<Order> orders = orderService.selectComplete();
for (Order order : orders) {
ReturnT<String> result = orderSyncHandler.start(order);
if (!result.isSuccess()) {
diff --git a/src/main/resources/mapper/OrderMapper.xml b/src/main/resources/mapper/OrderMapper.xml
index fcd6b0b..9e112d4 100644
--- a/src/main/resources/mapper/OrderMapper.xml
+++ b/src/main/resources/mapper/OrderMapper.xml
@@ -53,4 +53,13 @@
and id = #{orderId}
</update>
+ <select id="selectComplete" resultMap="BaseResultMap">
+ select top 5 *
+ from man_order
+ where 1=1
+ and settle = 4
+ and status = 1
+ order by create_time asc
+ </select>
+
</mapper>
--
Gitblit v1.9.1