From 6da8f3bc2d31fa36791d8be863c36cd8428f2cbe Mon Sep 17 00:00:00 2001 From: hanxueda Date: Mon, 15 Apr 2019 16:42:30 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=A7=AF=E5=88=86][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=85=91=E6=8D=A2=E6=B7=BB=E5=8A=A0=E5=88=B8?= =?UTF-8?q?=E8=BF=87=E6=9C=9F=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/domain/po/WxCreditHistory.java | 13 +++++++------ .../service/impl/WxCreditHistoryServiceImpl.java | 6 +++++- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java index a587ff734..ac57606eb 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java @@ -1,13 +1,14 @@ package com.iformall.domain.po; import lombok.Data; -import javax.persistence.*; -import java.util.*; -import java.math.*; -import javax.persistence.Transient; -import java.util.List; + import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; @Table(name = "wx_credit_history") @Data @@ -60,7 +61,7 @@ public class WxCreditHistory implements Serializable { @io.swagger.annotations.ApiModelProperty(value="小票URL",name="receiptUrl") private String receiptUrl; /**操作人类型*/ - @io.swagger.annotations.ApiModelProperty(value="操作人类型",name="operatorType") + @io.swagger.annotations.ApiModelProperty(value="操作人类型 1:C端用户,2:A端会员,3:B端用户,4:A端用户",name="operatorType") private Integer operatorType; /**操作人ID*/ @io.swagger.annotations.ApiModelProperty(value="操作人ID",name="operatorId") diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java index 59e52fdd5..900578a0d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java @@ -321,9 +321,13 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { log.error("券已下架, couponId: " + couponIdStr); throw new MallinkException(ErrorCode.COUPON_IS_TAKE_OFF); } - if (coupon.getSalePrice() != 0) { + /*if (coupon.getSalePrice() != 0) { log.error("券不免费, couponId: " + couponIdStr); throw new MallinkException(ErrorCode.COUPON_IS_NOT_FREE); + }*/ + if (coupon.getValidEndDate() != null && coupon.getValidEndDate().before(new Date())) { + log.error("此券已过期, couponId: " + couponIdStr); + throw new MallinkException(ErrorCode.COUPON_IS_EXPIRED); } // 减库存操作