From 2cc346229d5119410a9edbe94aac7f72b87e656d Mon Sep 17 00:00:00 2001 From: lvxinran Date: Thu, 1 Oct 2020 01:32:17 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=B4=A7=E5=B8=81=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jmfy/controller/OrderInfoController.java | 7 ++++-- src/main/java/com/jmfy/model/CGPayOrder.java | 22 +++++++++++++++++++ src/main/java/com/jmfy/model/Corder.java | 20 +++++++++++++++++ .../resources/templates/userOrderInfo.html | 20 ++++++++++------- 4 files changed, 59 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/jmfy/controller/OrderInfoController.java b/src/main/java/com/jmfy/controller/OrderInfoController.java index 6b5c762..aed8721 100644 --- a/src/main/java/com/jmfy/controller/OrderInfoController.java +++ b/src/main/java/com/jmfy/controller/OrderInfoController.java @@ -102,8 +102,8 @@ public class OrderInfoController { corder.setPayTime(payTime); corder.setProductid(cgPayOrder.getGoodsId()); corder.setServerId(String.valueOf(serverId)); - Date registerDate = new Date(gsUser.getPlayerManager().getCreateTime()); - corder.setRegisterTime(simpleDateFormat.format(registerDate)); +// Date registerDate = new Date(gsUser.getPlayerManager().getCreateTime()); +// corder.setRegisterTime(simpleDateFormat.format(registerDate)); // SRechargeCommodityConfig config = rechargeMap.get(Integer.parseInt(cgPayOrder.getGoodsId())); SRechargeCommodityConfig config; @@ -116,6 +116,9 @@ public class OrderInfoController { } corder.setProductName(config==null?"":config.getName()); + corder.setCurrency_code(cgPayOrder.getCurrency_code()==null?"":cgPayOrder.getCurrency_code()); + corder.setCurrency_price(cgPayOrder.getCurrency_price()==null?"":cgPayOrder.getCurrency_price()); + int[][] baseReward = config.getBaseReward(); StringBuilder builder = new StringBuilder(); if(baseReward!=null&&baseReward.length>0){ diff --git a/src/main/java/com/jmfy/model/CGPayOrder.java b/src/main/java/com/jmfy/model/CGPayOrder.java index 7084a98..3b7146b 100644 --- a/src/main/java/com/jmfy/model/CGPayOrder.java +++ b/src/main/java/com/jmfy/model/CGPayOrder.java @@ -37,6 +37,12 @@ public class CGPayOrder { @Field(value = "amount") private String amount ; //充值金额 + @Field(value = "currency_code") + private String currency_code; + + @Field(value = "currency_price") + private String currency_price; + public String getOrderId() { return orderId; @@ -109,4 +115,20 @@ public class CGPayOrder { public void setGoodsId(String goodsId) { this.goodsId = goodsId; } + + public String getCurrency_code() { + return currency_code; + } + + public void setCurrency_code(String currency_code) { + this.currency_code = currency_code; + } + + public String getCurrency_price() { + return currency_price; + } + + public void setCurrency_price(String currency_price) { + this.currency_price = currency_price; + } } diff --git a/src/main/java/com/jmfy/model/Corder.java b/src/main/java/com/jmfy/model/Corder.java index d545736..be5395a 100644 --- a/src/main/java/com/jmfy/model/Corder.java +++ b/src/main/java/com/jmfy/model/Corder.java @@ -22,6 +22,10 @@ public class Corder { private String productContent; + private String currency_code; + + private String currency_price; + public String getAccountid() { return accountid; } @@ -101,4 +105,20 @@ public class Corder { public void setProductContent(String productContent) { this.productContent = productContent; } + + public String getCurrency_code() { + return currency_code; + } + + public void setCurrency_code(String currency_code) { + this.currency_code = currency_code; + } + + public String getCurrency_price() { + return currency_price; + } + + public void setCurrency_price(String currency_price) { + this.currency_price = currency_price; + } } diff --git a/src/main/resources/templates/userOrderInfo.html b/src/main/resources/templates/userOrderInfo.html index 45864e8..11d3bba 100644 --- a/src/main/resources/templates/userOrderInfo.html +++ b/src/main/resources/templates/userOrderInfo.html @@ -40,7 +40,9 @@ 礼包id 礼包名称 礼包内容 - 充值金额 + 礼包金额 + 货币类型 + 货币数量 支付方式 注册时间 @@ -59,6 +61,8 @@ + + @@ -68,15 +72,15 @@ - - - - + + + + - - - + + +