| @@ -762,17 +762,13 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { | |||||
| throw new MallinkException(ErrorCode.API_KEY_NOT_FOUND); | throw new MallinkException(ErrorCode.API_KEY_NOT_FOUND); | ||||
| } | } | ||||
| int rate = 0; | 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(EnumAppPlat.TOUTIAO.getCode().equals(couponAppInfo.getPlat())){ | ||||
| if(wxCoupon.getCategoryId() == null){ | if(wxCoupon.getCategoryId() == null){ | ||||
| throw new MallinkException(ErrorCode.COUPON_ORDER_TYPE_NOT_SUPPORTED.getCode(),"卡券信息错误"); | throw new MallinkException(ErrorCode.COUPON_ORDER_TYPE_NOT_SUPPORTED.getCode(),"卡券信息错误"); | ||||
| } | } | ||||
| TtGoodsCategory ttGoodsCategory = ttGoodsCategoryMapper.selectById(wxCoupon.getCategoryId()); | TtGoodsCategory ttGoodsCategory = ttGoodsCategoryMapper.selectById(wxCoupon.getCategoryId()); | ||||
| rate = rate+payAccount.getRealRate()-ttGoodsCategory.getServiceFee(); | |||||
| rate = rate-payAccount.getRealRate()+ttGoodsCategory.getServiceFee(); | |||||
| } | } | ||||
| if(takeRate > rate){ | if(takeRate > rate){ | ||||
| rate = takeRate - rate; | rate = takeRate - rate; | ||||