From 0d12c639271042c37a59f5f530a479cf40b80ee7 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Mon, 24 Dec 2018 15:35:35 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8D=A1=E5=88=B8=E4=BD=9C=E5=BA=9F][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]:=E5=8D=A1=E5=88=B8=E4=BD=9C=E5=BA=9F?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxCouponServiceImpl.java | 46 ++++++++++--------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java index 17134df2f..6e0c61e6f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -101,33 +101,35 @@ public class WxCouponServiceImpl implements WxCouponService { record.setValidDays(null); } } - if(record.getType().equals(EnumCouponType.COUPON_MULTIMCH.getCode()) || - record.getType().equals(EnumCouponType.CARD_MULTIMCH.getCode())) { - Integer subsidyType = record.getSubsidyType(); - if(subsidyType == null) { - return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "请填写补贴类型"); - } - if(subsidyType.equals(EnumCouponSubsidyType.WECHAT_COUPON.getCode())) { - // 微信 立减 - if(record.getSubsidyNum() > record.getSalePrice()) { - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "补贴额大于售价"); - } - } else if(subsidyType.equals(EnumCouponSubsidyType.OFFLINE_SUBSIDY.getCode())) { - // 线下补贴 - int subsidy_num = record.getPrice() - record.getSalePrice(); - if(record.getSubsidyNum() > subsidy_num) { - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "补贴额大于面额与售价的差值"); - } - } else if(subsidyType.equals(EnumCouponSubsidyType.WECHAT_MCHPAY.getCode())) { - // TODO 微信转账到银行卡 - - } - } final IdWorker idWorker = IdWorker.get(); if (record.getId() == null) { + // check 卡券补贴设置 + if(record.getType().equals(EnumCouponType.COUPON_MULTIMCH.getCode()) || + record.getType().equals(EnumCouponType.CARD_MULTIMCH.getCode())) { + Integer subsidyType = record.getSubsidyType(); + if(subsidyType == null) { + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "请填写补贴类型"); + } + if(subsidyType.equals(EnumCouponSubsidyType.WECHAT_COUPON.getCode())) { + // 微信 立减 + if(record.getSubsidyNum() > record.getSalePrice()) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "补贴额大于售价"); + } + } else if(subsidyType.equals(EnumCouponSubsidyType.OFFLINE_SUBSIDY.getCode())) { + // 线下补贴 + int subsidy_num = record.getPrice() - record.getSalePrice(); + if(record.getSubsidyNum() > subsidy_num) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "补贴额大于面额与售价的差值"); + } + } else if(subsidyType.equals(EnumCouponSubsidyType.WECHAT_MCHPAY.getCode())) { + // TODO 微信转账到银行卡 + + } + } + record.setId(idWorker.nextId()); if (record.getMerchantParams() != null) { List merchantParamList = JSONObject.parseArray(record.getMerchantParams(), JSONObject.class);