订单货币类型添加

master
lvxinran 2020-10-01 01:32:17 +08:00
parent 325caa8e94
commit 2cc346229d
4 changed files with 59 additions and 10 deletions

View File

@ -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){

View File

@ -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;
}
}

View File

@ -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;
}
}

View File

@ -40,7 +40,9 @@
<th width="200">礼包id</th>
<th width="200">礼包名称</th>
<th width="200">礼包内容</th>
<th width="200">充值金额</th>
<th width="200">礼包金额</th>
<th width="200">货币类型</th>
<th width="200">货币数量</th>
<th width="200">支付方式</th>
<th width="200">注册时间</th>
@ -59,6 +61,8 @@
<td th:text="${obj.productName}" style="text-align: center;"></td>
<td th:text="${obj.productContent}" style="text-align: center;"></td>
<td th:text="${obj.amount}" style="text-align: center;"></td>
<td th:text="${obj.currency_code}" style="text-align: center;"></td>
<td th:text="${obj.currency_price}" style="text-align: center;"></td>
<td th:text="${obj.recharge_type}" style="text-align: center;"></td>
<td th:text="${obj.registerTime}" style="text-align: center;"></td>
@ -68,15 +72,15 @@
</div>
</div>
<!--_footer 作为公共模版分离出去-->
<script type="text/javascript" src="lib/jquery/1.9.1/jquery.min.js"></script>
<script type="text/javascript" src="lib/layer/2.4/layer.js"></script>
<script type="text/javascript" src="h-ui/js/H-ui.min.js"></script>
<script type="text/javascript" src="h-ui.admin/js/H-ui.admin.js"></script> <!--/_footer 作为公共模版分离出去-->
<script type="text/javascript" src="../static/lib/jquery/1.9.1/jquery.min.js"></script>
<script type="text/javascript" src="../static/lib/layer/2.4/layer.js"></script>
<script type="text/javascript" src="../static/h-ui/js/H-ui.min.js"></script>
<script type="text/javascript" src="../static/h-ui.admin/js/H-ui.admin.js"></script> <!--/_footer 作为公共模版分离出去-->
<!--请在下方写此页面业务相关的脚本-->
<script type="text/javascript" src="lib/My97DatePicker/4.8/WdatePicker.js"></script>
<script type="text/javascript" src="lib/datatables/1.10.0/jquery.dataTables.min.js"></script>
<script type="text/javascript" src="lib/laypage/1.2/laypage.js"></script>
<script type="text/javascript" src="../static/lib/My97DatePicker/4.8/WdatePicker.js"></script>
<script type="text/javascript" src="../static/lib/datatables/1.10.0/jquery.dataTables.min.js"></script>
<script type="text/javascript" src="../static/lib/laypage/1.2/laypage.js"></script>
<script type="text/javascript">
$('.table-sort').dataTable({
"aaSorting": [[ 1, "desc" ]],//默认第几个排序