fanli-server.git

			@@ -45,6 +45,7 @@
			import com.yeshi.fanli.util.Constant;
			import com.yeshi.fanli.util.StringUtil;
			import com.yeshi.fanli.util.ThreadUtil;
			import com.yeshi.fanli.util.VersionUtil;
			import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;
			import com.yeshi.fanli.util.taobao.TaoBaoUtil;
			import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
			@@ -349,8 +350,20 @@
			* @param acceptData
			* @param out
			*/
			// @RequestMapping(value = "getList", method = RequestMethod.POST)
			@RequestMapping(value = "getList", method = RequestMethod.POST)
			public void getList(AcceptData acceptData, Integer page, Long cid, Long uid, PrintWriter out) {
			if ("ios".equalsIgnoreCase(acceptData.getPlatform())) {
			if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
			getListV3(acceptData, page, cid, uid, out);
			return;
			}
			} else {
			if (VersionUtil.greaterThan_2_0_2(acceptData.getPlatform(), acceptData.getVersion())) {
			getListV3(acceptData, page, cid, uid, out);
			return;
			}
			}

			if (page == null \|\| page < 1) {
			out.print(JsonUtil.loadFalseResult("页码不正确"));
			return;
			@@ -391,8 +404,20 @@
			* @param acceptData
			* @param out
			*/
			// @RequestMapping(value = "getShopInfoV2", method = RequestMethod.POST)
			@RequestMapping(value = "getShopInfoV2", method = RequestMethod.POST)
			public void getShopInfoV2(AcceptData acceptData, Integer page, Long id, Long uid, PrintWriter out) {

			if ("ios".equalsIgnoreCase(acceptData.getPlatform())) {
			if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
			getShopInfoV3(acceptData, page, id, uid, out);
			return;
			}
			} else {
			if (VersionUtil.greaterThan_2_0_2(acceptData.getPlatform(), acceptData.getVersion())) {
			getShopInfoV3(acceptData, page, id, uid, out);
			return;
			}
			}

			if (id == null) {
			out.print(JsonUtil.loadFalseResult("缺失店铺id"));
			@@ -550,8 +575,20 @@
			* 精选1，足迹列表2
			* @param out
			*/
			// @RequestMapping(value = "getHistoryV2", method = RequestMethod.POST)
			@RequestMapping(value = "getHistoryV2", method = RequestMethod.POST)
			public void getHistoryV2(AcceptData acceptData, Integer page, Long uid, Integer type, PrintWriter out) {
			if ("ios".equalsIgnoreCase(acceptData.getPlatform())) {
			if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
			getHistoryV3(acceptData, page, uid, type, out);
			return;
			}
			} else {
			if (VersionUtil.greaterThan_2_0_2(acceptData.getPlatform(), acceptData.getVersion())) {
			getHistoryV3(acceptData, page, uid, type, out);
			return;
			}
			}

			if (type == null) {
			out.print(JsonUtil.loadFalseResult("类型不正确"));
			return;
			@@ -622,7 +659,7 @@
			* @param acceptData
			* @param out
			*/
			@RequestMapping(value = "getList", method = RequestMethod.POST)
			// @RequestMapping(value = "getList", method = RequestMethod.POST)
			public void getListV3(AcceptData acceptData, Integer page, Long cid, Long uid, PrintWriter out) {
			if (page == null \|\| page < 1) {
			out.print(JsonUtil.loadFalseResult("页码不正确"));
			@@ -665,7 +702,7 @@
			* @param acceptData
			* @param out
			*/
			@RequestMapping(value = "getShopInfoV2", method = RequestMethod.POST)
			// @RequestMapping(value = "getShopInfoV2", method = RequestMethod.POST)
			public void getShopInfoV3(AcceptData acceptData, Integer page, Long id, Long uid, PrintWriter out) {
			if (id == null) {
			out.print(JsonUtil.loadFalseResult("缺失店铺id"));
			@@ -740,7 +777,7 @@
			* 精选1，足迹列表2
			* @param out
			*/
			@RequestMapping(value = "getHistoryV2", method = RequestMethod.POST)
			// @RequestMapping(value = "getHistoryV2", method = RequestMethod.POST)
			public void getHistoryV3(AcceptData acceptData, Integer page, Long uid, Integer type, PrintWriter out) {
			if (type == null) {
			out.print(JsonUtil.loadFalseResult("类型不正确"));