diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/bd/query/TeamBdMemberBillListQryExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/bd/query/TeamBdMemberBillListQryExe.java index ca425668..c373e9b8 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/bd/query/TeamBdMemberBillListQryExe.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/bd/query/TeamBdMemberBillListQryExe.java @@ -224,6 +224,7 @@ public class TeamBdMemberBillListQryExe { // 9. 计算当前账单的 BD Leader 工资信息(使用总的 Agent 数量) BdHistoryCO bdHistoryCO = calculateCurrentBdBill(currentBillBelong, totalAgentCount, totalSalary, totalRecharge); + bdHistoryCO.setBdNumber(bdList.size()); result.setBdHistoryCO(bdHistoryCO); return result; diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/team/TeamBdHistoryServiceImpl.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/team/TeamBdHistoryServiceImpl.java index 2dc98e6e..f81ddbeb 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/team/TeamBdHistoryServiceImpl.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/team/TeamBdHistoryServiceImpl.java @@ -322,7 +322,7 @@ public class TeamBdHistoryServiceImpl implements TeamBdHistoryService { return ""; } - int year = billBelong / 100; + int year = billBelong / 10000; int period = billBelong % 100; int month = (period + 1) / 2; diff --git a/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/team/BdHistoryCO.java b/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/team/BdHistoryCO.java index d1dfdc0b..dbe69802 100644 --- a/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/team/BdHistoryCO.java +++ b/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/team/BdHistoryCO.java @@ -31,6 +31,11 @@ public class BdHistoryCO { * Agent数量 */ private Integer agencyNumber; + + /** + * bd数量 + */ + private Integer bdNumber; /** * 团队工资(美元)