|
|
@@ -76,13 +76,14 @@ public class SettlementAppController extends BaseWebController {
|
|
|
groupLeaderParams.setGroupLeaderId(Integer.parseInt(TokenContext.cureMiniUser().getGroupLeaderId().toString()));
|
|
|
VaultsResponse<GroupLeaderDTO> vaultsResponse = customerFeignClient.getGroupLeaderById(groupLeaderParams);
|
|
|
GroupLeaderDTO groupLeaderDTO = vaultsResponse.getData();
|
|
|
- if(groupLeaderDTO.getRemainedAmt()<dto.getAmount()){
|
|
|
+ if(groupLeaderDTO.getRemainedAmt()>=dto.getAmount()){
|
|
|
DecimalFormat df = new DecimalFormat("#0.00");
|
|
|
return VaultsResponse.failed("留存保证金为:"+new BigDecimal(df.format(groupLeaderDTO.getRemainedAmt() / 100.0))+"元,可提现金额不足");
|
|
|
}
|
|
|
if(StringUtils.isEmpty(dto.getMerchantId())){
|
|
|
dto.setMerchantId(TokenContext.cureMiniUser().getIposMerchantId());
|
|
|
}
|
|
|
+ dto.setAmount(dto.getAmount()-groupLeaderDTO.getRemainedAmt());
|
|
|
return splitService.withdraw(dto);
|
|
|
}
|
|
|
|
qin