From 1ceabefb451912daa5dda7768b7ef0b89a56c08a Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Fri, 25 Mar 2022 12:28:00 +0800 Subject: [PATCH] 1 --- zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxUserAction.java | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxUserAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxUserAction.java index 389abfb..8916a52 100644 --- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxUserAction.java +++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxUserAction.java @@ -1,7 +1,9 @@ package com.matrix.system.shopXcx.api.action; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.matrix.system.common.constance.AppConstance; import com.matrix.system.common.init.UserCacheManager; import com.matrix.component.tools.HttpCurlUtil; import com.matrix.core.pojo.AjaxResult; @@ -158,8 +160,17 @@ AjaxResult findUserInfo() { SysVipInfo loginUser = userCacheManager.getLoginUser(); SysVipInfo sysVipInfo = sysVipInfoService.findById(loginUser.getId()); - sysVipInfo.setPointAll(scoreVipDetailDao.selectUserTotalScore(loginUser.getId())); - sysVipInfo.setBalance(moneyCardUseDao.selectVipCardTotalMoney(loginUser.getId())); + + if (sysVipInfo != null) { + if (SysVipInfo.VALID_FLAG_Y == sysVipInfo.getValidFlag()) { + sysVipInfo.setBalance(moneyCardUseDao.selectVipCardTotalMoney(loginUser.getId())); + sysVipInfo.setPointAll(scoreVipDetailDao.selectUserTotalScore(loginUser.getId())); + } else { + sysVipInfo.setBalance(0D); + sysVipInfo.setPointAll(0); + } + } + AjaxResult res = new AjaxResult(); res.putInMap("couponCount", shopCouponRecordDao.countUnuseCouponRecord(loginUser.getId())); res.putInMap("prizeCount", activitySignReceiveRecordDao.getSignAwardReceiveCount(loginUser.getId(), loginUser.getCompanyId())); @@ -227,7 +238,7 @@ if ((loginUser.getIsSales() == null || loginUser.getIsSales() == 2) && StringUtils.isNotBlank(sysVipInfo.getNickName())) {//目前还不是分销员 BusParameterSettings fxSwith = busParameterSettingsDao.selectCompanyParamByCode(FenxiaoSettingConstant.FX_SWITCH, HostInterceptor.getCompanyId()); - if (fxSwith.getParamValue().equals("1")) {//开启分销 + if (fxSwith!=null && fxSwith.getParamValue().equals("1")) {//开启分销 BusParameterSettings applyWay = busParameterSettingsDao.selectCompanyParamByCode(FenxiaoSettingConstant.FX_APPLY_WAY, loginUser.getCompanyId()); if (applyWay.getParamValue().equals(FenxiaoSettingConstant.FX_APPLY_WAY_AUTO)) {//自动成为分销员 QueryWrapper<ShopSalesmanApply> queryWrapper = new QueryWrapper<>(); -- Gitblit v1.9.1