fanli-server.git

			@@ -1191,7 +1191,7 @@

			// 获取浏览记录
			@RequestMapping(value = "getscanhistory", method = RequestMethod.POST)
			public void getScanHistory(AcceptData acceptData, String uid, int page, Integer goodsType, PrintWriter out) {
			public void getScanHistory(AcceptData acceptData, String uid, int page, PrintWriter out) {

			if (page < 0) {
			out.print(JsonUtil.loadFalseResult(1, "page不小于0"));
			@@ -1205,9 +1205,9 @@
			return;
			}
			List<ScanHistoryV2> list = scanHistoryV2Service.getScanHistoryByDeviceOrUid(
			StringUtil.isNullOrEmpty(uid) ? null : Long.parseLong(uid), acceptData.getDevice(), page, 20, goodsType);
			StringUtil.isNullOrEmpty(uid) ? null : Long.parseLong(uid), acceptData.getDevice(), page, 20, Constant.SOURCE_TYPE_TAOBAO);
			long count = scanHistoryV2Service.getCountByDeviceOrUid(
			StringUtil.isNullOrEmpty(uid) ? null : Long.parseLong(uid), acceptData.getDevice(), goodsType);
			StringUtil.isNullOrEmpty(uid) ? null : Long.parseLong(uid), acceptData.getDevice(), Constant.SOURCE_TYPE_TAOBAO);



			@@ -1246,8 +1246,7 @@
			}

			@RequestMapping(value = "deletescanhistory", method = RequestMethod.POST)
			public void deleteScanHistory(AcceptData acceptData, String type, String uid, String ids,
			Integer goodsType, PrintWriter out) {
			public void deleteScanHistory(AcceptData acceptData, String type, String uid, String ids, PrintWriter out) {
			BusinessSystem sys = businessSystemService.getBusinessSystem(acceptData.getPlatform(),
			acceptData.getPackages());
			if (sys == null) {
			@@ -1260,11 +1259,11 @@
			for (String auctionIdStr : idStr) {
			scanHistoryV2Service.deleteByAuctionIdAndDeviceOrUid(
			StringUtil.isNullOrEmpty(uid) ? null : Long.parseLong(uid), acceptData.getDevice(),
			Long.parseLong(auctionIdStr), goodsType);
			Long.parseLong(auctionIdStr));
			}
			} else {
			scanHistoryV2Service.deleteByDeviceOrUid(StringUtil.isNullOrEmpty(uid) ? null : Long.parseLong(uid),
			acceptData.getDevice(), goodsType);
			acceptData.getDevice());
			}
			out.print(JsonUtil.loadTrueResult(""));

			@@ -2122,7 +2121,8 @@
			}

			String token = "";
			if (!StringUtil.isNullOrEmpty(tb.getCouponLink())) {
			if (!StringUtil.isNullOrEmpty(tb.getCouponLink())
			&& VersionUtil.greaterThan_1_5_60(acceptData.getPlatform(), acceptData.getVersion())) {
			token = redisManager.getCommonTaoToken(tb.getAuctionId());
			if (StringUtil.isNullOrEmpty(token)) {
			token = TaoKeApiUtil.getTKToken(tb.getPictUrl(), tb.getTitle(), tb.getCouponLink());