|
@@ -295,9 +295,6 @@ public class TrackingController {
|
|
|
resp.getBid().getShowUrls(), resp.getBid().getPrice());
|
|
resp.getBid().getShowUrls(), resp.getBid().getPrice());
|
|
|
recordTrackingResults(record.getQk(), "impression", impressionResults);
|
|
recordTrackingResults(record.getQk(), "impression", impressionResults);
|
|
|
}
|
|
}
|
|
|
- } else {
|
|
|
|
|
- mergeClickParams(record, params);
|
|
|
|
|
- hotStore.recordBid(record);
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
List<TrackingResult> trackingResults = adxClient.reportClick(
|
|
List<TrackingResult> trackingResults = adxClient.reportClick(
|
|
@@ -341,26 +338,6 @@ public class TrackingController {
|
|
|
params.remove("deduction_rate_2001");
|
|
params.remove("deduction_rate_2001");
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- private void mergeClickParams(BidRecord record, Map<String, String> params) {
|
|
|
|
|
- if (record == null || params == null || params.isEmpty()) {
|
|
|
|
|
- return;
|
|
|
|
|
- }
|
|
|
|
|
- Map<String, String> merged = new LinkedHashMap<>();
|
|
|
|
|
- if (record.getMediaParams() != null) {
|
|
|
|
|
- merged.putAll(record.getMediaParams());
|
|
|
|
|
- }
|
|
|
|
|
- merged.putAll(params);
|
|
|
|
|
- removeDeductionAliases(merged);
|
|
|
|
|
- record.setMediaParams(merged);
|
|
|
|
|
- if ((record.getAccountId() == null || record.getAccountId().isBlank())
|
|
|
|
|
- && params.get("account_id") != null && !params.get("account_id").isBlank()) {
|
|
|
|
|
- record.setAccountId(params.get("account_id"));
|
|
|
|
|
- }
|
|
|
|
|
- if (params.get("ad_id") != null && !params.get("ad_id").isBlank()) {
|
|
|
|
|
- record.setAdId(params.get("ad_id"));
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
// ─── 私有工具方法 ────────────────────────────────────────────────────────
|
|
// ─── 私有工具方法 ────────────────────────────────────────────────────────
|
|
|
|
|
|
|
|
private BidRecord bidRecordFromMediaResponse(NormalizedBidResponse response,
|
|
private BidRecord bidRecordFromMediaResponse(NormalizedBidResponse response,
|