From 898213bf34f8535b703a90bef799a9bf0adba95c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 29 Jun 2021 14:41:28 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-shop/src/main/java/com/xzx/gc/shop/mapper/ScoreOrderMapper.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/mapper/ScoreOrderMapper.java b/gc-shop/src/main/java/com/xzx/gc/shop/mapper/ScoreOrderMapper.java
index 3c37cf7..6ee3b29 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/mapper/ScoreOrderMapper.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/mapper/ScoreOrderMapper.java
@@ -2,7 +2,10 @@
import com.xzx.gc.entity.ScoreOrder;
import com.xzx.gc.shop.dto.QueryOrderListDto;
+import com.xzx.gc.shop.dto.XcxOrderListDto;
import com.xzx.gc.shop.vo.QueryOrderListVo;
+import com.xzx.gc.shop.vo.XcxOrderDetailsVo;
+import com.xzx.gc.shop.vo.XcxOrderListVo;
import com.xzx.gc.util.GcMapper;
import org.apache.ibatis.annotations.Param;
@@ -16,4 +19,10 @@
@Param("status")Integer status,
@Param("createdTimeStart")Date createdTimeStart,
@Param("createdTimeEnd")Date createdTimeEnd);
+
+ List<XcxOrderListVo> selectXcxOrderList(@Param("record") XcxOrderListDto xcxOrderListDto);
+
+ XcxOrderDetailsVo selectXcxOrderDetails(@Param("id") Long id);
+
+ int updateOrderStatus(@Param("id") Long id, @Param("status") Integer status, @Param("userId") String userId);
}
--
Gitblit v1.9.1