From eec7e789a87863c25d92c10ad5dfc22ad80c448d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 14 七月 2020 12:36:48 +0800
Subject: [PATCH] 系统区分BUG修复
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java | 38 +++++++++++++++++++++++++++++---------
1 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java
index ca7be40..6c97a89 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java
@@ -5,6 +5,7 @@
import java.util.List;
import java.util.Map;
+import com.yeshi.fanli.entity.SystemEnum;
import org.apache.ibatis.annotations.Param;
import com.yeshi.fanli.dao.BaseMapper;
@@ -15,6 +16,7 @@
public interface CommonOrderMapper extends BaseMapper<CommonOrder> {
+
/**
* 鏌ヨ鐢ㄦ埛璁㈠崟 骞惰鍗曞彿鍒嗙粍
*
@@ -186,7 +188,7 @@
@Param("type") Integer type, @Param("orderState") Integer orderState, @Param("startTime") String startTime,
@Param("endTime") String endTime, @Param("source") Integer source,
@Param("listShopId")List<Long> listShopId, @Param("listGoodsId")List<Long> listGoodsId,
- @Param("minTime")Date minTime, @Param("money")BigDecimal money, @Param("payment") BigDecimal payment);
+ @Param("minTime")Date minTime, @Param("money")BigDecimal money, @Param("payment") BigDecimal payment, @Param("system") SystemEnum system);
/**
* 璁㈠崟鍒楄〃鏌ヨ(涓嶅寘鍚瓙璁㈠崟)
@@ -206,20 +208,20 @@
List<CommonOrderVO> listQueryWithNoChild(@Param("start") long start, @Param("count") int count,
@Param("keyType") Integer keyType, @Param("key") String key, @Param("state") Integer state,
@Param("type") Integer type, @Param("orderState") Integer orderState, @Param("startTime") String startTime,
- @Param("endTime") String endTime, @Param("source") Integer source, @Param("payment") BigDecimal payment);
+ @Param("endTime") String endTime, @Param("source") Integer source, @Param("payment") BigDecimal payment, @Param("system") SystemEnum system);
/**
* 缁熻
*/
long countQuery(@Param("keyType") Integer keyType, @Param("key") String key, @Param("state") Integer state,
- @Param("type") Integer type, @Param("orderState") Integer orderState, @Param("startTime") String startTime,
- @Param("endTime") String endTime, @Param("source") Integer source,
- @Param("listShopId")List<Long> listShopId, @Param("listGoodsId")List<Long> listGoodsId,
- @Param("minTime")Date minTime, @Param("money")BigDecimal money,@Param("payment") BigDecimal payment);
+ @Param("type") Integer type, @Param("orderState") Integer orderState, @Param("startTime") String startTime,
+ @Param("endTime") String endTime, @Param("source") Integer source,
+ @Param("listShopId")List<Long> listShopId, @Param("listGoodsId")List<Long> listGoodsId,
+ @Param("minTime")Date minTime, @Param("money")BigDecimal money, @Param("payment") BigDecimal payment, @Param("system") SystemEnum system);
long countQueryWithNoChild(@Param("keyType") Integer keyType, @Param("key") String key,
@Param("state") Integer state, @Param("type") Integer type, @Param("orderState") Integer orderState,
- @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("source") Integer source, @Param("payment") BigDecimal payment);
+ @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("source") Integer source, @Param("payment") BigDecimal payment, @Param("system") SystemEnum system);
/**
* 鏍规嵁鏉ユ簮绫诲瀷涓庤鍗曞彿鏌ヨ鍒楄〃
@@ -302,6 +304,15 @@
* @return
*/
List<CommonOrder> getByOrderNo(@Param("uid") Long uid, @Param("orderNo") String orderNo);
+
+ /**
+ * 鏍规嵁璁㈠崟鍙锋煡璇�
+ *
+ * @param orderNO
+ * @return
+ */
+ List<CommonOrder> getByOrderNoAndSourceType(@Param("uid") Long uid, @Param("orderNo") String orderNo,
+ @Param("sourceType") int sourceType);
/**
@@ -393,7 +404,7 @@
List<CommonOrderVO> getOrderList(@Param("start") long start, @Param("count") int count, @Param("uid") Long uid,
@Param("state") Integer state, @Param("type") Integer type, @Param("orderState") Integer orderState,
@Param("orderNo") String orderNo, @Param("startTime") String startTime, @Param("endTime") String endTime,
- @Param("day") Integer day, @Param("listSource") List<Integer> listSource, @Param("notBackSuVip") boolean notBackSuVip);
+ @Param("day") Integer day, @Param("listSource") List<Integer> listSource);
/**
* 缁熻鐢ㄦ埛璁㈠崟 骞惰鍗曞彿鍒嗙粍
@@ -406,7 +417,7 @@
long countOrderList(@Param("uid") Long uid, @Param("state") Integer state, @Param("type") Integer type,
@Param("orderState") Integer orderState, @Param("orderNo") String orderNo,
@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("day") Integer day,
- @Param("listSource") List<Integer> listSource, @Param("notBackSuVip") boolean notBackSuVip);
+ @Param("listSource") List<Integer> listSource);
/**
@@ -429,4 +440,13 @@
* @return
*/
List<CommonOrder> listByOrderNo(@Param("orderNo") String orderNo);
+
+
+ /**
+ * 鑾峰彇棣栦釜璁㈠崟
+ * @param orderNo
+ * @return
+ */
+ CommonOrder getFirstOrder(@Param("uid") Long uid);
+
}
\ No newline at end of file
--
Gitblit v1.8.0