From c094aa1a63e711a632f24a17f21462778829ecc7 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 10 Nov 2021 15:08:01 +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 | 15 ++++++++++++---
1 files changed, 12 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 ced9e9b..8de12ef 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,7 +1,6 @@
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;
@@ -16,10 +15,13 @@
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);
@@ -28,4 +30,11 @@
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);
}
--
Gitblit v1.9.1