|
|
@ -11,7 +11,6 @@ import com.zscat.mallplus.ums.entity.UmsMember; |
|
|
|
import com.zscat.mallplus.ums.service.IUmsMemberService; |
|
|
|
import com.zscat.mallplus.utils.CommonResult; |
|
|
|
import com.zscat.mallplus.utils.ValidatorUtils; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
import org.springframework.transaction.annotation.Transactional; |
|
|
|
|
|
|
@ -110,8 +109,7 @@ public class SmsCouponServiceImpl extends ServiceImpl<SmsCouponMapper, SmsCoupon |
|
|
|
return new ArrayList<>(); |
|
|
|
} |
|
|
|
if (ValidatorUtils.empty(useStatus)) { |
|
|
|
return couponHistoryMapper.selectList(new QueryWrapper<SmsCouponHistory>().eq("member_id", currentMember.getId()).apply("date_format (end_time,'%Y-%m-%d') <= date_format('" + new Date() + "','%Y-%m-%d')" |
|
|
|
)); |
|
|
|
return couponHistoryMapper.selectList(new QueryWrapper<SmsCouponHistory>().eq("member_id", currentMember.getId())); |
|
|
|
} |
|
|
|
return couponHistoryMapper.selectList(new QueryWrapper<SmsCouponHistory>().eq("member_id", currentMember.getId()).eq("use_status", useStatus)); |
|
|
|
} |
|
|
|