From c50f2002f8e47fae55b628caa244904018477cb7 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 19 Nov 2021 14:48:49 +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 | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 insertions(+), 3 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..ff605af 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
@@ -1,19 +1,44 @@
package com.xzx.gc.shop.mapper;
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;
import java.util.Date;
import java.util.List;
+import java.util.Map;
public interface ScoreOrderMapper extends GcMapper<ScoreOrder> {
List<QueryOrderListVo> queryOrderList(@Param("name")String name,
+ @Param("accountName")String accountName,
@Param("orderNo")String orderNo,
- @Param("status")Integer status,
+ @Param("status") List status,
@Param("createdTimeStart")Date createdTimeStart,
- @Param("createdTimeEnd")Date createdTimeEnd);
+ @Param("createdTimeEnd")Date createdTimeEnd,
+ @Param("namePx")Integer namePx,
+ @Param("typePx")Integer typePx);
+
+ 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);
+
+ Map<String, Object> selectOrderStastics(@Param("userId") String userId);
+
+ Integer selectScoreOrderCnt(@Param("userId") String userId);
+
+ Integer selectGoodsQuotaTime(@Param("userId")String userId,
+ @Param("goodsId")Long id,
+ @Param("qgStartTime")Date qgStartTime,
+ @Param("qgEndTime")Date qgEndTime);
+
+ List<ScoreOrder> selectOrderByIsFinish(@Param("dateTime")Date dateTime);
+
+ void updateOrderStatusToDone(@Param("id") Long id);
}
--
Gitblit v1.9.1