cc值获取方式更改, 读redis发货机

master
duhui 2021-06-10 15:18:54 +08:00
parent 19020916f1
commit 622b8129ee
2 changed files with 18 additions and 6 deletions

View File

@ -128,15 +128,16 @@ public class OrderInfoController {
GSUser gsUser = gsUserDao.findUserInfo(serverId,Integer.valueOf(accountid)); GSUser gsUser = gsUserDao.findUserInfo(serverId,Integer.valueOf(accountid));
if (gsUser == null){ if (gsUser == null){
corder.setCc_id("");
corder.setRegisterTime(""); corder.setRegisterTime("");
corder.setOpenId(""); corder.setOpenId("");
}else { }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.setRegisterTime(DateUtil.stampToTime(gsUser.getPlayerManager().getCreateTime()));
corder.setOpenId(gsUser.getPlayerManager().getOpenId()); 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); cgPayOrders.add(corder);
} }
} }
@ -217,16 +218,16 @@ public class OrderInfoController {
GSUser gsUser = gsUserDao.findUserInfo(serverId,Integer.valueOf(accountid)); GSUser gsUser = gsUserDao.findUserInfo(serverId,Integer.valueOf(accountid));
if (gsUser == null){ if (gsUser == null){
corder.setCc_id("");
corder.setRegisterTime(""); corder.setRegisterTime("");
corder.setOpenId(""); corder.setOpenId("");
}else { }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.setRegisterTime(DateUtil.stampToTime(gsUser.getPlayerManager().getCreateTime()));
corder.setOpenId(gsUser.getPlayerManager().getOpenId()); 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); cgPayOrders.add(corder);
} }
} }

View File

@ -43,6 +43,9 @@ public class CGPayOrder {
@Field(value = "currency_price") @Field(value = "currency_price")
private String currency_price; private String currency_price;
@Field(value = "cc_id")
private String cc_id;
public String getOrderId() { public String getOrderId() {
return orderId; return orderId;
@ -131,4 +134,12 @@ public class CGPayOrder {
public void setCurrency_price(String currency_price) { public void setCurrency_price(String currency_price) {
this.currency_price = 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;
}
} }