From 622b8129ee447e891743795652b9a5b7ab062d78 Mon Sep 17 00:00:00 2001 From: duhui Date: Thu, 10 Jun 2021 15:18:54 +0800 Subject: [PATCH] =?UTF-8?q?cc=E5=80=BC=E8=8E=B7=E5=8F=96=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=E6=9B=B4=E6=94=B9,=20=E8=AF=BBredis=E5=8F=91=E8=B4=A7=E6=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jmfy/controller/OrderInfoController.java | 13 +++++++------ src/main/java/com/jmfy/model/CGPayOrder.java | 11 +++++++++++ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/jmfy/controller/OrderInfoController.java b/src/main/java/com/jmfy/controller/OrderInfoController.java index 18e0cd1..526cb5d 100644 --- a/src/main/java/com/jmfy/controller/OrderInfoController.java +++ b/src/main/java/com/jmfy/controller/OrderInfoController.java @@ -128,15 +128,16 @@ public class OrderInfoController { GSUser gsUser = gsUserDao.findUserInfo(serverId,Integer.valueOf(accountid)); if (gsUser == null){ - corder.setCc_id(""); corder.setRegisterTime(""); corder.setOpenId(""); }else { - ChannelInfo infoById = channelInfoDao.getChannelInfoById(gsUser.getPlayerManager().getCc_id()); - corder.setCc_id(Optional.ofNullable(infoById).map(ChannelInfo::getName).orElse(gsUser.getPlayerManager().getCc_id())); corder.setRegisterTime(DateUtil.stampToTime(gsUser.getPlayerManager().getCreateTime())); corder.setOpenId(gsUser.getPlayerManager().getOpenId()); } + + ChannelInfo infoById = channelInfoDao.getChannelInfoById(cgPayOrder.getCc_id()); + corder.setCc_id(Optional.ofNullable(infoById).map(ChannelInfo::getName).orElse(cgPayOrder.getCc_id())); + cgPayOrders.add(corder); } } @@ -217,16 +218,16 @@ public class OrderInfoController { GSUser gsUser = gsUserDao.findUserInfo(serverId,Integer.valueOf(accountid)); if (gsUser == null){ - corder.setCc_id(""); corder.setRegisterTime(""); corder.setOpenId(""); }else { - ChannelInfo infoById = channelInfoDao.getChannelInfoById(gsUser.getPlayerManager().getCc_id()); - corder.setCc_id(Optional.ofNullable(infoById).map(ChannelInfo::getName).orElse(gsUser.getPlayerManager().getCc_id())); corder.setRegisterTime(DateUtil.stampToTime(gsUser.getPlayerManager().getCreateTime())); corder.setOpenId(gsUser.getPlayerManager().getOpenId()); } + ChannelInfo infoById = channelInfoDao.getChannelInfoById(cgPayOrder.getCc_id()); + corder.setCc_id(Optional.ofNullable(infoById).map(ChannelInfo::getName).orElse(cgPayOrder.getCc_id())); + cgPayOrders.add(corder); } } diff --git a/src/main/java/com/jmfy/model/CGPayOrder.java b/src/main/java/com/jmfy/model/CGPayOrder.java index 3b7146b..822c5dc 100644 --- a/src/main/java/com/jmfy/model/CGPayOrder.java +++ b/src/main/java/com/jmfy/model/CGPayOrder.java @@ -43,6 +43,9 @@ public class CGPayOrder { @Field(value = "currency_price") private String currency_price; + @Field(value = "cc_id") + private String cc_id; + public String getOrderId() { return orderId; @@ -131,4 +134,12 @@ public class CGPayOrder { public void setCurrency_price(String currency_price) { this.currency_price = currency_price; } + + public String getCc_id() { + return cc_id; + } + + public void setCc_id(String cc_id) { + this.cc_id = cc_id; + } }