ganxiaomao 5 years ago
parent
commit
82eca07fe0
1 changed files with 3 additions and 3 deletions
  1. 3 3
      src/main/java/com/agent/model/deposit/dao/DepositBeanDao.java

+ 3 - 3
src/main/java/com/agent/model/deposit/dao/DepositBeanDao.java

@@ -123,15 +123,15 @@ public class DepositBeanDao<BaseBean> extends BaseDaoImpl<BaseBean> {
                                                  List<Object> conditions, int currentPageInt, int pageSizeInt) {
         List<Object> params = new ArrayList<Object>();
         StringBuffer sql = new StringBuffer();
-        sql.append(" select a.id,b.da_id,b.da_name,b.da_phone,b.da_wxh,b.da_wxnc,a.agent_id,a.agent_name,a.product_name,");
+        sql.append(" select a.id,b.sale_id as da_id,b.sale_name as da_name,b.sale_phone as da_phone,b.sale_wxh as da_wxh,b.sale_wxnc as da_wxnc,a.agent_id,a.agent_name,a.product_name,");
         sql.append(" a.wx_pay_no,a.agent_pay_no,a.pay_amout,a.pay_status,a.refund_no,date_format(a.refund_create_time,'%Y-%m-%d %H:%i:%s') refund_create_time,a.is_common,date_format(a.pay_create_time,'%Y-%m-%d %H:%i:%s') pay_create_time ");
-        sql.append(" from ").append(CommonConstants.TB_DEPOSIT).append(" a,").append(CommonConstants.TB_DIGGER_AGENT).append(" b");
+        sql.append(" from ").append(CommonConstants.TB_DEPOSIT).append(" a,").append(CommonConstants.TB_SALES).append(" b");
         sql.append(" where a.da_id=b.id ");
         sql.append(" and a.user_type=2 ");//icegan--新增,用户类型限制
 
         StringBuffer totalsql = new StringBuffer();
         totalsql.append(" select count(1)");
-        totalsql.append(" from ").append(CommonConstants.TB_DEPOSIT).append(" a,").append(CommonConstants.TB_DIGGER_AGENT).append(" b");
+        totalsql.append(" from ").append(CommonConstants.TB_DEPOSIT).append(" a,").append(CommonConstants.TB_SALES).append(" b");
         totalsql.append(" where a.da_id=b.id ");
         totalsql.append(" and a.user_type=2 ");//icegan--新增,用户类型限制