caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 优化会员优惠券搜索

Browse Source
This commit is contained in:
paulGao 2023-01-10 14:34:48 +08:00
parent bda297b90d
commit eefca656c6
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
framework/src/main/java/cn/lili/modules/promotion/entity/vos/MemberCouponVO.java
View File

@ -4,6 +4,7 @@ import cn.lili.common.utils.BeanUtil;
import cn.lili.modules.promotion.entity.dos.MemberCoupon; import cn.lili.modules.promotion.entity.dos.MemberCoupon;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode;
/** /**
* MemberCouponVO * MemberCouponVO
@ -12,9 +13,15 @@ import lombok.Data;
* @version v1.0 * @version v1.0
* 2021-08-24 14:30 * 2021-08-24 14:30
*/ */
@EqualsAndHashCode(callSuper = true)
@Data @Data
public class MemberCouponVO extends MemberCoupon { public class MemberCouponVO extends MemberCoupon {
private static final long serialVersionUID = -5533168813075444962L;
@ApiModelProperty(value = "优惠券名称")
private String couponName;
@ApiModelProperty(value = "无法使用原因") @ApiModelProperty(value = "无法使用原因")
private String reason; private String reason;

4
framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberCouponServiceImpl.java
View File

@ -316,10 +316,10 @@ public class MemberCouponServiceImpl extends ServiceImpl<MemberCouponMapper, Mem
queryWrapper.eq(CharSequenceUtil.isNotEmpty(param.getCouponType()), "mc.coupon_type", param.getCouponType()); queryWrapper.eq(CharSequenceUtil.isNotEmpty(param.getCouponType()), "mc.coupon_type", param.getCouponType());
queryWrapper.eq(CharSequenceUtil.isNotEmpty(param.getMemberCouponStatus()), "mc.member_coupon_status", param.getMemberCouponStatus()); queryWrapper.eq(CharSequenceUtil.isNotEmpty(param.getMemberCouponStatus()), "mc.member_coupon_status", param.getMemberCouponStatus());
if (param.getStartTime() != null) { if (param.getStartTime() != null) {
queryWrapper.ge("start_time", new Date(param.getStartTime())); queryWrapper.ge("mc.start_time", new Date(param.getStartTime()));
} }
if (param.getEndTime() != null) { if (param.getEndTime() != null) {
queryWrapper.le("end_time", new Date(param.getEndTime())); queryWrapper.le("mc.end_time", new Date(param.getEndTime()));
} }
return this.baseMapper.getMemberCoupons(page, queryWrapper); return this.baseMapper.getMemberCoupons(page, queryWrapper);
} }