From 637e8436a33cbc4ea04d4fc68763debaba8412c4 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期一, 11 八月 2025 14:19:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ytflWms' into ytflWms
---
src/main/java/com/zy/asrs/mapper/OrderMapper.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/OrderMapper.java b/src/main/java/com/zy/asrs/mapper/OrderMapper.java
index 21bfca7..4d8cab7 100644
--- a/src/main/java/com/zy/asrs/mapper/OrderMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/OrderMapper.java
@@ -1,12 +1,35 @@
package com.zy.asrs.mapper;
-import com.zy.asrs.entity.Order;
import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.Order;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
+
+import java.util.List;
@Mapper
@Repository
public interface OrderMapper extends BaseMapper<Order> {
+ int updateSettle(@Param("orderId") Long orderId, @Param("settle") Long settle, @Param("userId") Long userId);
+
+ int updateSettleStep(@Param("orderId") Long orderId, @Param("settle") Long settle, @Param("userId") Long userId, @Param("step") Integer step, @Param("memo") String memo, @Param("remark") String remark);
+
+
+ List<Order> selectComplete();
+
+ List<Order> selectComplete1();
+
+ List<Order> selectComplete99();
+
+ List<Order> selectComplete8();
+
+ int addToLogTable(Order order);
+
+ List<Order> selectorderNoL(@Param("orderNo") String orderNo);
+
+ Order selectOrderMoveStatus();
+
+ Order selectOrderMoveStatusInitial();
}
--
Gitblit v1.9.1