diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java index fb9a68b46..423ad596c 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java @@ -1,15 +1,14 @@ package com.iformall.controller; import com.github.pagehelper.PageInfo; -import com.iformall.annotation.AuthIgnore; import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; -import com.iformall.domain.po.WxCUser; import com.iformall.domain.po.WxCUserBasicInfo; import com.iformall.domain.po.WxCouponOrder; import com.iformall.domain.po.WxMerchantBUser; import com.iformall.domain.vo.WxCouponOrderCVo; +import com.iformall.enums.EnumCouponValidType; import com.iformall.enums.EnumCreditLockedStatus; import com.iformall.exception.MallinkException; import com.iformall.service.WxCUserBasicInfoService; @@ -26,10 +25,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.math.BigDecimal; import java.util.Date; -import java.util.HashMap; -import java.util.List; import java.util.Map; @RestController @@ -147,16 +143,21 @@ public class WxCouponOrderController extends BaseController { return new ResultData(ErrorCode.MEMBER_IS_LOCKED); } - if (wxCouponOrderCVo.getValidStartDate() != null && wxCouponOrderCVo.getValidEndDate() != null ) { - Date now = new Date(); - if (wxCouponOrderCVo.getValidStartDate().getTime() > now.getTime()) { + Date now = new Date(); + if (wxCouponOrderCVo.getValidType().equals(EnumCouponValidType.BETWEEN_TWO_TIME.getCode())) { + if (wxCouponOrderCVo.getValidStartDate().after(now)) { logger.error("此券有效期未开始:" + couponOrderIdStr); return new ResultData(ErrorCode.COUPON_ORDER_IS_EARLIER_THAN_VALIDDATE); } - if (wxCouponOrderCVo.getValidEndDate().getTime() < now.getTime()) { + if (wxCouponOrderCVo.getValidEndDate().before(now)) { logger.error("此券有效期已结束:" + couponOrderIdStr); return new ResultData(ErrorCode.COUPON_ORDER_IS_LATER_THAN_VALIDDATE); } + } else { + if (wxCouponOrderCVo.getExpiredTime().before(now)) { + logger.error("此券已过期:" + couponOrderIdStr); + return new ResultData(ErrorCode.COUPON_IS_EXPIRED); + } } WxCouponOrder wxCouponOrder = wxCouponOrderService.getById(couponOrderId); diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java index c80a63370..b1a99a75c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java @@ -64,6 +64,8 @@ public class WxCouponOrderCVo extends WxCouponOrder { private String detail; @io.swagger.annotations.ApiModelProperty(value="购买须知",name="remark") private String remark; + @io.swagger.annotations.ApiModelProperty(value="有效时间类型1.时间范围(valid_start_date,valid_end_date). 2领取后几日有效(valid_days)",name="validType") + private Integer validType; @io.swagger.annotations.ApiModelProperty(value="有效日期-开始",name="validStartDate") private Date validStartDate; @io.swagger.annotations.ApiModelProperty(value="有效日期-结束",name="validEndDate") diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index ba6f051bc..780eba22e 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -814,13 +814,13 @@ co.id,co.tenant_id,co.coupon_id,co.coupon_type,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.verify_type, - c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.unit,c.valid_start_date,c.valid_end_date,c.auto_refund, + c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.unit,c.valid_type,c.valid_start_date,c.valid_end_date,c.auto_refund, cal.channel_type as send_channel_type co.id,co.tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.verify_type, - c.type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.unit,c.detail,c.remark,c.valid_start_date,c.valid_end_date,c.auto_refund + c.type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.unit,c.detail,c.remark,c.valid_type,c.valid_start_date,c.valid_end_date,c.auto_refund @@ -849,6 +849,7 @@ +