diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java
index 0c4d718b8..a209a94cd 100644
--- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java
+++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java
@@ -258,16 +258,28 @@ public class WxCouponOrderController extends BaseController {
}
Date now = new Date();
- if (wxCouponOrderCVo.getValidType().equals(EnumCouponValidType.BETWEEN_TWO_TIME.getCode())
- && !wxCouponOrderCVo.getType().equals(EnumCouponType.COUPON_PREORDER.getCode())) {
- if (wxCouponOrderCVo.getValidStartDate().after(now)) {
- logger.error("此券有效期未开始:" + couponOrderIdStr);
- return new ResultData(ErrorCode.COUPON_ORDER_IS_EARLIER_THAN_VALIDDATE);
- }
- if (wxCouponOrderCVo.getValidEndDate().before(now)) {
- logger.error("此券有效期已结束:" + couponOrderIdStr);
- return new ResultData(ErrorCode.COUPON_ORDER_IS_LATER_THAN_VALIDDATE);
+ if (wxCouponOrderCVo.getValidType().equals(EnumCouponValidType.BETWEEN_TWO_TIME.getCode())){
+// && !wxCouponOrderCVo.getType().equals(EnumCouponType.COUPON_PREORDER.getCode())) {
+ if(wxCouponOrderCVo.getType().equals(EnumCouponType.COUPON_PREORDER.getCode())){
+ if (wxCouponOrderCVo.getPickStartDate().after(now)) {
+ logger.error("此券有效期未开始:" + couponOrderIdStr);
+ return new ResultData(ErrorCode.COUPON_ORDER_IS_EARLIER_THAN_VALIDDATE);
+ }
+ if (wxCouponOrderCVo.getPickEndDate().before(now)) {
+ logger.error("此券有效期已结束:" + couponOrderIdStr);
+ return new ResultData(ErrorCode.COUPON_ORDER_IS_LATER_THAN_VALIDDATE);
+ }
+ }else{
+ if (wxCouponOrderCVo.getValidStartDate().after(now)) {
+ logger.error("此券有效期未开始:" + couponOrderIdStr);
+ return new ResultData(ErrorCode.COUPON_ORDER_IS_EARLIER_THAN_VALIDDATE);
+ }
+ 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);
diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml
index ab1804ee6..5a49f043f 100644
--- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml
@@ -1037,7 +1037,7 @@
co.id,co.tenant_id,co.parent_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,co.pay_vendor,
- 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
+ c.type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.tail_price,c.orig_price,c.unit,c.detail,c.remark,c.valid_type,c.valid_start_date,c.valid_end_date,c.pick_start_date,c.pick_end_date,c.auto_refund
@@ -1071,6 +1071,10 @@
+
+
+
+
@@ -1078,6 +1082,9 @@
+
+
+