Commit 090058a2ba16bee4f9321dcf7a9839c78c4cf2a2
1 parent
c7ef8519
member: 佣金不冻结时,直接就是结算状态
Showing
1 changed file
with
5 additions
and
1 deletions
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/brokerage/record/MemberBrokerageRecordConvert.java
| ... | ... | @@ -30,6 +30,10 @@ public interface MemberBrokerageRecordConvert { |
| 30 | 30 | PageResult<MemberBrokerageRecordRespVO> convertPage(PageResult<MemberBrokerageRecordDO> page); |
| 31 | 31 | |
| 32 | 32 | default MemberBrokerageRecordDO convert(MemberUserDO user, String bizId, int brokerageFrozenDays, int brokerage, LocalDateTime unfreezeTime) { |
| 33 | + // 不冻结时,佣金直接就是结算状态 | |
| 34 | + Integer status = brokerageFrozenDays > 0 | |
| 35 | + ? BrokerageRecordStatusEnum.WAIT_SETTLEMENT.getStatus() | |
| 36 | + : BrokerageRecordStatusEnum.SETTLEMENT.getStatus(); | |
| 33 | 37 | return new MemberBrokerageRecordDO() |
| 34 | 38 | .setUserId(user.getId()) |
| 35 | 39 | .setBizType(BrokerageRecordBizTypeEnum.ORDER.getType()) |
| ... | ... | @@ -38,7 +42,7 @@ public interface MemberBrokerageRecordConvert { |
| 38 | 42 | .setTotalPrice(user.getBrokeragePrice()) |
| 39 | 43 | .setTitle(BrokerageRecordBizTypeEnum.ORDER.getTitle()) |
| 40 | 44 | .setDescription(StrUtil.format(BrokerageRecordBizTypeEnum.ORDER.getDescription(), String.valueOf(brokerage / 100.0))) |
| 41 | - .setStatus(BrokerageRecordStatusEnum.WAIT_SETTLEMENT.getStatus()) | |
| 45 | + .setStatus(status) | |
| 42 | 46 | .setFrozenDays(brokerageFrozenDays) |
| 43 | 47 | .setUnfreezeTime(unfreezeTime); |
| 44 | 48 | } | ... | ... |