From 46c4376f029affecbb61d100694e7acf782f31dc Mon Sep 17 00:00:00 2001 From: hupeng Date: Wed, 3 Jul 2019 15:55:29 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8D=A1=E5=88=B8][=E4=BF=AE=E5=A4=8D]:?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8D=A1=E5=88=B8=E4=B8=8D=E9=99=90=E5=88=B6?= =?UTF-8?q?=E9=A2=86=E5=8F=96=E7=9A=84=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/iformall/enums/EnumCouponConditionType.java | 2 +- .../iformall/service/kw/impl/KwMerchantMeterServiceImpl.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumCouponConditionType.java b/mallinkService/src/main/java/com/iformall/enums/EnumCouponConditionType.java index b460c6b2d..163eddc18 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumCouponConditionType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumCouponConditionType.java @@ -5,7 +5,7 @@ package com.iformall.enums; */ public enum EnumCouponConditionType { - // 0-可投放;1-已作废; + NO_RULES(0, "不限制"), NEW_MEMBER(1, "新会员"), SCORE_SCOPE(2, "积分值"), ; diff --git a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMerchantMeterServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMerchantMeterServiceImpl.java index e3ca53a14..d209f15c4 100644 --- a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMerchantMeterServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMerchantMeterServiceImpl.java @@ -70,7 +70,8 @@ public class KwMerchantMeterServiceImpl implements KwMerchantMeterService { public int unbindBatch(KwMerchantMeter record) { if (record == null) return 0; - if (record.getMeterId() == null && record.getMerchantId() == null) + if (record.getMeterId() == null + && record.getMerchantId() == null) return 0; return kwMerchantMeterMapper.unbindBatch(record); }