From df28c2295902ad14b5518ff1af592b80360844b9 Mon Sep 17 00:00:00 2001 From: jiahuiwen Date: Fri, 18 Feb 2022 13:35:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E5=A2=9E=E5=8A=A0=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ljsd/jieling/ktbeans/ReportBaseBean.java | 4 ++-- .../src/main/java/com/ljsd/jieling/logic/dao/UserManager.java | 1 + .../java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/ReportBaseBean.java b/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/ReportBaseBean.java index b8331e90c..537bee4af 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/ReportBaseBean.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/ReportBaseBean.java @@ -82,8 +82,8 @@ public class ReportBaseBean { this.device_id = device_id.isEmpty()?"DEFAULT-DEVICE_ID":device_id; this.ip = ip.isEmpty()?"DEFAULT-IP":ip; this.country_code = country_code; - this.idfa_sOr_imei_s = idfa_sOr_imei_s; - this.network_s = network_s; + this.idfa_sOr_imei_s = idfa_sOr_imei_s.isEmpty() ? "DEFAULT_deviceid" : idfa_sOr_imei_s; + this.network_s = network_s.isEmpty() ? "DEFAULT_mac" : network_s; } public ReportBaseBean() { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java index 55d04f2f7..9167f3f6e 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java @@ -70,6 +70,7 @@ public class UserManager { if (now - addTime >= LIVE_TIME) { userMap.remove(integerUserEntry.getId()); userMapPutTime.remove(integerUserEntry.getId()); + ReportUtil.baseBeanMap.remove(integerUserEntry.getId()); } } LOGGER.info("checkOffline left count={}", userMap.keySet().size()); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java index d68fa91b3..2579b8fa9 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java @@ -271,7 +271,8 @@ public class BuyGoodsNewLogic { jsonObject.put("who", user.getPlayerInfoManager().getOpenId()); ReportBaseBean reportBaseBean = ReportUtil.baseBeanMap.get(uid); JSONObject jsonObject2 = new JSONObject(); - jsonObject2.put("_deviceid", reportBaseBean != null ? reportBaseBean.getIdfa_sOr_imei_s() : "11111"); + jsonObject2.put("_deviceid", (reportBaseBean != null && reportBaseBean.getIdfa_sOr_imei_s() != null && !reportBaseBean.getIdfa_sOr_imei_s().isEmpty())? + reportBaseBean.getIdfa_sOr_imei_s() : "DEFAULT_deviceid"); jsonObject2.put("_transactionid", orderId); jsonObject2.put("_paymenttype", "alipay"); jsonObject2.put("_currencytype", "CNY");