--no commit message

app/resource/src/main/java/com/zrqx/resource/fg/mapper/bargaining/FgBargainingMapper.java

@@ -2,6 +2,7 @@ package com.zrqx.resource.fg.mapper.bargaining;
 
 
 import java.math.BigDecimal;
+import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -35,7 +36,7 @@ public interface FgBargainingMapper extends BaseMapper <Bargaining>{
 	@Select("<script>" 
 			+ " select IFNULL(sum(price),0) from res_bargaining where 1 = 1"
 			+ " eq(shareMemberId,shareMemberId)"
-			+ " ne(helpMemberId,shareMemberId)"
+			//+ " ne(helpMemberId,shareMemberId)"
 			+ " eq(type,type)"
 		    + "</script>")
 	BigDecimal queryPrice(@Param("shareMemberId")String shareMemberId,@Param("type")Integer type);
@@ -56,8 +57,19 @@ public interface FgBargainingMapper extends BaseMapper <Bargaining>{
 	@Select("<script>" 
 			+ " select IFNULL(count(price),0) from res_bargaining where 1 = 1"
 			+ " eq(shareMemberId,shareMemberId)"
-			+ " ne(helpMemberId,shareMemberId)"
+		//	+ " ne(helpMemberId,shareMemberId)"
 			+ " eq(type,type)"
 		    + "</script>")
 	Integer queryCount(@Param("shareMemberId")String shareMemberId,@Param("type")Integer type);
+	
+	@Select("<script>" 
+			+ " select * from res_bargaining where 1 = 1"
+			+ " eq(shareMemberId,shareMemberId)"
+			+ " ne(helpMemberId,shareMemberId)"
+			+ " eq(type,type)"
+			+ " ORDER BY createDate"
+		    + "</script>")
+	List<Bargaining> queryBargaining(@Param("shareMemberId")String shareMemberId,@Param("type")Integer type);
+	
+	
 }