From e204d3d9452508dcc8f9c6aafe7767082805298f Mon Sep 17 00:00:00 2001 From: hupeng Date: Thu, 17 Jan 2019 14:01:06 +0800 Subject: [PATCH] =?UTF-8?q?[=E9=9C=80=E6=B1=82][1000115]:=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E6=97=A0=E7=94=A8=E7=9A=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxMerchantBUserController.java | 69 +------------------ 1 file changed, 1 insertion(+), 68 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java index 6a4aab29a..1bed64d11 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java @@ -96,74 +96,7 @@ public class WxMerchantBUserController extends BaseController { return new ResultData(resultMap); } - - @GetMapping("/getUserInfo") - @ApiOperation(value="获取用户等级及在此商户的折扣率及折扣后的金额", notes="{\"id\":\"string\", \"amount\":\"string\"}") - public ResultData getDiscountRate(@RequestBody Map map) { - WxMerchantBUser bUser = getUser(); - - List levelList = wxLevelConfigService.getByTenantId(bUser.getTenantId()); - - String idStr = map.get("id"); - String amountStr = map.get("amount"); - if (StringUtils.isBlank(idStr)) { - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "id不能为空"); - } - if (StringUtils.isBlank(amountStr)) { - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "amount不能为空"); - } - Long id = Long.valueOf(idStr); - Integer amount = Integer.valueOf(amountStr) * 100; // 元->分 - - WxCUserBasicInfo userInfo = null; - WxCUser user = wxCUserService.getById(id); - if(user == null) { - userInfo = wxCUserBasicInfoService.getById(id); - } - if(user == null && userInfo == null) { - logger.error("C端用户不存在"); - return new ResultData(ErrorCode.USER_IS_EMPTY); - } - - WxCUserVo userVo = new WxCUserVo(); - if(user != null) { - org.springframework.beans.BeanUtils.copyProperties(user, userVo); - - } else if(userInfo != null) { - userVo.setId(userInfo.getId()); - userVo.setName(userInfo.getName()); - userVo.setScore(userInfo.getPoins()); - } - - - String level = WxLevelConfigService.DEFAULT_LEVEL; - Long levelId = 0L; - for(WxLevelConfig levelConfig: levelList) { - if (user.getScore() >= levelConfig.getPoints()) { - if(levelConfig.getDiscountEnable().equals(EnumLevelConfigDiscountStatus.ENABLE.getCode())) - levelId = levelConfig.getId(); - level = levelConfig.getLevel(); - } - } - - userVo.setLevelId(levelId); - userVo.setLevelName(level); - - WxLevelMerchant levelMerchant = new WxLevelMerchant(); - levelMerchant.setLevelId(levelId); - levelMerchant.setMerchantId(bUser.getMerchantId()); - List levelMerchantList = wxLevelConfigService.findListCVo(levelMerchant); - if (levelMerchantList.size() > 0) { - WxLevelMerchantCVo l = levelMerchantList.get(0); - userVo.setDiscountRate(l.getDiscount()); - userVo.setAmount(amount*l.getDiscount()/WxLevelConfigService.DEFAULT_MERCHANT_DISCOUNT); - } else { - userVo.setDiscountRate(WxLevelConfigService.DEFAULT_MERCHANT_DISCOUNT); // 折扣率为0 - userVo.setAmount(amount); - } - - return new ResultData(userVo); - } + /** * 用户登录