|
@@ -148,11 +148,14 @@ public class AccountDubboServiceImpl implements AccountDubboService {
|
|
String rate = openRedEnvelopeRate.getData().getValueInfo();
|
|
String rate = openRedEnvelopeRate.getData().getValueInfo();
|
|
BigDecimal amount = param.getAmount().multiply(new BigDecimal(rate)).divide(BigDecimal.valueOf(100), 2, RoundingMode.DOWN);
|
|
BigDecimal amount = param.getAmount().multiply(new BigDecimal(rate)).divide(BigDecimal.valueOf(100), 2, RoundingMode.DOWN);
|
|
// 参团红包
|
|
// 参团红包
|
|
- Result result1 = redEnvelopeService.addRedEnvelope(RedEnvelopeParam.builder()
|
|
|
|
- .amount(amount).bizType(BizTypeEnum.JOIN_GROUP_RED_ENVELOPE.getKey()).orderNo(param.getBizNo())
|
|
|
|
- .userIds(param.getUserIds())
|
|
|
|
- .transTime(param.getTransTime())
|
|
|
|
- .build());
|
|
|
|
|
|
+ param.getUserIds().remove(param.getOpenGroupUserId());
|
|
|
|
+ if (CollUtil.isNotEmpty(param.getUserIds())){
|
|
|
|
+ Result result1 = redEnvelopeService.addRedEnvelope(RedEnvelopeParam.builder()
|
|
|
|
+ .amount(amount).bizType(BizTypeEnum.JOIN_GROUP_RED_ENVELOPE.getKey()).orderNo(param.getBizNo())
|
|
|
|
+ .userIds(param.getUserIds())
|
|
|
|
+ .transTime(param.getTransTime())
|
|
|
|
+ .build());
|
|
|
|
+ }
|
|
return Result.genSuccessResult();
|
|
return Result.genSuccessResult();
|
|
}
|
|
}
|
|
|
|
|
|
@@ -177,11 +180,14 @@ public class AccountDubboServiceImpl implements AccountDubboService {
|
|
BigDecimal amount = param.getAmount().multiply(new BigDecimal(rate)).divide(BigDecimal.valueOf(100), 2, RoundingMode.DOWN);
|
|
BigDecimal amount = param.getAmount().multiply(new BigDecimal(rate)).divide(BigDecimal.valueOf(100), 2, RoundingMode.DOWN);
|
|
|
|
|
|
// 参团红包
|
|
// 参团红包
|
|
- Result result1 = redEnvelopeService.addRedEnvelope(RedEnvelopeParam.builder()
|
|
|
|
- .amount(amount).bizType(BizTypeEnum.JOIN_GROUP_RED_ENVELOPE.getKey()).orderNo(param.getBizNo())
|
|
|
|
- .userIds(param.getUserIds())
|
|
|
|
- .transTime(param.getTransTime())
|
|
|
|
- .build());
|
|
|
|
|
|
+ param.getUserIds().remove(param.getOpenGroupUserId());
|
|
|
|
+ if (CollUtil.isNotEmpty(param.getUserIds())){
|
|
|
|
+ Result result1 = redEnvelopeService.addRedEnvelope(RedEnvelopeParam.builder()
|
|
|
|
+ .amount(amount).bizType(BizTypeEnum.JOIN_GROUP_RED_ENVELOPE.getKey()).orderNo(param.getBizNo())
|
|
|
|
+ .userIds(param.getUserIds())
|
|
|
|
+ .transTime(param.getTransTime())
|
|
|
|
+ .build());
|
|
|
|
+ }
|
|
return Result.genSuccessResult();
|
|
return Result.genSuccessResult();
|
|
}
|
|
}
|
|
|
|
|