Commit b77e9613 by box

Merge branch 'feature/box/三方券订单退款退券' into qa

parents 30dbc494 fb8afe32
...@@ -123,8 +123,8 @@ public class ThirdCouponOrderHandle { ...@@ -123,8 +123,8 @@ public class ThirdCouponOrderHandle {
if (DateUtil.addDays(redeemDate, 60).compareTo(new Date()) < 0) { if (DateUtil.addDays(redeemDate, 60).compareTo(new Date()) < 0) {
return true; return true;
} }
// 长度超过 20位,认为是加密券号(自助核销的券号是加密的) // 如果不是逗号分隔的纯数字,认为是加密券号(自助核销的券号是加密的)
if (couponDto.getCouponCodes().stream().anyMatch(code -> code.length() > 20)) { if (couponDto.getCouponCodes().stream().anyMatch(code -> !code.matches("^[0-9,]+$"))) {
if (redeemDate.getTime() + 24 * 3600_000 < System.currentTimeMillis()) { if (redeemDate.getTime() + 24 * 3600_000 < System.currentTimeMillis()) {
return true; return true;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment