@@ -43,7 +43,7 @@ public interface StoreIncomeDetailsRecordMapper extends BaseMapper<StoreIncomeDe
"SELECT\n" +
"\tsidr.id,sidr.updated_time,sidr.created_user_id,sidr.created_time,sidr.income_type,sidr.business_id,sidr.cash_out_id,sidr.store_id,sidr.user_order_id,sidr.delete_flag,sidr.money,sidr.commission,sidr.updated_user_id,\n" +
"\tluo.buy_time orderTime,\n" +
- "\tocm.created_time checkTime,\n" +
+ "\tsidr.created_time checkTime,\n" +
"\tADDDATE(sidr.created_time, 4) incomeTime,\n" +
"\ttc.name couponName\n" +
"FROM\n" +
@@ -549,7 +549,7 @@ public class StoreIncomeDetailsRecordServiceImpl extends ServiceImpl<StoreIncome
.orderByDesc("income.created_time");
if(null != incomeType) {
if (0 == incomeType) {
- incomeWrapper.in("income_type", "2", "3");
+ incomeWrapper.in("income_type", CouponTypeEnum.COUPON.getCode(),CouponTypeEnum.GROUP_BUY.getCode());
} else {
incomeWrapper.eq("income_type", incomeType);
}