From 058af7bd640593dce001fef08514cac978c46d31 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Fri, 21 Dec 2018 11:15:08 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=82=A8=E5=80=BC=E5=8D=A1][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9]:=E5=82=A8=E5=80=BC=E5=8D=A1=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/WxOrderServiceImpl.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java index f6e52e104..35a3fbbfa 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -523,6 +523,11 @@ public class WxOrderServiceImpl implements WxOrderService { valid_date = calendar.getTime(); } } + boolean isCard = false; + // 检查是否是储值卡 + if(coupon.getType().equals(EnumCouponType.CARD_MULTIMCH.getCode())) { + isCard = true; + } final IdWorker idWorker = IdWorker.get(); WxCouponOrder couponOrder = new WxCouponOrder(); @@ -534,7 +539,7 @@ public class WxOrderServiceImpl implements WxOrderService { couponOrder.setOwnerId(user.getId()); couponOrder.setOrderId(order.getOrderNumber()); couponOrder.setExpiredTime(valid_date); - if(!coupon.getType().equals(EnumCouponType.CARD_MULTIMCH)) { + if(!isCard) { couponOrder.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode()); } else { couponOrder.setCouponOrderStatus(EnumCouponOrderStatus.CARD_USING.getCode()); @@ -546,7 +551,7 @@ public class WxOrderServiceImpl implements WxOrderService { wxCouponOrderMapper.insertSelective(couponOrder); /// 储值卡信息添加 - if(coupon.getType().equals(EnumCouponType.CARD_MULTIMCH.getCode())) { + if(isCard) { WxPayOrder payOrder = null; try { WxPayOrder payOrderQ = new WxPayOrder();