From 1b7df59d54d39fb2038f04fd430fef30663481f7 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Sun, 11 Aug 2019 19:24:13 +0800 Subject: [PATCH] =?UTF-8?q?[POS][=E4=BF=AE=E6=94=B9]:=E6=BB=A1=E5=87=8F?= =?UTF-8?q?=E5=88=B8-=E4=BA=A4=E6=98=93=E6=A0=B8=E9=94=80=E6=A3=80?= =?UTF-8?q?=E6=9F=A5=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/PosServiceImpl.java | 12 ++++++++++++ .../src/main/java/com/iformall/common/ErrorCode.java | 1 + 2 files changed, 13 insertions(+) diff --git a/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java b/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java index 32ca6284a..588e48f5c 100644 --- a/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java +++ b/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java @@ -626,6 +626,12 @@ public class PosServiceImpl implements PosService { logger.error(ErrorCode.VERIFY_COUPON_TYPE_NOT_SUPPORT.getMessage()); throw new MallinkException(ErrorCode.VERIFY_COUPON_TYPE_NOT_SUPPORT); } + if (couponOrderCVo.getCouponType().equals(EnumCouponType.COUPON_MANJIAN)) { + if (posAmount < couponOrderCVo.getUsePrice()) { + logger.error(ErrorCode.VERIFY_MANJIAN_USER_PRICE_NOT_TOUCH.getMessage()); + throw new MallinkException(ErrorCode.VERIFY_MANJIAN_USER_PRICE_NOT_TOUCH); + } + } if (couponOrderCVo.getCouponOrderStatus().equals(EnumCouponOrderStatus.POS_PRE_VERIFY.getCode())) { logger.info("券已被预核销: " + couponOrderIdStr); if (!couponOrderCVo.getBUserId().equals(buUserId)) { @@ -694,6 +700,12 @@ public class PosServiceImpl implements PosService { logger.error(ErrorCode.VERIFY_COUPON_TYPE_NOT_SUPPORT.getMessage()); throw new MallinkException(ErrorCode.VERIFY_COUPON_TYPE_NOT_SUPPORT); } + if (couponOrderCVo.getCouponType().equals(EnumCouponType.COUPON_MANJIAN)) { + if (posAmount < couponOrderCVo.getUsePrice()) { + logger.error(ErrorCode.VERIFY_MANJIAN_USER_PRICE_NOT_TOUCH.getMessage()); + throw new MallinkException(ErrorCode.VERIFY_MANJIAN_USER_PRICE_NOT_TOUCH); + } + } } boolean blVerify = false; if (couponOrderCVo.getCouponOrderStatus().equals(EnumCouponOrderStatus.POS_PRE_VERIFY.getCode())) { diff --git a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java index 067e1e3b2..cf80ffc69 100644 --- a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java @@ -291,6 +291,7 @@ public enum ErrorCode{ VERIFY_BUSER_MERCHANT_NOT_BELONG(12055, "核销员不属于此商户"), VERIFY_POS_ORDER_NOT_EQUAL(12056, "核销POS订单不一致,请先取消上次预核销"), VERIFY_COUPON_TYPE_NOT_SUPPORT(12057, "核销不支持此券类型"), + VERIFY_MANJIAN_USER_PRICE_NOT_TOUCH(12058, "金额未达到满减券使用金额"), MSG_REPEAT_SEND(12061, "短信重复发送"), VERIFY_COUPON_ORDER_MERCHANT_IS_NULL(12062, "卡券核销失败,请查看适用门店"),