fanli-server.git

			@@ -516,7 +516,11 @@
			// 设置SearchFilter
			taoKeGoodsService.setSearchFilter(searchfilter, filter, order, startprice, endprice, fastFilter,
			totalSales);
			searchfilter.setEndPrice(new BigDecimal(10000));

			// 用户未输入最高价格时最高价格限制99999
			if (searchfilter.getEndPrice() == null) {
			searchfilter.setEndPrice(new BigDecimal(99999));
			}
			}

			searchfilter.setPage(pageNo);

			@@ -1646,6 +1646,11 @@

			JSONObject resultData = new JSONObject();

			String helpLink = configService.get("team_help_url");
			if (helpLink == null) {
			helpLink = "";
			}
			resultData.put("helpLink", helpLink);
			resultData.put("firstTeam", firstTeam);
			resultData.put("firstTeamTotal", firstTeamTotal);
			resultData.put("secondTeam", secondTeam);
			@@ -1714,13 +1719,13 @@

			List<ThreeSale> listThreeSale = threeSaleSerivce.listbyIdAndBossId(inviteId, uid, 1);
			if (listThreeSale == null \|\| listThreeSale.size() == 0) {
			out.print(JsonUtil.loadFalseResult("操作失败"));
			out.print(JsonUtil.loadFalseResult("操作数据无效"));
			return;
			}

			UserInfo worker = listThreeSale.get(0).getWorker();
			if (worker == null) {
			out.print(JsonUtil.loadFalseResult("操作失败"));
			out.print(JsonUtil.loadFalseResult("操作数据无效"));
			return;
			}

			@@ -58,8 +58,8 @@
			</select>

			<delete id="deleteByBossIdAndWorkerId" parameterType="java.lang.Long">
			delete from yeshi_ec_threesale_extra_info t
			WHERE t.`tf_boss_id` = #{bossId} AND t.`tf_worker_id`= #{workerId}
			delete from yeshi_ec_threesale_extra_info
			WHERE `tf_boss_id` = #{bossId} AND `tf_worker_id`= #{workerId}
			</delete>

			</mapper>

			@@ -388,7 +388,7 @@

			<select id="listbyIdAndBossId" resultMap="BaseResultMap">
			SELECT <include refid="Base_Column_List" /> FROM yeshi_ec_threeSale
			WHERE id = #{uid} AND boss_id=#{uid}
			WHERE id = #{id} AND boss_id=#{uid}
			<if test="expire != null and expire == 1">
			AND `expire` = 1 <!-- 失效 -->
			</if>

	fanli/src/main/java/com/yeshi/fanli/controller/client/GoodsClassController.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/mapping/ThreeSaleExtraInfoMapper.xml	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/mapping/ThreeSaleMapper.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史