From 51a4ff5d777028d52a19c314a99f796334cb7b51 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 23 十一月 2019 18:30:01 +0800
Subject: [PATCH] 配置文件修改
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/goods/ScanHistoryV2Mapper.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/goods/ScanHistoryV2Mapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/goods/ScanHistoryV2Mapper.java
index 9528b6e..074fce1 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/goods/ScanHistoryV2Mapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/goods/ScanHistoryV2Mapper.java
@@ -19,7 +19,7 @@
* @return
*/
List<ScanHistoryV2> selectByDeviceOrUid(@Param("uid") Long uid, @Param("device") String device,
- @Param("start") long start, @Param("count") int count);
+ @Param("start") long start, @Param("count") int count, @Param("source")Integer source);
/**
* 鏍规嵁UID鎴栬�呰澶囧彿鑾峰彇娴忚璁板綍鏉℃暟
@@ -28,7 +28,7 @@
* @param device
* @return
*/
- Long selectCountByDeviceOrUid(@Param("uid") Long uid, @Param("device") String device);
+ Long selectCountByDeviceOrUid(@Param("uid") Long uid, @Param("device") String device, @Param("source")Integer source);
/**
* 鏍规嵁璁惧鎴栫敤鎴稩D鍒犻櫎
@@ -37,7 +37,7 @@
* @param device
* @return
*/
- int deleteByDeviceOrUid(@Param("uid") Long uid, @Param("device") String device);
+ List<ScanHistoryV2> listDeviceOrUid(@Param("uid") Long uid, @Param("device") String device);
/**
* 鏍规嵁璁惧鎴栫敤鎴稩D涓庡晢鍝佷俊鎭绱�
@@ -49,6 +49,15 @@
* @return
*/
List<ScanHistoryV2> selectByDeviceOrUidAndGoodsIdAndGoodsType(@Param("uid") Long uid,
- @Param("device") String device, @Param("goodsId") long goodsId, @Param("goodsType") int goodsType);
+ @Param("device") String device, @Param("goodsId") long goodsId);
+
+ /**
+ * 鏍规嵁绠�鐗堝晢鍝乮d鏌ヨ
+ * @param uid
+ * @param device
+ * @param commonId
+ * @return
+ */
+ List<ScanHistoryV2> getByCommonGoodsId(@Param("uid") Long uid, @Param("device") String device, @Param("commonId")Long commonId);
}
\ No newline at end of file
--
Gitblit v1.8.0