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); }