提交广告主端和back端整合后测试的bug

src/main/java/com/cloudcross/ssp/model/mapper/adv-balance.sql.xml

@@ -3,13 +3,13 @@
 <mapper namespace="advBalanceSqlMapper">
 	
 	<sql id="base_column">
-		id,
+		t_adv_balance.id as id,
 		account_id as accountId,
-		t_agent_id as agentId, 
+		agent_id as agentId, 
 		advertiser_id as advertiserId,
 		act_time as actTime,
 		num,
-		type,
+	<!-- 	type, -->
 		charge,
 		allocate,
 		consume,
@@ -18,7 +18,20 @@
 		balance,
 		memo
 	</sql>
-	
+	<sql id="base_column2">
+	t_adv_balance.id as id,
+		t_adv_balance.account_id as accountId,
+		t_adv_balance.agent_id as agentId,
+		t_adv_balance.advertiser_id as advertiserId,
+		t_adv_balance.act_time as actTime,
+		t_adv_balance.num as num,
+		t_adv_balance.charge as charge,
+		t_adv_balance.allocate as allocate,
+		t_adv_balance.memo as memo,
+		t_adv_balance.consume as consume,
+		t_adv_balance.balance as balance,
+		t_adv_balance.status as status
+	</sql>
 	<select id="findAdvBalance" parameterType="int" resultType="com.cloudcross.ssp.model.AdvBalance">
 		select * from 	t_adv_balance where id=#{advBalanceId}
 	</select>
@@ -161,7 +174,7 @@
 	
 	<select id="selectById" parameterType="int" resultType="com.cloudcross.ssp.model.AdvBalance">
 		select 
-		<include refid="base_column" />
+		<include refid="base_column2" />
 		from t_adv_balance
 		<where>
 			id = #{id} 
@@ -180,7 +193,7 @@
 	</select>
 	
 	<select id="findByParamsBack" parameterType="map" resultType="com.cloudcross.ssp.model.AdvBalance">
-		select <include refid="base_column"/>, name as agentName from t_adv_balance left join
+		select <include refid="base_column2"/>, name as agentName from t_adv_balance left join
 		t_adv_agent on t_adv_balance.agent_id = t_adv_agent.id
 		<where> 
 		t_adv_balance.advertiser_id = 0 and t_adv_balance.agent_id != 0 and t_adv_balance.status != -1
@@ -193,7 +206,7 @@
 	</select>
 	
 	<select id="findByParams1Back" parameterType="map" resultType="com.cloudcross.ssp.model.AdvBalance">
-	select <include refid="base_column"/>, name as agentName from t_adv_balance left join
+	select <include refid="base_column2"/>, name as agentName from t_adv_balance left join
 		t_adv_agent on t_adv_balance.agent_id = t_adv_agent.id
 		<where> 
 		t_adv_balance.advertiser_id = 0 and t_adv_balance.agent_id != 0 and t_adv_balance.status != -1
@@ -204,7 +217,7 @@
 		order by act_time desc
 	</select>
 	
-	<select id="findBalanceByAgentIdBack" parameterType="long" resultType="float">
+	<select id="findBalanceByAgentIdBack" parameterType="long" resultType="double">
 		select balance from t_adv_balance where agent_id = #{agentId} and status != -1 order by id desc limit 1
 	</select>
 	
@@ -215,7 +228,7 @@
 	</insert>
 	
 	<select id="findByIdBack" parameterType="long" resultType="com.cloudcross.ssp.model.AdvBalance">
-		select <include refid="base_column"/> from t_adv_balance
+		select <include refid="base_column2"/> from t_adv_balance
 		where id = #{id} and status != -1
 	</select>
 	

src/main/java/com/cloudcross/ssp/service/impl/AdvAgentService.java

@@ -78,7 +78,9 @@ public class AdvAgentService implements IAdvAgentService, ISelectorProvider {
 	@Override
 	public Map<String, List<? extends ISelector>> provideData(String[] parentId) {
 		// TODO Auto-generated method stub
-		return null;
+				List<AdvAgent> advAgentsList = findAll();
+				return MapBuilder.create(HashMap.class).add("advAgentsList", advAgentsList)
+						.map();
 	}
 
 }

src/main/java/com/cloudcross/ssp/service/impl/AdvBalanceService.java

@@ -37,7 +37,7 @@ public class AdvBalanceService implements IAdvBalanceService{
 	public int countByParamsBack(Map<String, Object> paramMap) {
 		//这里的搜索只是对日期进行搜索
 		String searchValue = SqlHelper.doLike(paramMap.get("searchValue"));
-		return myBatisDao.get("advBalanceSqlMapper.countByParams.back", paramMap);
+		return myBatisDao.get("advBalanceSqlMapper.countByParamsBack", paramMap);
 	}
 	@Override
 	public int countByParams2(Map<String, Object> paramMap) {
@@ -73,14 +73,14 @@ public class AdvBalanceService implements IAdvBalanceService{
 		String searchValue = SqlHelper.doLike(paramMap.get("searchValue"));
 		paramMap.put("actTime", searchValue);
 		paramMap.put("pager", pager);
-		return myBatisDao.getList("advBalanceSqlMapper.findByParams.back", paramMap);
+		return myBatisDao.getList("advBalanceSqlMapper.findByParamsBack", paramMap);
 	}
 	
 	public List<AdvBalance> findByParams(Map<String, Object> paramMap) {
 		//这里的搜索只是对日期进行搜索
 		String searchValue = SqlHelper.doLike(paramMap.get("searchValue"));
 		paramMap.put("actTime", searchValue);
-		return myBatisDao.getList("advBalanceSqlMapper.findByParams1.back", paramMap);
+		return myBatisDao.getList("advBalanceSqlMapper.findByParams1Back", paramMap);
 	}
 	@Override
 	public List<AdvBalance> findByParams2(Map<String, Object> paramMap, Pager pager) {
@@ -104,7 +104,7 @@ public class AdvBalanceService implements IAdvBalanceService{
 	}
 	@Override
 	public boolean add(AdvBalance t) {
-		myBatisDao.save("advBalanceSqlMapper.add.back", t);
+		myBatisDao.save("advBalanceSqlMapper.addBack", t);
 		return true;
 	}
 	@Override
@@ -115,12 +115,12 @@ public class AdvBalanceService implements IAdvBalanceService{
 	
 	@Override
 	public Double findBalanceByAgentId(Long agentId) {
-		return myBatisDao.get("advBalanceSqlMapper.findBalanceByAgentId.back", agentId);
+		return myBatisDao.get("advBalanceSqlMapper.findBalanceByAgentIdBack", agentId);
 	}
 	
 	@Override
 	public boolean deleteAdvBalanceById(Long id) {
-		myBatisDao.save("advBalanceSqlMapper.deleteAdvBalanceById.back", id);
+		myBatisDao.save("advBalanceSqlMapper.deleteAdvBalanceByIdBack", id);
 		return true;
 	}