diff --git a/service/src/main/java/com/hfkj/dao/BsTradeOrderMapperExt.java b/service/src/main/java/com/hfkj/dao/BsTradeOrderMapperExt.java
index 5e8ce16..bac3183 100644
--- a/service/src/main/java/com/hfkj/dao/BsTradeOrderMapperExt.java
+++ b/service/src/main/java/com/hfkj/dao/BsTradeOrderMapperExt.java
@@ -22,11 +22,14 @@ public interface BsTradeOrderMapperExt {
" and agent_id = #{param.agentId}" +
" and salesman_id = #{param.salesmanId} " +
" and mer_id = #{param.merId} " +
+ " and mer_no like CONCAT('%', #{param.merNo} , '%') " +
+ " and mer_name like CONCAT('%', #{param.merName} , '%') " +
+ " and mer_abbreviate like CONCAT('%', #{param.merAbbreviate} , '%') " +
" and store_id = #{param.storeId} " +
- " and store_name CONCAT('%', #{param.storeName} , '%') " +
- " and pay_mode = #{param.payMode}" +
- " and out_trade_no like CONCAT('%', #{param.outTradeNo} , '%')" +
- " and acc_trade_no = #{param.accTradeNo}" +
+ " and store_name like CONCAT('%', #{param.storeName} , '%') " +
+ " and pay_mode = #{param.payMode} " +
+ " and out_trade_no like CONCAT('%', #{param.outTradeNo} , '%') " +
+ " and acc_trade_no like CONCAT('%', #{param.accTradeNo} , '%') " +
" = #{param.createTimeS} ]]> " +
" " +
" = #{param.payTimeS} ]]> " +