From b4d3224898d50b8f1e30b5c8083a520743927282 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Mon, 14 Jul 2025 21:08:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xin
---
oying-system/src/main/java/com/oying/modules/sh/mapper/OrderMapper.java | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/sh/mapper/OrderMapper.java b/oying-system/src/main/java/com/oying/modules/sh/mapper/OrderMapper.java
index f300317..8172479 100644
--- a/oying-system/src/main/java/com/oying/modules/sh/mapper/OrderMapper.java
+++ b/oying-system/src/main/java/com/oying/modules/sh/mapper/OrderMapper.java
@@ -2,7 +2,9 @@
import com.oying.modules.sh.domain.Order;
import com.oying.modules.sh.domain.dto.OrderQueryCriteria;
+
import java.util.List;
+
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -10,13 +12,23 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
/**
-* @author lixin
-* @date 2025-06-11
-**/
+ * @author lixin
+ * @date 2025-06-11
+ **/
@Mapper
public interface OrderMapper extends BaseMapper<Order> {
- IPage<Order> findAll(@Param("criteria") OrderQueryCriteria criteria, Page<Object> page);
+ IPage<Order> findAll(@Param("criteria") OrderQueryCriteria criteria, @Param("blurry") String blurry, Page<Object> page);
- List<Order> findAll(@Param("criteria") OrderQueryCriteria criteria);
+ List<Order> findAll(@Param("criteria") OrderQueryCriteria criteria, @Param("blurry") String blurry);
+
+ Long countAll(@Param("criteria") OrderQueryCriteria criteria, @Param("blurry") String blurry);
+
+ Order getByOrderNum(String orderNum);
+
+ void updatePayStatus(String orderNum, String payState, String payMessage, String payTime);
+
+ void updateCloseStatus(String orderNum, String payState);
+
+ void updateOrderStatus(String orderNum, Integer key, String value);
}
--
Gitblit v1.9.3