From 8c93d2e3b22ac543f8f94c2cf0eb982258fb708b Mon Sep 17 00:00:00 2001 From: yujian <yujian@163.com> Date: 星期六, 07 十二月 2019 15:33:00 +0800 Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div --- fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralExchangeServiceImpl.java | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralExchangeServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralExchangeServiceImpl.java index 863ed09..29e74da 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralExchangeServiceImpl.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralExchangeServiceImpl.java @@ -266,9 +266,7 @@ exchange.setNeedJump(true); exchange.setBtnName("鍘绘煡鐪�"); } else if (ExchangeTypeEnum.taoLiJin == type) { - thing = "鎺ㄥ箍绾㈠寘"; - thingNum = exchange.getAmount() + "鍏�"; - userTaoLiJinOriginService.exchangeMoney(uid, exchange.getAmount()); + throw new IntegralExchangeException(1, "鎺ㄥ箍绾㈠寘鐩稿叧鍔熻兘宸蹭笅绾匡紒"); } else if (ExchangeTypeEnum.cash == type) { thing = "鐜伴噾绾㈠寘"; BigDecimal money = exchange.getAmount(); -- Gitblit v1.8.0