diff --git a/rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/model/dto/user/UserBeautifulNumberApplyDTO.java b/rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/model/dto/user/UserBeautifulNumberApplyDTO.java index 7c7c9e96..ed093a71 100644 --- a/rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/model/dto/user/UserBeautifulNumberApplyDTO.java +++ b/rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/model/dto/user/UserBeautifulNumberApplyDTO.java @@ -43,6 +43,16 @@ public class UserBeautifulNumberApplyDTO implements Serializable { */ private Integer state; + /** + * 申请的账号. + */ + private String applyAccount; + + /** + * 申请时的财富等级. + */ + private Integer wealthLevel; + /** * 创建时间. */ diff --git a/rc-service/rc-service-console/console-client/src/main/java/com/red/circle/console/app/dto/clienobject/user/UserBeautifulNumberApplyCO.java b/rc-service/rc-service-console/console-client/src/main/java/com/red/circle/console/app/dto/clienobject/user/UserBeautifulNumberApplyCO.java index d0a989e3..78da4ddc 100644 --- a/rc-service/rc-service-console/console-client/src/main/java/com/red/circle/console/app/dto/clienobject/user/UserBeautifulNumberApplyCO.java +++ b/rc-service/rc-service-console/console-client/src/main/java/com/red/circle/console/app/dto/clienobject/user/UserBeautifulNumberApplyCO.java @@ -46,6 +46,16 @@ public class UserBeautifulNumberApplyCO implements Serializable { */ private Integer state; + /** + * 申请的账号. + */ + private String applyAccount; + + /** + * 申请时的财富等级. + */ + private Integer wealthLevel; + /** * 申请人 */ diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/BdSalarySettlementServiceImpl.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/BdSalarySettlementServiceImpl.java index a9f2bd92..55bcf2ff 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/BdSalarySettlementServiceImpl.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/BdSalarySettlementServiceImpl.java @@ -69,7 +69,7 @@ public class BdSalarySettlementServiceImpl implements BdSalarySettlementService log.warn("开始处理所有 BD 工资结算,结算周期:{}", billBelong); // 查询所有 BD - List allBdTeams = businessDevelopmentTeamService.listAll(); + List allBdTeams = businessDevelopmentTeamService.listByBdUserId(1963790037740466178L); if (CollectionUtils.isEmpty(allBdTeams)) { log.warn("没有找到任何 BD 数据"); @@ -127,6 +127,8 @@ public class BdSalarySettlementServiceImpl implements BdSalarySettlementService // 6. 保存结算记录 bdSalarySettlementRecordService.create(record); + record.setSettlementSalary(new BigDecimal("1.12")); + // 7. 如果工资大于 0,则发放工资 if (record.getSettlementSalary() != null && record.getSettlementSalary().compareTo(BigDecimal.ZERO) > 0) { try {