diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtPoiPlanController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtPoiPlanController.java index 3d7165a17..f99ae933b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtPoiPlanController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtPoiPlanController.java @@ -179,7 +179,7 @@ public class TtPoiPlanController extends BaseController { if(record.getTakeRate() == null){ return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"商品的抽佣率为空"); } - if(record.getTakeRate() <= 0 || record.getTakeRate() > 2900){ + if(record.getTakeRate() < 0 || record.getTakeRate() > 2900){ return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"商品的抽佣率需在万分位0-2900之间"); } @@ -266,11 +266,18 @@ public class TtPoiPlanController extends BaseController { logger.debug("[" + getIpAddr() + "] TtMerchantPoiController::getRateScope"); String couponIdStr = (String) param.get("couponId"); + Integer planType = (Integer) param.get("planType"); if(StringUtils.isBlank(couponIdStr)){ return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"商品Id为空"); } Long couponId = Long.parseLong(couponIdStr); - return ttCouponGoodsService.getRateScope(getTenantInfo(),couponId); + + EnumCpsPlanType anEnum = EnumCpsPlanType.getEnum(planType); + if(anEnum == null){ + anEnum = EnumCpsPlanType.COMMON; + } + + return ttCouponGoodsService.getRateScope(getTenantInfo(),couponId,anEnum); } @ApiOperation("设置总分佣率") diff --git a/mallinkService/src/main/java/com/iformall/service/TtCouponGoodsService.java b/mallinkService/src/main/java/com/iformall/service/TtCouponGoodsService.java index 0dc717045..07fb6875a 100644 --- a/mallinkService/src/main/java/com/iformall/service/TtCouponGoodsService.java +++ b/mallinkService/src/main/java/com/iformall/service/TtCouponGoodsService.java @@ -61,6 +61,6 @@ public interface TtCouponGoodsService { ResultData getAll(TenantEntity tenantInfo, Long couponId); - ResultData getRateScope(TenantEntity tenantInfo, Long couponId); + ResultData getRateScope(TenantEntity tenantInfo, Long couponId,EnumCpsPlanType planType); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java index 08c349941..9fab830a6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java @@ -694,7 +694,7 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"该券未提交审核或审核未通过"); } try { - int rateMin = getRateMin(); + int rateMin = getRateMin(EnumCpsPlanType.COMMON); if(record.getTakeRate() < rateMin){ return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"分佣率低于最小值("+rateMin+")"); } @@ -746,7 +746,7 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"该券未提交审核或审核未通过"); } try { - int rateMin = getRateMin(); + int rateMin = getRateMin(EnumCpsPlanType.DIRECTIONAL); if(record.getTakeRate() < rateMin){ return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"分佣率低于最小值("+rateMin+")"); } @@ -1136,7 +1136,7 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { * @return */ @Override - public ResultData getRateScope(TenantEntity tenantInfo, Long couponId) { + public ResultData getRateScope(TenantEntity tenantInfo, Long couponId,EnumCpsPlanType planType) { WxCoupon wxCoupon = wxCouponMapper.selectById(couponId, tenantInfo.getTenantId()); if(wxCoupon == null){ return new ResultData(ErrorCode.COUPON_IS_EMPTY.getCode(),"未找到该券"); @@ -1147,7 +1147,7 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { Map map = new HashMap<>(); map.put("rateMax",getRateMax(wxCoupon)); - map.put("rateMin",getRateMin()); + map.put("rateMin",getRateMin(planType)); return new ResultData(map); } @@ -1161,7 +1161,7 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { if(ttPoiTakeRate != null){ takeRate = ttPoiTakeRate.getTakeRate(); }else{ - takeRate = getAllMax(); + return getAllMax(); } WxAppinfo couponAppInfo = wxAppinfoService.getCouponAppInfo(wxCoupon); @@ -1189,7 +1189,12 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { } } //达人分佣率最小值 - private int getRateMin(){ + private int getRateMin(EnumCpsPlanType planType){ + if(EnumCpsPlanType.COMMON.equals(planType)){ + return 100; + }else if(EnumCpsPlanType.DIRECTIONAL.equals(planType)){ + return 0; + } return 100; }