From 393d296e43f0e5f11e524cab5446bcd3eee94e89 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 12 Jun 2021 17:47:38 +0800
Subject: [PATCH] 新增赠送项目是否计算消耗控制
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxUserAction.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 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 c4c6da2..97af9ae 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
@@ -4,18 +4,20 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.matrix.component.redis.RedisUserLoginUtils;
import com.matrix.component.tools.HttpCurlUtil;
-import com.matrix.component.wechat.externalInterface.weixinUtil.WeixinServiceUtil;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.tools.LogUtil;
import com.matrix.core.tools.StringUtils;
import com.matrix.core.web.BaseAction;
+import com.matrix.system.activity.dao.ActivitySignReceiveRecordDao;
import com.matrix.system.common.bean.BusParameterSettings;
import com.matrix.system.common.dao.BusParameterSettingsDao;
import com.matrix.system.common.interceptor.HostInterceptor;
import com.matrix.system.constance.Dictionary;
import com.matrix.system.fenxiao.constant.FenxiaoSettingConstant;
import com.matrix.system.fenxiao.dao.ShopSalesmanApplyDao;
+import com.matrix.system.fenxiao.dao.ShopSalesmanGradeDao;
import com.matrix.system.fenxiao.entity.ShopSalesmanApply;
+import com.matrix.system.fenxiao.entity.ShopSalesmanGrade;
import com.matrix.system.fenxiao.service.ShopSalesmanApplyService;
import com.matrix.system.hive.bean.SysVipInfo;
import com.matrix.system.hive.dao.MoneyCardUseDao;
@@ -68,8 +70,10 @@
private MoneyCardUseDao moneyCardUseDao;
@Autowired
- private WeixinServiceUtil weixinServiceUtil;
+ ShopCouponRecordDao shopCouponRecordDao;
+ @Autowired
+ ActivitySignReceiveRecordDao activitySignReceiveRecordDao;
@Value("${debug}")
private String isDebug;
@@ -142,8 +146,9 @@
return res;
}
+
@Autowired
- ShopCouponRecordDao shopCouponRecordDao;
+ ShopSalesmanGradeDao shopSalesmanGradeDao;
/**
* 查询用户信息
@@ -157,8 +162,17 @@
sysVipInfo.setBalance(moneyCardUseDao.selectVipCardTotalMoney(loginUser.getId()));
AjaxResult res = new AjaxResult();
res.putInMap("couponCount", shopCouponRecordDao.countUnuseCouponRecord(loginUser.getId()));
- res.putInMap("prizeCount",0);
+ res.putInMap("prizeCount",activitySignReceiveRecordDao.getSignAwardReceiveCount(loginUser.getId(),loginUser.getCompanyId()));
res.putInMap("userInfo", sysVipInfo);
+ //查询会员等级
+ if(sysVipInfo.getSalesmanGrade()!=null){
+ ShopSalesmanGrade shopSalesmanGrade = shopSalesmanGradeDao.selectById(sysVipInfo.getSalesmanGrade());
+ res.putInMap("vipLevel", shopSalesmanGrade.getName());
+ }else if(sysVipInfo.getVipLevel()!=null){
+ res.putInMap("vipLevel", sysVipInfo.getVipLevel().getLevelName());
+ }else{
+ res.putInMap("vipLevel", "初级会员");
+ }
res.setStatus(AjaxResult.STATUS_SUCCESS);
return res;
}
--
Gitblit v1.9.1