|
|
@@ -16,10 +16,7 @@ import com.iformall.exception.MallinkException; |
|
|
import com.iformall.mapper.*; |
|
|
import com.iformall.mapper.*; |
|
|
import com.iformall.mq.MqBaseProducer; |
|
|
import com.iformall.mq.MqBaseProducer; |
|
|
import com.iformall.service.*; |
|
|
import com.iformall.service.*; |
|
|
import com.iformall.utils.DateUtils; |
|
|
|
|
|
import com.iformall.utils.PressUtils; |
|
|
|
|
|
import com.iformall.utils.RedisLock; |
|
|
|
|
|
import com.iformall.utils.Utility; |
|
|
|
|
|
|
|
|
import com.iformall.utils.*; |
|
|
import org.slf4j.Logger; |
|
|
import org.slf4j.Logger; |
|
|
import org.slf4j.LoggerFactory; |
|
|
import org.slf4j.LoggerFactory; |
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
@@ -642,17 +639,27 @@ public class WxOrderServiceImpl implements WxOrderService { |
|
|
private WxCouponOrder createCouponOrder(WxOrder order, WxCUser user, WxCoupon coupon) { |
|
|
private WxCouponOrder createCouponOrder(WxOrder order, WxCUser user, WxCoupon coupon) { |
|
|
Date curr = new Date(); |
|
|
Date curr = new Date(); |
|
|
Date valid_date = null; |
|
|
Date valid_date = null; |
|
|
|
|
|
int limit_days = Constant.WX_LIMIT_DAYS; |
|
|
if (coupon.getValidType().equals(EnumValidStatus.VALID_RANGE.getCode()) || |
|
|
if (coupon.getValidType().equals(EnumValidStatus.VALID_RANGE.getCode()) || |
|
|
coupon.getType().equals(EnumCouponType.COUPON_TINGCHE.getCode())) { |
|
|
coupon.getType().equals(EnumCouponType.COUPON_TINGCHE.getCode())) { |
|
|
valid_date = coupon.getValidEndDate(); |
|
|
valid_date = coupon.getValidEndDate(); |
|
|
|
|
|
if (coupon.getSalePrice() > 0) { |
|
|
|
|
|
// 有价券核销有效期不能大于分账过期时间 |
|
|
|
|
|
Date limit_date = DateUtils.getTimeAfterDays(limit_days, curr); |
|
|
|
|
|
if (valid_date.after(limit_date)) { |
|
|
|
|
|
valid_date = limit_date; |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
} else { |
|
|
} else { |
|
|
Calendar calendar = Calendar.getInstance(); |
|
|
|
|
|
calendar.setTime(curr); |
|
|
|
|
|
calendar.set(Calendar.HOUR_OF_DAY, 0); |
|
|
|
|
|
calendar.set(Calendar.MINUTE, 0); |
|
|
|
|
|
calendar.set(Calendar.SECOND, 0); |
|
|
|
|
|
calendar.add(Calendar.DAY_OF_MONTH, 1 + coupon.getValidDays()); |
|
|
|
|
|
valid_date = calendar.getTime(); |
|
|
|
|
|
|
|
|
if (coupon.getSalePrice() > 0) { |
|
|
|
|
|
// 有价券核销有效期不能大于分账过期时间 |
|
|
|
|
|
if (coupon.getValidDays() < Constant.WX_LIMIT_DAYS) { |
|
|
|
|
|
limit_days = coupon.getValidDays(); |
|
|
|
|
|
} |
|
|
|
|
|
} else { |
|
|
|
|
|
limit_days = coupon.getValidDays(); |
|
|
|
|
|
} |
|
|
|
|
|
valid_date = DateUtils.getTimeAfterDays(limit_days, curr); |
|
|
} |
|
|
} |
|
|
boolean isCard = false; |
|
|
boolean isCard = false; |
|
|
// 检查是否是储值卡 |
|
|
// 检查是否是储值卡 |
|
|
|