|
@@ -189,7 +189,8 @@ public class IncomeManageServiceImpl extends ServiceImpl<StoreIncomeDetailsRecor
|
|
|
DateUtils.calcDays(new Date(), -27),
|
|
DateUtils.calcDays(new Date(), -27),
|
|
|
DateUtils.calcDays(new Date(), -4))
|
|
DateUtils.calcDays(new Date(), -4))
|
|
|
.isNull(StoreIncomeDetailsRecord::getCashOutId) // 未绑定提现记录
|
|
.isNull(StoreIncomeDetailsRecord::getCashOutId) // 未绑定提现记录
|
|
|
- .eq(StoreIncomeDetailsRecord::getStoreId, storeId);
|
|
|
|
|
|
|
+ .eq(StoreIncomeDetailsRecord::getStoreId, storeId)
|
|
|
|
|
+ .eq(StoreIncomeDetailsRecord::getIncomeType, CouponTypeEnum.COUPON.getCode());
|
|
|
|
|
|
|
|
List<StoreIncomeDetailsRecord> incomeList = storeIncomeDetailsRecordMapper.selectList(wrapper);
|
|
List<StoreIncomeDetailsRecord> incomeList = storeIncomeDetailsRecordMapper.selectList(wrapper);
|
|
|
|
|
|