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

推广后台-送礼钻石数

Browse Source
This commit is contained in:
yeungchihang
2022-11-15 19:13:13 +08:00
parent d2ef4167b0
commit c1c86df760
14 changed files with 79 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
accompany-admin/accompany-admin-service/src/main/resources/mapper/FlowTeamStatisticMapper.xml
View File

@@ -50,8 +50,7 @@
0 charge_user, 0 charge_user,
0 charge_count, 0 charge_count,
0 total_charge, 0 total_charge,
sum(case when gsr.total_gold_num is not null then gsr.total_gold_num else 0 end) / sum(case when gsr.total_gold_num is not null then gsr.total_gold_num else 0 end) total_send_gift
10 total_send_gift
from account a, users u from account a, users u
left join gift_send_record gsr on u.uid = gsr.uid left join gift_send_record gsr on u.uid = gsr.uid
where u.invite_code in where u.invite_code in
@@ -177,10 +176,7 @@
0 charge_user, 0 charge_user,
0 charge_count, 0 charge_count,
0 total_charge, 0 total_charge,
sum(case sum(case when gsr.total_gold_num is not null then gsr.total_gold_num else 0 end) total_send_gift
when gsr.total_gold_num is not null
then gsr.total_gold_num
else 0 end) / 10 total_send_gift
from flow_team_member tm, from flow_team_member tm,
flow_team_member_invite_code ic, flow_team_member_invite_code ic,
user_invite_code uic, user_invite_code uic,
@@ -281,14 +277,9 @@
u.create_time, u.create_time,
0 charge_count, 0 charge_count,
0 total_charge, 0 total_charge,
sum(case when gsr.total_gold_num is not null then gsr.total_gold_num else 0 end) / sum(case when gsr.total_gold_num is not null then gsr.total_gold_num else 0 end) total_send_gift,
10 total_send_gift, sum(case when gsr.gift_source = 1 and gsr.total_gold_num is not null then gsr.total_gold_num else 0 end) total_no_backbag_send_gift,
sum(case sum(case when gsr.gift_source = 2 and gsr.total_gold_num is not null then gsr.total_gold_num else 0 end) total_backbag_send_gift
when gsr.gift_source = 1 and gsr.total_gold_num is not null then gsr.total_gold_num
else 0 end) / 10 total_no_backbag_send_gift,
sum(case
when gsr.gift_source = 2 and gsr.total_gold_num is not null then gsr.total_gold_num
else 0 end) / 10 total_backbag_send_gift
from flow_team_member tm, from flow_team_member tm,
flow_team_member_invite_code ic, flow_team_member_invite_code ic,
user_invite_code uic, user_invite_code uic,
@@ -478,10 +469,7 @@
0 charge_user, 0 charge_user,
0 charge_count, 0 charge_count,
0 total_charge, 0 total_charge,
sum(case sum(case when gsr.total_gold_num is not null then gsr.total_gold_num else 0 end) total_send_gift
when gsr.total_gold_num is not null
then gsr.total_gold_num
else 0 end) total_send_gift
from flow_team_member tm from flow_team_member tm
left join flow_team_member_invite_user u on tm.member_id = u.member_id left join flow_team_member_invite_user u on tm.member_id = u.member_id
left join gift_send_record gsr on u.uid = gsr.uid left join gift_send_record gsr on u.uid = gsr.uid
@@ -574,16 +562,10 @@
u1.phone, u1.phone,
0 charge_count, 0 charge_count,
0 total_charge, 0 total_charge,
sum(case when gsr.total_gold_num is not null then gsr.total_gold_num else 0 end) sum(case when gsr.total_gold_num is not null then gsr.total_gold_num else 0 end) total_send_gift,
total_send_gift, sum(case when gsr.gift_source = 1 and gsr.total_gold_num is not null then gsr.total_gold_num else 0 end) total_no_backbag_send_gift,
sum(case sum(case when gsr.gift_source = 2 and gsr.total_gold_num is not null then gsr.total_gold_num else 0 end) total_backbag_send_gift
when gsr.gift_source = 1 and gsr.total_gold_num is not null then gsr.total_gold_num from flow_team_member_invite_user u
else 0 end) total_no_backbag_send_gift,
sum(case
when gsr.gift_source = 2 and gsr.total_gold_num is not null then gsr.total_gold_num
else 0 end) total_backbag_send_gift
from
flow_team_member_invite_user u
left join account a on a.uid = u.uid left join account a on a.uid = u.uid
<if test="groupApps != null and groupApps.size > 0" > <if test="groupApps != null and groupApps.size > 0" >
and a.signup_app in and a.signup_app in
@@ -614,6 +596,5 @@
) t LEFT JOIN account a ON t.erban_no = a.erban_no ) t LEFT JOIN account a ON t.erban_no = a.erban_no
group by t.member_name, t.team_id,t.invite_code, t.erban_no , t.uid, t.nick,t.create_time, a.register_ip, t.phone group by t.member_name, t.team_id,t.invite_code, t.erban_no , t.uid, t.nick,t.create_time, a.register_ip, t.phone
order by t.create_time desc, t.invite_code order by t.create_time desc, t.invite_code
;
</select> </select>
</mapper> </mapper>

5
accompany-admin/accompany-flow-team-admin-service/src/main/java/com/accompany/flowteam/admin/service/FlowTeamMemberStatisticsService.java
View File

@@ -12,6 +12,7 @@ import com.accompany.business.service.flow.FlowTeamBaseService;
import com.accompany.business.service.gift.GiftSendRecordService; import com.accompany.business.service.gift.GiftSendRecordService;
import com.accompany.business.service.gift.GiftService; import com.accompany.business.service.gift.GiftService;
import com.accompany.business.service.record.BillRecordService; import com.accompany.business.service.record.BillRecordService;
import com.accompany.common.constant.Constant;
import com.accompany.common.status.BusiStatus; import com.accompany.common.status.BusiStatus;
import com.accompany.common.utils.DateTimeUtil; import com.accompany.common.utils.DateTimeUtil;
import com.accompany.common.utils.StringUtils; import com.accompany.common.utils.StringUtils;
@@ -41,6 +42,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@@ -151,7 +153,6 @@ public class FlowTeamMemberStatisticsService {
} }
public List<FlowTeamStatisticUserDetailVO> listUserStatisticDetails(FlowTeamMemberStatisticParams params) { public List<FlowTeamStatisticUserDetailVO> listUserStatisticDetails(FlowTeamMemberStatisticParams params) {
return flowTeamMemberStatisticsMapper.listUserStatisticDetailsV2(params); return flowTeamMemberStatisticsMapper.listUserStatisticDetailsV2(params);
} }
@@ -353,7 +354,7 @@ public class FlowTeamMemberStatisticsService {
billRecord.setCurrency(CurrencyEnum.DIAMOND.getValue()); billRecord.setCurrency(CurrencyEnum.DIAMOND.getValue());
BigDecimal amount = new BigDecimal(giftSendRecord.getTotalGoldNum()); BigDecimal amount = new BigDecimal(giftSendRecord.getTotalGoldNum());
billRecord.setAmount(amount); billRecord.setAmount(amount);
billRecord.setActualAmount(amount.multiply(new BigDecimal(String.valueOf(CurrencyEnum.DIAMOND.getExchangeRate())))); billRecord.setActualAmount(amount.divide(Constant.HUNDRED, 2, RoundingMode.HALF_UP));
billRecord.setCreateTime(giftSendRecord.getCreateTime()); billRecord.setCreateTime(giftSendRecord.getCreateTime());
billList.add(billRecord); billList.add(billRecord);
} }

22
accompany-admin/accompany-flow-team-admin-service/src/main/resources/mapper/FlowTeamMemberStatisticsMapper.xml
View File

@@ -263,7 +263,8 @@
</select> </select>
<select id="listUserChargeDetailsV2" resultType="com.accompany.flowteam.admin.vo.UserChargeDetailVO"> <select id="listUserChargeDetailsV2" resultType="com.accompany.flowteam.admin.vo.UserChargeDetailVO">
select u.erban_no userErbanNo, u.nick userNick, cr.create_time chargeTime, cr.channel, cr.amount/100 amount, cr.total_gold totalGold from charge_record cr, users u select u.erban_no userErbanNo, u.nick userNick, cr.create_time chargeTime, cr.channel,
cr.amount/100 amount, cr.total_gold totalGold from charge_record cr, users u
where u.uid = cr.uid where u.uid = cr.uid
and cr.charge_status = 2 and cr.charge_status = 2
and cr.charge_prod_id &lt;&gt; 'exchange' and cr.charge_prod_id &lt;&gt; 'exchange'
@@ -285,7 +286,6 @@
sum(charge_count) chargeCount, sum(total_charge) chargeMoney, sum(charge_count) chargeCount, sum(total_charge) chargeMoney,
sum(total_send_gift) sendGiftMony from ( sum(total_send_gift) sendGiftMony from (
select date(u.create_time) dataDate, select date(u.create_time) dataDate,
count(distinct u.uid) total_user, count(distinct u.uid) total_user,
0 charge_user, 0 charge_user,
0 charge_count, 0 charge_count,
@@ -346,10 +346,7 @@
0 charge_user, 0 charge_user,
0 charge_count, 0 charge_count,
0 total_charge, 0 total_charge,
sum(case sum(case when gsr.total_gold_num is not null then gsr.total_gold_num else 0 end) total_send_gift
when gsr.total_gold_num is not null
then gsr.total_gold_num
else 0 end) / 10 total_send_gift
from flow_team_member_invite_user u, gift_send_record gsr from flow_team_member_invite_user u, gift_send_record gsr
where u.uid = gsr.uid and gsr.create_time >= u.create_time where u.uid = gsr.uid and gsr.create_time >= u.create_time
<if test="startDate != null "> <if test="startDate != null ">
@@ -442,14 +439,9 @@
0 charge_count, 0 charge_count,
0 total_charge, 0 total_charge,
null first_charge_time, null first_charge_time,
sum(case when gsr.total_gold_num is not null then gsr.total_gold_num else 0 end) / sum(case when gsr.total_gold_num is not null then gsr.total_gold_num else 0 end) total_send_gift,
10 total_send_gift, sum(case when gsr.gift_source = 1 and gsr.total_gold_num is not null then gsr.total_gold_num else 0 end) total_no_backbag_send_gift,
sum(case sum(case when gsr.gift_source = 2 and gsr.total_gold_num is not null then gsr.total_gold_num else 0 end) total_backbag_send_gift
when gsr.gift_source = 1 and gsr.total_gold_num is not null then gsr.total_gold_num
else 0 end) / 10 total_no_backbag_send_gift,
sum(case
when gsr.gift_source = 2 and gsr.total_gold_num is not null then gsr.total_gold_num
else 0 end) / 10 total_backbag_send_gift
from flow_team_member_invite_user fu from flow_team_member_invite_user fu
left join users u on u.uid = fu.uid left join users u on u.uid = fu.uid
left join flow_team_member tm on fu.member_id = tm.member_id left join flow_team_member tm on fu.member_id = tm.member_id
@@ -501,7 +493,7 @@
b.team_name teamName, b.team_name teamName,
b.member_name memberName, b.member_name memberName,
b.amount chargeAmount, b.amount chargeAmount,
ifnull(sum(gr.total_gold_num / 10), 0) sendGiftAmount from ( ifnull(sum(gr.total_gold_num), 0) sendGiftAmount from (
select a.*, ifnull(sum(cr.amount / 100), 0) amount select a.*, ifnull(sum(cr.amount / 100), 0) amount
from ( from (
select u.uid, select u.uid,

50
accompany-admin/accompany-flow-team-admin-web/src/main/java/com/accompany/flowteam/admin/controller/member/FlowTeamLeaderController.java
View File

@@ -82,8 +82,7 @@ public class FlowTeamLeaderController extends BaseController {
params.setChargeStartTime(chargeStartTime); params.setChargeStartTime(chargeStartTime);
params.setChargeEndTime(chargeEndTime); params.setChargeEndTime(chargeEndTime);
params.setTeamId(teamId); params.setTeamId(teamId);
List<MemberStatisticDetailVO> memberStatisticDetailVOS = flowTeamMemberStatisticsService.listFlowTeamMemberStatisticDetails(params); return flowTeamMemberStatisticsService.listFlowTeamMemberStatisticDetails(params);
return memberStatisticDetailVOS;
} }
@ApiOperation("获取指定团队的团队小组指定时间的邀请明细数据") @ApiOperation("获取指定团队的团队小组指定时间的邀请明细数据")
@@ -92,9 +91,7 @@ public class FlowTeamLeaderController extends BaseController {
FlowTeamMemberStatisticParams params = buildUserStatisticParams(teamId, dateTime); FlowTeamMemberStatisticParams params = buildUserStatisticParams(teamId, dateTime);
params.setChargeStartTime(chargeStartTime); params.setChargeStartTime(chargeStartTime);
params.setChargeEndTime(chargeEndTime); params.setChargeEndTime(chargeEndTime);
List<FlowTeamStatisticUserDetailVO> summaryVOS = flowTeamMemberStatisticsService.listUserStatisticDetails(params); return flowTeamMemberStatisticsService.listUserStatisticDetails(params);
return summaryVOS;
} }
@NotNull @NotNull
@@ -138,7 +135,7 @@ public class FlowTeamLeaderController extends BaseController {
String[] headers = {"邀请码", "被邀请用户id", "被邀请用户昵称", String[] headers = {"邀请码", "被邀请用户id", "被邀请用户昵称",
// "被邀请用户注册ip", // "被邀请用户注册ip",
"引入人", "新增日期", "充值次数", "充值金额", "送礼金额", "引入人", "新增日期", "充值次数", "充值金额（美元）", "送礼钻石数",
// "送礼背包金额", "送礼非背包金额" // "送礼背包金额", "送礼非背包金额"
}; };
HSSFRow header = sheet.createRow(0); HSSFRow header = sheet.createRow(0);
@@ -178,9 +175,7 @@ public class FlowTeamLeaderController extends BaseController {
@GetMapping("/listUserChargeDetailsInTeam") @GetMapping("/listUserChargeDetailsInTeam")
public UserDataPageVO<UserChargeDetailVO> listUserChargeDetailsInTeam(String teamId, Long userErbanNo, Integer pageNumber, Integer pageSize, String chargeStartTime, String chargeEndTime) { public UserDataPageVO<UserChargeDetailVO> listUserChargeDetailsInTeam(String teamId, Long userErbanNo, Integer pageNumber, Integer pageSize, String chargeStartTime, String chargeEndTime) {
List<Long> memberIds = flowTeamLeaderService.listTeamMemberAsLeader(Arrays.asList(teamId)); List<Long> memberIds = flowTeamLeaderService.listTeamMemberAsLeader(Arrays.asList(teamId));
UserDataPageVO<UserChargeDetailVO> detailPage = flowTeamMemberStatisticsService.listUserChargeDetailsV2(memberIds, userErbanNo, pageNumber, pageSize, chargeStartTime, chargeEndTime); return flowTeamMemberStatisticsService.listUserChargeDetailsV2(memberIds, userErbanNo, pageNumber, pageSize, chargeStartTime, chargeEndTime);
return detailPage;
} }
@GetMapping("/listUserChargeDetails") @GetMapping("/listUserChargeDetails")
@@ -241,7 +236,7 @@ public class FlowTeamLeaderController extends BaseController {
HSSFWorkbook workbook = new HSSFWorkbook(); HSSFWorkbook workbook = new HSSFWorkbook();
HSSFSheet sheet = workbook.createSheet("充值明细"); HSSFSheet sheet = workbook.createSheet("充值明细");
String[] headers = {"被邀请用户id", "被邀请用户昵称","充值时间", "充值类型", "充值金额", "钻石"}; String[] headers = {"被邀请用户id", "被邀请用户昵称","充值时间", "充值类型", "充值金额（美元）", "钻石"};
HSSFRow header = sheet.createRow(0); HSSFRow header = sheet.createRow(0);
for (int i = 0; i < headers.length; i++) { for (int i = 0; i < headers.length; i++) {
header.createCell(i).setCellValue(headers[i]); header.createCell(i).setCellValue(headers[i]);
@@ -269,8 +264,7 @@ public class FlowTeamLeaderController extends BaseController {
@GetMapping("/listUserBillDetailsInTeam") @GetMapping("/listUserBillDetailsInTeam")
public UserDataPageVO<BillRecordVo> listUserBillDetailsInTeam(String teamId, Long userErbanNo, Integer pageNumber, Integer pageSize) { public UserDataPageVO<BillRecordVo> listUserBillDetailsInTeam(String teamId, Long userErbanNo, Integer pageNumber, Integer pageSize) {
List<Long> memberIds = flowTeamLeaderService.listTeamMemberAsLeader(Arrays.asList(teamId)); List<Long> memberIds = flowTeamLeaderService.listTeamMemberAsLeader(Arrays.asList(teamId));
UserDataPageVO<BillRecordVo> detailPage = flowTeamMemberStatisticsService.listUserSendGiftBillDetail(memberIds, userErbanNo, pageNumber, pageSize); return flowTeamMemberStatisticsService.listUserSendGiftBillDetail(memberIds, userErbanNo, pageNumber, pageSize);
return detailPage;
} }
@GetMapping("/listUserBillDetails") @GetMapping("/listUserBillDetails")
@@ -280,8 +274,7 @@ public class FlowTeamLeaderController extends BaseController {
List<String> teamIds = teams.stream().map(it -> it.getTeamId()).collect(Collectors.toList()); List<String> teamIds = teams.stream().map(it -> it.getTeamId()).collect(Collectors.toList());
List<Long> memberIds = flowTeamLeaderService.listTeamMemberAsLeader(teamIds); List<Long> memberIds = flowTeamLeaderService.listTeamMemberAsLeader(teamIds);
flowTeamLeaderService.checkCanQuery(teamIds, userErbanNo); flowTeamLeaderService.checkCanQuery(teamIds, userErbanNo);
UserDataPageVO<BillRecordVo> detailPage = flowTeamMemberStatisticsService.listUserSendGiftBillDetail(memberIds, userErbanNo, pageNumber, pageSize); return flowTeamMemberStatisticsService.listUserSendGiftBillDetail(memberIds, userErbanNo, pageNumber, pageSize);
return detailPage;
} }
@@ -332,7 +325,7 @@ public class FlowTeamLeaderController extends BaseController {
HSSFWorkbook workbook = new HSSFWorkbook(); HSSFWorkbook workbook = new HSSFWorkbook();
HSSFSheet sheet = workbook.createSheet("消费明细"); HSSFSheet sheet = workbook.createSheet("消费明细");
String[] headers = {"被邀请用户昵称", "被邀请用户id","消费时间", "消费类型", "消费对象id", "消费对象昵称", "消费房间", "消费房间id", "礼物名称", "礼物数量", "消费金额（元）"}; String[] headers = {"被邀请用户昵称", "被邀请用户id","消费时间", "消费类型", "消费对象id", "消费对象昵称", "消费房间", "消费房间id", "礼物名称", "礼物数量", "消费金额（美元）"};
HSSFRow header = sheet.createRow(0); HSSFRow header = sheet.createRow(0);
for (int i = 0; i < headers.length; i++) { for (int i = 0; i < headers.length; i++) {
header.createCell(i).setCellValue(headers[i]); header.createCell(i).setCellValue(headers[i]);
@@ -376,8 +369,7 @@ public class FlowTeamLeaderController extends BaseController {
params.setEndDate(endDate); params.setEndDate(endDate);
params.setChargeStartTime(chargeStartTime); params.setChargeStartTime(chargeStartTime);
params.setChargeEndTime(chargeEndTime); params.setChargeEndTime(chargeEndTime);
List<FlowTeamStatisticDetailVO> summaryVOS = flowTeamMemberStatisticsService.listFlowTeamStatisticDetails(params); return flowTeamMemberStatisticsService.listFlowTeamStatisticDetails(params);
return summaryVOS;
} }
@RequestMapping(value = "/exportTeamStatisticDetails", method = RequestMethod.GET) @RequestMapping(value = "/exportTeamStatisticDetails", method = RequestMethod.GET)
@@ -402,8 +394,8 @@ public class FlowTeamLeaderController extends BaseController {
HSSFWorkbook workbook = new HSSFWorkbook(); HSSFWorkbook workbook = new HSSFWorkbook();
HSSFSheet sheet = workbook.createSheet("邀请明细"); HSSFSheet sheet = workbook.createSheet("邀请明细");
String[] headers = {"成员名", "使用邀请码", "邀请新用户", "充值人数", "付费转化", "充值次数", "充值金额", String[] headers = {"成员名", "使用邀请码", "邀请新用户", "充值人数", "付费转化", "充值次数", "充值金额（美元）",
"送礼金额", "Arpu"}; "送礼钻石数", "Arpu"};
HSSFRow header = sheet.createRow(0); HSSFRow header = sheet.createRow(0);
for (int i = 0; i < headers.length; i++) { for (int i = 0; i < headers.length; i++) {
header.createCell(i).setCellValue(headers[i]); header.createCell(i).setCellValue(headers[i]);
@@ -495,15 +487,12 @@ public class FlowTeamLeaderController extends BaseController {
@PostMapping("/listStatisticSummary") @PostMapping("/listStatisticSummary")
public List<FlowTeamStatisticSummaryVO> listStatisticSummary(@RequestBody FlowTeamStatisticParams params) { public List<FlowTeamStatisticSummaryVO> listStatisticSummary(@RequestBody FlowTeamStatisticParams params) {
List<FlowTeamStatisticSummaryVO> summaryVOS = flowTeamService.listStatisticSummary(params); return flowTeamService.listStatisticSummary(params);
return summaryVOS;
} }
@GetMapping("/listFlowTeamStatisticDetailsOfTeam") @GetMapping("/listFlowTeamStatisticDetailsOfTeam")
public List<FlowTeamStatisticDetailVO> listFlowTeamStatisticDetailsOfTeam(FlowTeamStatisticParams params) { public List<FlowTeamStatisticDetailVO> listFlowTeamStatisticDetailsOfTeam(FlowTeamStatisticParams params) {
List<FlowTeamStatisticDetailVO> summaryVOS = flowTeamService.listFlowTeamStatisticDetails(params); return flowTeamService.listFlowTeamStatisticDetails(params);
return summaryVOS;
} }
@RequestMapping(value = "/exportuserStatisticDetailOfTeam", method = RequestMethod.GET) @RequestMapping(value = "/exportuserStatisticDetailOfTeam", method = RequestMethod.GET)
@@ -530,7 +519,7 @@ public class FlowTeamLeaderController extends BaseController {
String[] headers = {"邀请码","被邀请用户id", "被邀请用户昵称", String[] headers = {"邀请码","被邀请用户id", "被邀请用户昵称",
// "被邀请用户注册ip", // "被邀请用户注册ip",
"引入组", "引入人", "新增日期", "充值次数", "充值金额", "送礼金额" "引入组", "引入人", "新增日期", "充值次数", "充值金额（美元）", "送礼钻石数"
// , "送礼背包金额", "送礼非背包金额" // , "送礼背包金额", "送礼非背包金额"
}; };
HSSFRow header = sheet.createRow(0); HSSFRow header = sheet.createRow(0);
@@ -570,10 +559,9 @@ public class FlowTeamLeaderController extends BaseController {
} }
@GetMapping("/listUserStatisticDetailsOfTeam") @GetMapping("/listUserStatisticDetailsOfTeam")
public List<FlowTeamStatisticUserDetailVO> listUserStatisticDetailsOfTeam(FlowTeamStatisticParams params) { public List<FlowTeamStatisticUserDetailVO>
List<FlowTeamStatisticUserDetailVO> summaryVOS = flowTeamService.listUserStatisticDetails(params); listUserStatisticDetailsOfTeam(FlowTeamStatisticParams params) {
return flowTeamService.listUserStatisticDetails(params);
return summaryVOS;
} }
@RequestMapping(value = "/exportTeamStatisticDetailsForGroup", method = RequestMethod.GET) @RequestMapping(value = "/exportTeamStatisticDetailsForGroup", method = RequestMethod.GET)
@@ -598,7 +586,7 @@ public class FlowTeamLeaderController extends BaseController {
HSSFWorkbook workbook = new HSSFWorkbook(); HSSFWorkbook workbook = new HSSFWorkbook();
HSSFSheet sheet = workbook.createSheet("邀请明细"); HSSFSheet sheet = workbook.createSheet("邀请明细");
String[] headers = {"成员名", "职务", "成员状态", "新增用户", "新增充值", "付费转化", "充值次数", "充值金额", String[] headers = {"成员名", "职务", "成员状态", "新增用户", "新增充值", "付费转化", "充值次数", "充值金额（美元）",
"送礼金额", "Arpu"}; "送礼金额", "Arpu"};
HSSFRow header = sheet.createRow(0); HSSFRow header = sheet.createRow(0);
for (int i = 0; i < headers.length; i++) { for (int i = 0; i < headers.length; i++) {
@@ -651,7 +639,7 @@ public class FlowTeamLeaderController extends BaseController {
String[] headers = {"邀请码", "被邀请用户id", "被邀请用户昵称", String[] headers = {"邀请码", "被邀请用户id", "被邀请用户昵称",
// "被邀请用户注册ip", // "被邀请用户注册ip",
"引入人", "新增日期", "充值次数", "充值金额", "送礼金额", "引入人", "新增日期", "充值次数", "充值金额（美元）", "送礼钻石数",
// "送礼背包金额", "送礼非背包金额" // "送礼背包金额", "送礼非背包金额"
}; };
HSSFRow header = sheet.createRow(0); HSSFRow header = sheet.createRow(0);

7
accompany-admin/accompany-flow-team-admin-web/src/main/java/com/accompany/flowteam/admin/controller/member/FlowTeamLeaderMemberController.java
View File

@@ -57,16 +57,13 @@ public class FlowTeamLeaderMemberController extends BaseController {
params.setStartDate(startTime); params.setStartDate(startTime);
params.setEndDate(endTime); params.setEndDate(endTime);
params.setTeamId(teamId); params.setTeamId(teamId);
List<MemberStatisticDetailVO> memberStatisticDetailVOS = flowTeamMemberStatisticsService.listFlowTeamMemberStatisticDetails(params); return flowTeamMemberStatisticsService.listFlowTeamMemberStatisticDetails(params);
return memberStatisticDetailVOS;
} }
@GetMapping("/listUserStatisticDetails") @GetMapping("/listUserStatisticDetails")
public List<FlowTeamStatisticUserDetailVO> listUserStatisticDetails(String dateTime, Long memberId, String teamId) { public List<FlowTeamStatisticUserDetailVO> listUserStatisticDetails(String dateTime, Long memberId, String teamId) {
FlowTeamMemberStatisticParams params = buildUserStatisticParams(dateTime, memberId, teamId); FlowTeamMemberStatisticParams params = buildUserStatisticParams(dateTime, memberId, teamId);
List<FlowTeamStatisticUserDetailVO> summaryVOS = flowTeamMemberStatisticsService.listUserStatisticDetails(params); return flowTeamMemberStatisticsService.listUserStatisticDetails(params);
return summaryVOS;
} }
@NotNull @NotNull

8
accompany-admin/accompany-flow-team-admin-web/src/main/java/com/accompany/flowteam/admin/controller/member/FlowTeamMemberController.java
View File

@@ -115,7 +115,7 @@ public class FlowTeamMemberController extends BaseController {
String[] headers = {"邀请码", "被邀请用户id", "被邀请用户昵称", String[] headers = {"邀请码", "被邀请用户id", "被邀请用户昵称",
// "被邀请用户注册ip", // "被邀请用户注册ip",
"引入人", "新增日期", "首次充值时间", "引入人", "新增日期", "首次充值时间",
"充值次数", "充值金额", "送礼金额", "充值次数", "充值金额（美元）", "送礼钻石数",
// "送礼背包金额", "送礼非背包金额" // "送礼背包金额", "送礼非背包金额"
}; };
HSSFRow header = sheet.createRow(0); HSSFRow header = sheet.createRow(0);
@@ -214,9 +214,7 @@ public class FlowTeamMemberController extends BaseController {
@GetMapping("/listUserBillDetails") @GetMapping("/listUserBillDetails")
public UserDataPageVO<BillRecordVo> listUserBillDetails(Long userErbanNo, Integer pageNumber, Integer pageSize) { public UserDataPageVO<BillRecordVo> listUserBillDetails(Long userErbanNo, Integer pageNumber, Integer pageSize) {
List<Long> memberIds = getAdminMemberIds(); List<Long> memberIds = getAdminMemberIds();
UserDataPageVO<BillRecordVo> detailPage = flowTeamMemberStatisticsService.listUserSendGiftBillDetail(memberIds, userErbanNo, pageNumber, pageSize); return flowTeamMemberStatisticsService.listUserSendGiftBillDetail(memberIds, userErbanNo, pageNumber, pageSize);
return detailPage;
} }
@RequestMapping(value = "/exportUserBillDetails", method = RequestMethod.GET) @RequestMapping(value = "/exportUserBillDetails", method = RequestMethod.GET)
@@ -243,7 +241,7 @@ public class FlowTeamMemberController extends BaseController {
HSSFWorkbook workbook = new HSSFWorkbook(); HSSFWorkbook workbook = new HSSFWorkbook();
HSSFSheet sheet = workbook.createSheet("消费明细"); HSSFSheet sheet = workbook.createSheet("消费明细");
String[] headers = {"被邀请用户昵称", "被邀请用户id","消费时间", "消费类型", "消费对象id", "消费对象昵称", "消费房间", "消费房间id", "礼物名称", "礼物数量", "消费金额（元）"}; String[] headers = {"被邀请用户昵称", "被邀请用户id","消费时间", "消费类型", "消费对象id", "消费对象昵称", "消费房间", "消费房间id", "礼物名称", "礼物数量", "消费金额（美元）"};
HSSFRow header = sheet.createRow(0); HSSFRow header = sheet.createRow(0);
for (int i = 0; i < headers.length; i++) { for (int i = 0; i < headers.length; i++) {
header.createCell(i).setCellValue(headers[i]); header.createCell(i).setCellValue(headers[i]);

16
accompany-admin/accompany-flow-team-admin-web/src/main/resources/static/html/flowteam/leader_flow_team_statistic.html
View File

@@ -252,8 +252,8 @@
{field: 'newChargeUserCount', title: '新增充值人数', align: 'center', width: '5%', }, {field: 'newChargeUserCount', title: '新增充值人数', align: 'center', width: '5%', },
{field: 'chargeRate', title: '付费转化', align: 'center', width: '5%', }, {field: 'chargeRate', title: '付费转化', align: 'center', width: '5%', },
{field: 'chargeCount', title: '充值次数', align: 'center', width: '5%', }, {field: 'chargeCount', title: '充值次数', align: 'center', width: '5%', },
{field: 'chargeMoney', title: '充值金额', align: 'center', width: '5%', }, {field: 'chargeMoney', title: '充值金额（美元）', align: 'center', width: '5%', },
{field: 'sendGiftMony', title: '送礼金额', align: 'center', width: '5%', }, {field: 'sendGiftMony', title: '送礼钻石数', align: 'center', width: '5%', },
{field: 'arpu', title: 'Arpu', align: 'center', width: '5%', }, {field: 'arpu', title: 'Arpu', align: 'center', width: '5%', },
{ {
field: 'teamId', field: 'teamId',
@@ -391,8 +391,8 @@
{field: 'tnewChargeUserCount', title: '新增充值人数', align: 'center', width: '5%', }, {field: 'tnewChargeUserCount', title: '新增充值人数', align: 'center', width: '5%', },
{field: 'tchargeRate', title: '付费转化', align: 'center', width: '5%', }, {field: 'tchargeRate', title: '付费转化', align: 'center', width: '5%', },
{field: 'tchargeCount', title: '充值次数', align: 'center', width: '5%', }, {field: 'tchargeCount', title: '充值次数', align: 'center', width: '5%', },
{field: 'tchargeMoney', title: '充值金额', align: 'center', width: '5%', }, {field: 'tchargeMoney', title: '充值金额（美元）', align: 'center', width: '5%', },
{field: 'tsendGiftMony', title: '送礼金额', align: 'center', width: '5%', }, {field: 'tsendGiftMony', title: '送礼钻石数', align: 'center', width: '5%', },
{field: 'tarpu', title: 'Arpu', align: 'center', width: '5%', }, {field: 'tarpu', title: 'Arpu', align: 'center', width: '5%', },
], ],
height : 100, height : 100,
@@ -521,8 +521,8 @@
{field: 'newChargeUserCount', title: '新增充值', align: 'center', width: '5%', }, {field: 'newChargeUserCount', title: '新增充值', align: 'center', width: '5%', },
{field: 'chargeRate', title: '付费转化', align: 'center', width: '5%', }, {field: 'chargeRate', title: '付费转化', align: 'center', width: '5%', },
{field: 'chargeCount', title: '充值次数', align: 'center', width: '5%', }, {field: 'chargeCount', title: '充值次数', align: 'center', width: '5%', },
{field: 'chargeMoney', title: '充值金额', align: 'center', width: '5%', }, {field: 'chargeMoney', title: '充值金额（美元）', align: 'center', width: '5%', },
{field: 'sendGiftMony', title: '送礼金额', align: 'center', width: '5%', }, {field: 'sendGiftMony', title: '送礼钻石数', align: 'center', width: '5%', },
{field: 'arpu', title: 'Arpu', align: 'center', width: '5%', }, {field: 'arpu', title: 'Arpu', align: 'center', width: '5%', },
{ {
field: 'memberId', field: 'memberId',
@@ -580,8 +580,8 @@
{field: 'teamMemberName', title: '引入人', align: 'center', width: '5%'}, {field: 'teamMemberName', title: '引入人', align: 'center', width: '5%'},
{field: 'signUpTime', title: '新增日期', align: 'center', width: '5%'}, {field: 'signUpTime', title: '新增日期', align: 'center', width: '5%'},
{field: 'chargeCount', title: '充值次数', align: 'center', width: '5%'}, {field: 'chargeCount', title: '充值次数', align: 'center', width: '5%'},
{field: 'chargeMoney', title: '充值金额', align: 'center', width: '5%'}, {field: 'chargeMoney', title: '充值金额（美元）', align: 'center', width: '5%'},
{field: 'totalSendGiftMoney', title: '送礼金额', align: 'center', width: '5%'}, {field: 'totalSendGiftMoney', title: '送礼钻石数', align: 'center', width: '5%'},
// {field: 'totalBackbagSendGiftMoney', title: '送礼背包金额', align: 'center', width: '5%'}, // {field: 'totalBackbagSendGiftMoney', title: '送礼背包金额', align: 'center', width: '5%'},
// {field: 'totalNoBackbagSendGiftMoney', title: '送礼非背包金额', align: 'center', width: '5%'}, // {field: 'totalNoBackbagSendGiftMoney', title: '送礼非背包金额', align: 'center', width: '5%'},
], ],

4
accompany-admin/accompany-flow-team-admin-web/src/main/resources/static/html/flowteam/leader_member_invite_detail.html
View File

@@ -216,8 +216,8 @@
{field: 'newChargeUserCount', title: '新增充值', align: 'center', width: '5%', }, {field: 'newChargeUserCount', title: '新增充值', align: 'center', width: '5%', },
{field: 'chargeRate', title: '付费转化', align: 'center', width: '5%', }, {field: 'chargeRate', title: '付费转化', align: 'center', width: '5%', },
{field: 'chargeCount', title: '充值次数', align: 'center', width: '5%', }, {field: 'chargeCount', title: '充值次数', align: 'center', width: '5%', },
{field: 'chargeMoney', title: '充值金额', align: 'center', width: '5%', }, {field: 'chargeMoney', title: '充值金额（美元）', align: 'center', width: '5%', },
{field: 'sendGiftMony', title: '送礼金额', align: 'center', width: '5%', }, {field: 'sendGiftMony', title: '送礼钻石数', align: 'center', width: '5%', },
{field: 'arpu', title: 'Arpu', align: 'center', width: '5%', }, {field: 'arpu', title: 'Arpu', align: 'center', width: '5%', },
{ {
field: 'dataDateStr', field: 'dataDateStr',

6
accompany-admin/accompany-flow-team-admin-web/src/main/resources/static/html/flowteam/leader_settlement.html
View File

@@ -94,8 +94,8 @@
columns: [ columns: [
{field: 'month', title: '时间', align: 'center', width: '5%'}, {field: 'month', title: '时间', align: 'center', width: '5%'},
{field: 'newUserNum', title: '新增用户', align: 'center', width: '10%'}, {field: 'newUserNum', title: '新增用户', align: 'center', width: '10%'},
{field: 'newUserChargeAmount', title: '当月新增充值', align:'center', width: '10%',valign:'center'}, {field: 'newUserChargeAmount', title: '当月新增充值（美元）', align:'center', width: '10%',valign:'center'},
{field: 'totalChargeAmount', title: '累计充值', align: 'center', width: '5%', }, {field: 'totalChargeAmount', title: '累计充值（美元）', align: 'center', width: '5%', },
{field: 'totalChargeUserNum', title: '累计充值人数', align: 'center', width: '5%', }, {field: 'totalChargeUserNum', title: '累计充值人数', align: 'center', width: '5%', },
{field: 'totalChargeNum', title: '累计充值次数', align: 'center', width: '5%', }, {field: 'totalChargeNum', title: '累计充值次数', align: 'center', width: '5%', },
{ {
@@ -174,7 +174,7 @@
{field: 'inviteCode', title: '邀请码', align: 'center', width: '5%', }, {field: 'inviteCode', title: '邀请码', align: 'center', width: '5%', },
{field: 'inviteUserNick', title: '引入人', align: 'center', width: '5%', }, {field: 'inviteUserNick', title: '引入人', align: 'center', width: '5%', },
// {field: 'chargeTime', title: '充值时间', align: 'center', width: '5%', formatter: formatTime}, // {field: 'chargeTime', title: '充值时间', align: 'center', width: '5%', formatter: formatTime},
{field: 'amount', title: '充值金额', align: 'center', width: '5%', } {field: 'amount', title: '充值金额（美元）', align: 'center', width: '5%', }
], ],
undefinedText: 0, undefinedText: 0,
cache: false, cache: false,

12
accompany-admin/accompany-flow-team-admin-web/src/main/resources/static/html/flowteam/leader_team_invite_detail.html
View File

@@ -314,8 +314,8 @@
{field: 'newChargeUserCount', title: '新增充值人数', align: 'center', width: '5%', }, {field: 'newChargeUserCount', title: '新增充值人数', align: 'center', width: '5%', },
{field: 'chargeRate', title: '付费转化', align: 'center', width: '5%', }, {field: 'chargeRate', title: '付费转化', align: 'center', width: '5%', },
{field: 'chargeCount', title: '充值次数', align: 'center', width: '5%', }, {field: 'chargeCount', title: '充值次数', align: 'center', width: '5%', },
{field: 'chargeMoney', title: '充值金额', align: 'center', width: '5%', }, {field: 'chargeMoney', title: '充值金额（美元）', align: 'center', width: '5%', },
{field: 'sendGiftMony', title: '送礼金额', align: 'center', width: '5%', }, {field: 'sendGiftMony', title: '送礼钻石数', align: 'center', width: '5%', },
{field: 'arpu', title: 'Arpu', align: 'center', width: '5%', }, {field: 'arpu', title: 'Arpu', align: 'center', width: '5%', },
{ {
field: 'dataDateStr', field: 'dataDateStr',
@@ -394,8 +394,8 @@
{field: 'signUpTime', title: '新增日期', align: 'center', width: '5%'}, {field: 'signUpTime', title: '新增日期', align: 'center', width: '5%'},
{field: 'firstChargeTime', title: '首次充值时间', align: 'center', width: '5%'}, {field: 'firstChargeTime', title: '首次充值时间', align: 'center', width: '5%'},
{field: 'chargeCount', title: '充值次数', align: 'center', width: '5%'}, {field: 'chargeCount', title: '充值次数', align: 'center', width: '5%'},
{field: 'chargeMoney', title: '充值金额', align: 'center', width: '5%'}, {field: 'chargeMoney', title: '充值金额（美元）', align: 'center', width: '5%'},
{field: 'totalSendGiftMoney', title: '送礼金额', align: 'center', width: '5%'}, {field: 'totalSendGiftMoney', title: '送礼钻石数', align: 'center', width: '5%'},
// {field: 'totalBackbagSendGiftMoney', title: '送礼背包金额', align: 'center', width: '5%'}, // {field: 'totalBackbagSendGiftMoney', title: '送礼背包金额', align: 'center', width: '5%'},
// {field: 'totalNoBackbagSendGiftMoney', title: '送礼非背包金额', align: 'center', width: '5%'}, // {field: 'totalNoBackbagSendGiftMoney', title: '送礼非背包金额', align: 'center', width: '5%'},
// { // {
@@ -467,7 +467,7 @@
} }
} }
}, },
{field: 'amount', title: '充值金额', align: 'center', width: '5%'}, {field: 'amount', title: '充值金额（美元）', align: 'center', width: '5%'},
{field: 'totalGold', title: '获得钻石', align: 'center', width: '5%'}, {field: 'totalGold', title: '获得钻石', align: 'center', width: '5%'},
], ],
undefinedText: 0, undefinedText: 0,
@@ -526,7 +526,7 @@
{field:'roomErbanNo',title:'消费房间id',align:'center',valign:'middle',width:'10%'}, {field:'roomErbanNo',title:'消费房间id',align:'center',valign:'middle',width:'10%'},
{field:'giftName',title:'礼物名称',align:'center',valign:'middle',width:'5%'}, {field:'giftName',title:'礼物名称',align:'center',valign:'middle',width:'5%'},
{field:'giftNum',title:'礼物数量',align:'center',valign:'middle',width:'5%'}, {field:'giftNum',title:'礼物数量',align:'center',valign:'middle',width:'5%'},
{field:'actualAmount',title:'消费金额（元）',align:'center',valign:'middle',width:'5%'}, {field:'actualAmount',title:'消费金额（美元）',align:'center',valign:'middle',width:'5%'},
], ],
undefinedText: 0, undefinedText: 0,
cache: false, cache: false,

4
accompany-admin/accompany-flow-team-admin-web/src/main/resources/static/html/flowteam/leader_team_member_statistic.html
View File

@@ -195,8 +195,8 @@
{field: 'newChargeUserCount', title: '充值人数', align: 'center', width: '5%', }, {field: 'newChargeUserCount', title: '充值人数', align: 'center', width: '5%', },
{field: 'chargeRate', title: '付费转化', align: 'center', width: '5%', }, {field: 'chargeRate', title: '付费转化', align: 'center', width: '5%', },
{field: 'chargeCount', title: '充值次数', align: 'center', width: '5%', }, {field: 'chargeCount', title: '充值次数', align: 'center', width: '5%', },
{field: 'chargeMoney', title: '充值金额', align: 'center', width: '5%', }, {field: 'chargeMoney', title: '充值金额（美元）', align: 'center', width: '5%', },
{field: 'sendGiftMony', title: '送礼金额', align: 'center', width: '5%', }, {field: 'sendGiftMony', title: '送礼钻石数', align: 'center', width: '5%', },
{field: 'arpu', title: 'Arpu', align: 'center', width: '5%', } {field: 'arpu', title: 'Arpu', align: 'center', width: '5%', }
], ],
undefinedText: 0, undefinedText: 0,

8
accompany-admin/accompany-flow-team-admin-web/src/main/resources/static/html/flowteam/leader_user_charge_bill_detail.html
View File

@@ -125,7 +125,7 @@
} }
} }
}, },
{field: 'amount', title: '充值金额', align: 'center', width: '5%'}, {field: 'amount', title: '充值金额（美元）', align: 'center', width: '5%'},
{field: 'totalGold', title: '获得钻石', align: 'center', width: '5%'}, {field: 'totalGold', title: '获得钻石', align: 'center', width: '5%'},
], ],
undefinedText: 0, undefinedText: 0,
@@ -184,7 +184,7 @@
{field:'roomErbanNo',title:'消费房间id',align:'center',valign:'middle',width:'10%'}, {field:'roomErbanNo',title:'消费房间id',align:'center',valign:'middle',width:'10%'},
{field:'giftName',title:'礼物名称',align:'center',valign:'middle',width:'5%'}, {field:'giftName',title:'礼物名称',align:'center',valign:'middle',width:'5%'},
{field:'giftNum',title:'礼物数量',align:'center',valign:'middle',width:'5%'}, {field:'giftNum',title:'礼物数量',align:'center',valign:'middle',width:'5%'},
{field:'actualAmount',title:'消费金额（元）',align:'center',valign:'middle',width:'5%'}, {field:'actualAmount',title:'消费金额（美元）',align:'center',valign:'middle',width:'5%'},
], ],
undefinedText: 0, undefinedText: 0,
cache: false, cache: false,
@@ -228,8 +228,8 @@
{field: 'groupName', title: '邀请码所属团队', align: 'center', width: '5%',}, {field: 'groupName', title: '邀请码所属团队', align: 'center', width: '5%',},
{field: 'teamName', title: '邀请码所属小组', align: 'center', width: '5%',}, {field: 'teamName', title: '邀请码所属小组', align: 'center', width: '5%',},
{field: 'memberName', title: '邀请码所属成员', align: 'center', width: '5%',}, {field: 'memberName', title: '邀请码所属成员', align: 'center', width: '5%',},
{field: 'chargeAmount', title: '用户累计充值金额', align: 'center', width: '5%',}, {field: 'chargeAmount', title: '用户累计充值金额（美元）', align: 'center', width: '5%',},
{field: 'sendGiftAmount', title: '用户累计消费金额', align: 'center', width: '5%'}, {field: 'sendGiftAmount', title: '用户累计消费钻石数', align: 'center', width: '5%'},
], ],
undefinedText: 0, undefinedText: 0,
cache: false, cache: false,

12
accompany-admin/accompany-flow-team-admin-web/src/main/resources/static/html/flowteam/member_invite_detail.html
View File

@@ -182,8 +182,8 @@
{field: 'newChargeUserCount', title: '新增充值', align: 'center', width: '5%', }, {field: 'newChargeUserCount', title: '新增充值', align: 'center', width: '5%', },
{field: 'chargeRate', title: '付费转化', align: 'center', width: '5%', }, {field: 'chargeRate', title: '付费转化', align: 'center', width: '5%', },
{field: 'chargeCount', title: '充值次数', align: 'center', width: '5%', }, {field: 'chargeCount', title: '充值次数', align: 'center', width: '5%', },
{field: 'chargeMoney', title: '充值金额', align: 'center', width: '5%', }, {field: 'chargeMoney', title: '充值金额（美元）', align: 'center', width: '5%', },
{field: 'sendGiftMony', title: '送礼金额', align: 'center', width: '5%', }, {field: 'sendGiftMony', title: '送礼钻石数', align: 'center', width: '5%', },
{field: 'arpu', title: 'Arpu', align: 'center', width: '5%', }, {field: 'arpu', title: 'Arpu', align: 'center', width: '5%', },
{ {
field: 'dataDateStr', field: 'dataDateStr',
@@ -245,8 +245,8 @@
{field: 'signUpTime', title: '新增日期', align: 'center', width: '5%'}, {field: 'signUpTime', title: '新增日期', align: 'center', width: '5%'},
{field: 'firstChargeTime', title: '首次充值时间', align: 'center', width: '5%'}, {field: 'firstChargeTime', title: '首次充值时间', align: 'center', width: '5%'},
{field: 'chargeCount', title: '充值次数', align: 'center', width: '5%'}, {field: 'chargeCount', title: '充值次数', align: 'center', width: '5%'},
{field: 'chargeMoney', title: '充值金额', align: 'center', width: '5%'}, {field: 'chargeMoney', title: '充值金额（美元）', align: 'center', width: '5%'},
{field: 'totalSendGiftMoney', title: '送礼金额', align: 'center', width: '5%'}, {field: 'totalSendGiftMoney', title: '送礼钻石数', align: 'center', width: '5%'},
// {field: 'totalBackbagSendGiftMoney', title: '送礼背包金额', align: 'center', width: '5%'}, // {field: 'totalBackbagSendGiftMoney', title: '送礼背包金额', align: 'center', width: '5%'},
// {field: 'totalNoBackbagSendGiftMoney', title: '送礼非背包金额', align: 'center', width: '5%'}, // {field: 'totalNoBackbagSendGiftMoney', title: '送礼非背包金额', align: 'center', width: '5%'},
// { // {
@@ -309,7 +309,7 @@
} }
} }
}, },
{field: 'amount', title: '充值金额', align: 'center', width: '5%'}, {field: 'amount', title: '充值金额（美元）', align: 'center', width: '5%'},
{field: 'totalGold', title: '获得钻石', align: 'center', width: '5%'}, {field: 'totalGold', title: '获得钻石', align: 'center', width: '5%'},
], ],
undefinedText: 0, undefinedText: 0,
@@ -365,7 +365,7 @@
{field:'roomErbanNo',title:'消费房间id',align:'center',valign:'middle',width:'10%'}, {field:'roomErbanNo',title:'消费房间id',align:'center',valign:'middle',width:'10%'},
{field:'giftName',title:'礼物名称',align:'center',valign:'middle',width:'5%'}, {field:'giftName',title:'礼物名称',align:'center',valign:'middle',width:'5%'},
{field:'giftNum',title:'礼物数量',align:'center',valign:'middle',width:'5%'}, {field:'giftNum',title:'礼物数量',align:'center',valign:'middle',width:'5%'},
{field:'actualAmount',title:'消费金额（元）',align:'center',valign:'middle',width:'5%'}, {field:'actualAmount',title:'消费金额（美元）',align:'center',valign:'middle',width:'5%'},
], ],
undefinedText: 0, undefinedText: 0,
cache: false, cache: false,

8
accompany-admin/accompany-flow-team-admin-web/src/main/resources/static/html/flowteam/user_charge_bill_detail.html
View File

@@ -126,7 +126,7 @@
} }
} }
}, },
{field: 'amount', title: '充值金额', align: 'center', width: '5%'}, {field: 'amount', title: '充值金额（美元）', align: 'center', width: '5%'},
{field: 'totalGold', title: '获得钻石', align: 'center', width: '5%'}, {field: 'totalGold', title: '获得钻石', align: 'center', width: '5%'},
], ],
undefinedText: 0, undefinedText: 0,
@@ -185,7 +185,7 @@
{field:'roomErbanNo',title:'消费房间id',align:'center',valign:'middle',width:'10%'}, {field:'roomErbanNo',title:'消费房间id',align:'center',valign:'middle',width:'10%'},
{field:'giftName',title:'礼物名称',align:'center',valign:'middle',width:'5%'}, {field:'giftName',title:'礼物名称',align:'center',valign:'middle',width:'5%'},
{field:'giftNum',title:'礼物数量',align:'center',valign:'middle',width:'5%'}, {field:'giftNum',title:'礼物数量',align:'center',valign:'middle',width:'5%'},
{field:'actualAmount',title:'消费金额（元）',align:'center',valign:'middle',width:'5%'}, {field:'actualAmount',title:'消费金额（美元）',align:'center',valign:'middle',width:'5%'},
], ],
undefinedText: 0, undefinedText: 0,
cache: false, cache: false,
@@ -230,8 +230,8 @@
{field: 'groupName', title: '邀请码所属团队', align: 'center', width: '5%',}, {field: 'groupName', title: '邀请码所属团队', align: 'center', width: '5%',},
{field: 'teamName', title: '邀请码所属小组', align: 'center', width: '5%',}, {field: 'teamName', title: '邀请码所属小组', align: 'center', width: '5%',},
{field: 'memberName', title: '邀请码所属成员', align: 'center', width: '5%',}, {field: 'memberName', title: '邀请码所属成员', align: 'center', width: '5%',},
{field: 'chargeAmount', title: '用户累计充值金额', align: 'center', width: '5%',}, {field: 'chargeAmount', title: '用户累计充值金额（美元）', align: 'center', width: '5%',},
{field: 'sendGiftAmount', title: '用户累计消费金额', align: 'center', width: '5%'}, {field: 'sendGiftAmount', title: '用户累计消费钻石数', align: 'center', width: '5%'},
], ],
undefinedText: 0, undefinedText: 0,
cache: false, cache: false,