修改商户余额资金流水

src/main/java/com/pangding/web/authority/dao/impl/CapitalFlowDaoImpl.java

@@ -19,21 +19,23 @@ public class CapitalFlowDaoImpl extends BaseDaoImpl implements CapitalFlowDao {
     protected void init() {
         register(CapitalFlowVo.class);
         table.add(QUERY_LIST, "SELECT * FROM pd_capital_flow  where  1=1 {WHERE} order by time desc")
-                .add("companyId","and company_id = ? ")
-                .add("companyName","and company_name LIKE concat(?,'%') ")
-                .add("startDate", "and time >= ? ")
-                .add("endDate", "and time <= ? ")
-                .add("orderId", "and order_id = ? ")
-                .add("category", "and category = ?");
+                .add("companyId"," AND company_id = ? ")
+                .add("companyName"," AND company_name LIKE concat(?,'%') ")
+                .add("startDate", " AND time >= ? ")
+                .add("endDate", " AND time <= ? ")
+                .add("orderId", " AND order_id = ? ")
+                .add("category", " AND category = ?")
+                .add("status"," AND status = ? ");
 
         table.add(QUERY_LIST_TOTAL, "SELECT sum(order_money) as order_money,sum(order_fee) as order_fee,sum(actual_money) as actual_money " +
                 "FROM pd_capital_flow  where  1=1 {WHERE} order by time desc")
-                .add("companyId","and company_id = ? ")
-                .add("companyName","and company_name LIKE concat(?,'%')")
-                .add("startDate", "and time >= ? ")
-                .add("endDate", "and time <= ? ")
-                .add("orderId", "and order_id = ? ")
-                .add("category", "and category = ?");
+                .add("companyId","AND company_id = ? ")
+                .add("companyName","AND company_name LIKE concat(?,'%')")
+                .add("startDate", "AND time >= ? ")
+                .add("endDate", "AND time <= ? ")
+                .add("orderId", "AND order_id = ? ")
+                .add("category", "AND category = ?")
+                .add("status"," AND status = ? ");
     }
 
     @Override