moliparty/peko-java
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v1.1 后台-用户账单查询-补充字段

Browse Source
This commit is contained in:
yeungchihang
2022-10-20 18:11:05 +08:00
parent 20c86cde12
commit 7aeeed62df
4 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/BillRecordAdminService.java
View File

@@ -104,7 +104,7 @@ public class BillRecordAdminService extends BaseService {
List<String> chargeRecordIds = list.stream().filter(b->b.getObjType() == BillObjTypeEnum.CHARGE.getValue() || b.getObjType() == BillObjTypeEnum.OPEN_VIP.getValue())
.map(BillRecord::getObjId).collect(Collectors.toList());
List<ChargeRecord> chargeRecordList = chargeRecordService.listChargeRecordByIds(chargeRecordIds);
List<ChargeRecord> chargeRecordList = !CollectionUtils.isEmpty(chargeRecordIds)?chargeRecordService.listChargeRecordByIds(chargeRecordIds): new ArrayList<>();
Map<String, ChargeRecord> chargeRecordMap = chargeRecordList.stream().collect(Collectors.toMap(ChargeRecord::getChargeRecordId, c->c));
List<BillRecordVo> voList = new ArrayList<>(list.size());
@@ -136,6 +136,7 @@ public class BillRecordAdminService extends BaseService {
|| billRecordAdminVo.getObjType() == BillObjTypeEnum.OPEN_VIP.getValue()){
ChargeRecord chargeRecord = chargeRecordMap.get(billRecordAdminVo.getObjId());
if (null != chargeRecord){
billRecordAdminVo.setCountry(chargeRecord.getCountry());
billRecordAdminVo.setLocalCurrencyCode(chargeRecord.getLocalCurrencyCode());
billRecordAdminVo.setLocalAmount(new BigDecimal(chargeRecord.getLocalAmount()).divide(Constant.HUNDRED, 2, RoundingMode.HALF_UP));
}

8
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/vo/BillRecordExcelVo.java
View File

@@ -35,17 +35,19 @@ public class BillRecordExcelVo {
public String roomNick;
@ExcelProperty("钻石/水晶/金币")
public BigDecimal amount;
@ExcelProperty("国家/地区")
public String country;
@ExcelProperty("货币数")
public BigDecimal localAmount;
@ExcelProperty("本地货币代码")
public String localCurrencyCode;
@ExcelProperty("货币数")
public BigDecimal actualAmount;
@ExcelProperty("游戏货币")
@ExcelProperty("交易币种")
public String currencyDesc;
@ExcelProperty("收入支出")
public String billTypeDesc;
@ExcelProperty("账单类型")
public String billTypeDesc;
@ExcelProperty("账单业务类型")
public String objTypeDesc;
@ExcelProperty("账单类型code")
private Byte objType;

2
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/vo/BillRecordVo.java
View File

@@ -36,6 +36,8 @@ public class BillRecordVo extends BaseVo {
public String roomNick;
@FieldComment("钻石/水晶/金币")
public BigDecimal amount;
@FieldComment("国家/地区")
public String country;
@FieldComment("货币数")
public BigDecimal localAmount;
@FieldComment("本地货币代码")

8
accompany-admin/accompany-admin-web/src/main/resources/static/html/users/bill_record_admin.html
View File

@@ -77,11 +77,13 @@
{field:'giftName',title:'礼物名称',align:'center',valign:'middle',width:'5%'},
{field:'giftNum',title:'礼物数量',align:'center',valign:'middle',width:'5%'},
{field:'amount',title:'钻石/水晶/金币',align:'center',valign:'middle',width:'5%'},
{field:'country',title:'国家/地区',align:'center',valign:'middle',width:'5%'},
{field:'localCurrencyCode',title:'本地货币数',align:'center',valign:'middle',width:'5%'},
{field:'localAmount',title:'货币数',align:'center',valign:'middle',width:'5%'},
{field:'billTypeDesc',title:'收入支出',align:'center',valign:'middle',width:'10%'},
{field:'objTypeDesc',title:'账单类型',align:'center',valign:'middle',width:'10%'},
{field:'createTime',title:'账单创建时间',align:'center',valign:'middle',width:'10%',formatter:function (val,row,index) {
{field:'currencyDesc',title:'交易币种',align:'center',valign:'middle',width:'5%'},
{field:'billTypeDesc',title:'账单类型',align:'center',valign:'middle',width:'10%'},
{field:'objTypeDesc',title:'业务类型',align:'center',valign:'middle',width:'10%'},
{field:'createTime',title:'创建时间',align:'center',valign:'middle',width:'10%',formatter:function (val,row,index) {
if(val){
var date = new Date(val);
return date.format("yyyy-MM-dd hh:mm:ss");