|
|
@@ -500,9 +500,10 @@ public class StoreIncomeDetailsRecordServiceImpl extends ServiceImpl<StoreIncome
|
|
|
//当前时间-3天大于创建时间
|
|
|
wrapper.between(StoreIncomeDetailsRecord::getCreatedTime, date + " 00:00:00", date + " 23:59:59")
|
|
|
//未绑定提现记录的
|
|
|
- .isNull(StoreIncomeDetailsRecord::getCashOutId);
|
|
|
+ .isNull(StoreIncomeDetailsRecord::getCashOutId)
|
|
|
+ .eq(StoreIncomeDetailsRecord::getStoreId, storeId);
|
|
|
if(null != incomeType && 0 == incomeType){
|
|
|
- wrapper.in(StoreIncomeDetailsRecord::getIncomeType, "2","3");
|
|
|
+ wrapper.in(StoreIncomeDetailsRecord::getIncomeType, CouponTypeEnum.COUPON.getCode(),CouponTypeEnum.GROUP_BUY.getCode());
|
|
|
} else {
|
|
|
wrapper.eq(StoreIncomeDetailsRecord::getIncomeType, incomeType);
|
|
|
}
|