From d8987e42617df4c13052e67ff1bd69aec81c6d0b Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Mon, 07 Mar 2022 09:32:07 +0800
Subject: [PATCH] fix:新增税务数据库
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxUserAction.java | 16 +++++++++++++---
1 files changed, 13 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 1b3fffc..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,6 +1,7 @@
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;
@@ -94,7 +95,7 @@
AjaxResult res = new AjaxResult();
LogUtil.info("code:{}" + code);
if (StringUtils.isNotBlank(code)) {
- String requrl = weChatApiTools.getXcxLoginUrl(code, HostInterceptor.getCompanyId(), AppConstance.MINIPROGRAM_APPID);
+ String requrl = weChatApiTools.getXcxLoginUrl(code, HostInterceptor.getCompanyId());
String reslutData = HttpCurlUtil.sendGetHttp(requrl, null);
JSONObject json = JSONObject.fromObject(reslutData);
LogUtil.debug("微信登录获取到登录信息={}", json);
@@ -159,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()));
--
Gitblit v1.9.1