From 1d5db24062c2f7f0fba640c277bcb5190772f46e Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 16 Sep 2022 16:27:01 +0800 Subject: [PATCH] //merchant --- .../iformall/service/impl/TtCouponGoodsServiceImpl.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) 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 bb3f3b786..13c3a21db 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java @@ -762,17 +762,13 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { throw new MallinkException(ErrorCode.API_KEY_NOT_FOUND); } int rate = 0; - if(EnumYesOrNo.YES.getCode().equals(payAccount.getIsCommission())){ - rate = payAccount.getRealRate()+payAccount.getSystemRate()+payAccount.getSellRate(); - }else{ - return getAllMax(); - } + rate = payAccount.getRealRate()+payAccount.getSystemRate()+payAccount.getSellRate(); if(EnumAppPlat.TOUTIAO.getCode().equals(couponAppInfo.getPlat())){ if(wxCoupon.getCategoryId() == null){ throw new MallinkException(ErrorCode.COUPON_ORDER_TYPE_NOT_SUPPORTED.getCode(),"卡券信息错误"); } TtGoodsCategory ttGoodsCategory = ttGoodsCategoryMapper.selectById(wxCoupon.getCategoryId()); - rate = rate+payAccount.getRealRate()-ttGoodsCategory.getServiceFee(); + rate = rate-payAccount.getRealRate()+ttGoodsCategory.getServiceFee(); } if(takeRate > rate){ rate = takeRate - rate;