From 9126e6315288e1ea50e74c70b099974522d6b172 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 08 十二月 2025 09:17:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs
---
src/main/java/com/zy/asrs/mapper/OrderMapper.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/OrderMapper.java b/src/main/java/com/zy/asrs/mapper/OrderMapper.java
index 1f4bdcf..6b4144e 100644
--- a/src/main/java/com/zy/asrs/mapper/OrderMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/OrderMapper.java
@@ -1,9 +1,9 @@
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;
import java.util.List;
@@ -12,4 +12,22 @@
@Repository
public interface OrderMapper extends BaseMapper<Order> {
+ int updateSettle(@Param("orderId")Long orderId, @Param("settle")Long settle, @Param("userId")Long userId);
+
+ List<Order> selectComplete();
+ List<Order> selectComplete1();
+ List<Order> selectComplete99();
+ List<Order> selectComplete8();
+ List<Order> selectComplete10();
+ List<Order> selectComplete9();
+ int addToLogTable(Order order);
+
+ List<Order> selectorderNoL(@Param("orderNo")String orderNo);
+
+ Order selectOrderMoveStatus();
+ Order selectOrderMoveStatusInitial();
+
+ List<String> AllStatusSatisfyOrder(@Param("moveStatus") Integer moveStatus);
+
+ boolean updateOrderStatus(@Param("orderNo")String orderNo);
}
--
Gitblit v1.9.1