fanli-server.git

			@@ -31,6 +31,7 @@
			import com.yeshi.fanli.service.inter.taobao.TaoBaoShopService;
			import com.yeshi.fanli.util.Constant;
			import com.yeshi.fanli.util.StringUtil;
			import com.yeshi.fanli.util.ThreadUtil;
			import com.yeshi.fanli.util.taobao.TaoBaoUtil;
			import com.yeshi.fanli.util.taobao.TaoKeApiUtil;

			@@ -97,7 +98,7 @@
			out.print(JsonUtil.loadFalseResult("店铺id为空"));
			return;
			}
			taoBaoShopHistoryService.addHistory(sid, uid, acceptData.getDevice());

			out.print(JsonUtil.loadTrueResult("记录成功"));
			} catch (Exception e) {
			out.print(JsonUtil.loadFalseResult("记录失败"));
			@@ -223,7 +224,7 @@
			* @param out
			*/
			@RequestMapping(value = "getShopInfo", method = RequestMethod.POST)
			public void getShopInfo(AcceptData acceptData, Integer page, Long sid, PrintWriter out) {
			public void getShopInfo(AcceptData acceptData, Integer page, Long sid, Long uid, PrintWriter out) {
			try {
			JSONObject data = new JSONObject();
			if (page == 1) {
			@@ -246,6 +247,15 @@
			taoBaoShop.setShopIcon(shopIconCustom);
			}
			data.put("shop", taoBaoShop);


			ThreadUtil.run(new Runnable() {
			public void run() {
			// 添加足迹
			taoBaoShopHistoryService.addHistory(sid, uid, acceptData.getDevice());
			}
			});

			}

			int pageSize = Constant.PAGE_SIZE;

			@@ -257,9 +257,14 @@
			@Cacheable(value = "brandCache", key = "'listEffectiveCache-'+#page+'-'+#cid")
			public JSONObject listEffectiveCache(int page, Long cid) {
			long countShop = 0;

			if (cid != null && cid <= 0) {
			cid = null;
			}

			List<TaoBaoShop> listShop = new ArrayList<TaoBaoShop>();
			// 第一页查询全部分类下店铺
			if (page == 1 && cid != null && cid > 0 ) {
			if (page == 1 && cid != null) {
			List<BrandClassShop> list = brandClassShopMapper.listEffective(cid);
			if (list == null) {
			list = new ArrayList<BrandClassShop>();

	fanli/src/main/java/com/yeshi/fanli/controller/client/BrandController.java	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandClassShopServiceImpl.java	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史