|
|
@@ -386,6 +386,7 @@ public class StoreIncomeDetailsRecordServiceImpl extends ServiceImpl<StoreIncome
|
|
|
*/
|
|
|
@Override
|
|
|
public Map<String, Object> accountBalance(Integer storeId) {
|
|
|
+ // TODO 可提现金额 - cashout表里的已提现和待审核的
|
|
|
Map<String, Object> map = new HashMap<>();
|
|
|
LambdaQueryWrapper<StoreUser> storeUserWrapper = new LambdaQueryWrapper<>();
|
|
|
storeUserWrapper.eq(StoreUser::getStoreId, storeId);
|
|
|
@@ -401,7 +402,7 @@ public class StoreIncomeDetailsRecordServiceImpl extends ServiceImpl<StoreIncome
|
|
|
List<StoreIncomeDetailsRecord> list = this.list(wrapper);
|
|
|
int cashOutMoney = 0;
|
|
|
cashOutMoney += list.stream().mapToInt(StoreIncomeDetailsRecord::getMoney).sum();
|
|
|
- List<StoreCashOutRecord> storeCashOutRecords = storeCashOutRecordMapper.selectList(new QueryWrapper<StoreCashOutRecord>().eq("store_id", storeId).ne("payment_status", "2").eq("delete_flag", "0"));
|
|
|
+ List<StoreCashOutRecord> storeCashOutRecords = storeCashOutRecordMapper.selectList(new QueryWrapper<StoreCashOutRecord>().eq("store_id", storeId).in("payment_status", "1","3").eq("delete_flag", "0"));
|
|
|
int totalAmount = storeCashOutRecords.stream().collect(Collectors.summingInt(StoreCashOutRecord::getMoney));
|
|
|
//可提现金额 4~27天
|
|
|
map.put("cashOutMoney", new BigDecimal(cashOutMoney).subtract(BigDecimal.valueOf(totalAmount)).divide(new BigDecimal(100), 2, RoundingMode.HALF_UP).toString());
|