From fb0cc694abaeac222f2ef27cdbfe9761b3b04a75 Mon Sep 17 00:00:00 2001 From: hupeng Date: Fri, 21 Dec 2018 20:19:47 +0800 Subject: [PATCH] =?UTF-8?q?[A=E7=AB=AF][=E6=9B=B4=E6=94=B9]:=E6=9B=B4?= =?UTF-8?q?=E6=94=B9=E8=B4=AD=E4=B9=B0=E5=8F=91=E5=88=B8=E7=9A=84=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxCouponSendServiceImpl.java | 31 ++++++++++++++++--- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java index 71f4eb1f8..a30213834 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java @@ -1,5 +1,6 @@ package com.iformall.service.impl; +import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.IdWorker; @@ -72,13 +73,33 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { if (wxCouponSend.getSendType().equals(EnumCouponSendSendType.C_ORDER.getCode())){ WxOrder wxOrder = (WxOrder)param; - if (wxCouponSend.getCondition() == null) - return true; - if (wxOrder.getProductId().equals(Long.valueOf(wxCouponSend.getCondition()))) - return true; + + try { + JSONObject jo = JSONObject.parseObject(wxCouponSend.getCondition()); + if (wxOrder.getProductId().equals(jo.getLong("id"))) + return true; + else + return false; + } catch (Exception e) { + return false; + } + + } else if (wxCouponSend.getSendType().equals(EnumCouponSendSendType.CAR_STOP.getCode())){ + + + return true; + }else if (wxCouponSend.getSendType().equals(EnumCouponSendSendType.B_MICROPAY.getCode())){ + + + return true; + }else if (wxCouponSend.getSendType().equals(EnumCouponSendSendType.COUPON_VERIFY.getCode())){ + + + return true; + }else { return false; } - return true; + } @Override