Procházet zdrojové kódy

[POS][修改]:满减券-交易核销检查金额

release_toaliyun_real
Stormeye Wu před 6 roky
rodič
revize
1b7df59d54
2 změnil soubory, kde provedl 13 přidání a 0 odebrání
  1. +12
    -0
      mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java
  2. +1
    -0
      mallinkService/src/main/java/com/iformall/common/ErrorCode.java

+ 12
- 0
mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java Zobrazit soubor

@@ -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())) {


+ 1
- 0
mallinkService/src/main/java/com/iformall/common/ErrorCode.java Zobrazit soubor

@@ -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, "卡券核销失败,请查看适用门店"),



Načítá se…
Zrušit
Uložit