From 2562e13a8db342cc1e23e17b8a26d84ce314f9eb Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 13 Aug 2021 12:04:57 +0800
Subject: [PATCH] 20210813

---
 zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxUserAction.java |   45 ++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 40 insertions(+), 5 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 4ccb773..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,24 +4,29 @@
 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;
 import com.matrix.system.hive.dao.SysVipInfoDao;
 import com.matrix.system.hive.service.SysVipInfoService;
+import com.matrix.system.score.dao.ScoreVipDetailDao;
 import com.matrix.system.shopXcx.api.WeChatApiTools;
 import com.matrix.system.shopXcx.api.dto.XcxUserSaveUserInfoDto;
+import com.matrix.system.shopXcx.dao.ShopCouponRecordDao;
 import net.sf.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -58,10 +63,17 @@
     @Autowired
     WeChatApiTools weChatApiTools;
 
+    @Autowired
+    private ScoreVipDetailDao scoreVipDetailDao;
 
     @Autowired
-    private WeixinServiceUtil weixinServiceUtil;
+    private MoneyCardUseDao moneyCardUseDao;
 
+    @Autowired
+    ShopCouponRecordDao shopCouponRecordDao;
+
+    @Autowired
+    ActivitySignReceiveRecordDao activitySignReceiveRecordDao;
     @Value("${debug}")
     private String isDebug;
 
@@ -108,10 +120,10 @@
                     sysVipInfo.setSessionKey(sessionKey);
                     sysVipInfo.setCompanyId(HostInterceptor.getCompanyId());
                     sysVipInfo.setArrivalWay("微商城");
+                    sysVipInfo.setVipName("微信用户");
                     sysVipInfo.setVipState(Dictionary.VIP_STATE_HY);
                     sysVipInfo.setVipType(Dictionary.VIP_TYPE_NOCARD);
                     sysVipInfo.setIsDeal(SysVipInfo.UNDEAL_VIP);
-
                     sysVipInfo.setVipNo(openId);
                     sysVipInfoService.add(sysVipInfo);
 
@@ -134,6 +146,10 @@
         return res;
     }
 
+
+    @Autowired
+    ShopSalesmanGradeDao shopSalesmanGradeDao;
+
     /**
      * 查询用户信息
      */
@@ -141,10 +157,22 @@
     public @ResponseBody
     AjaxResult findUserInfo() {
         SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
-        String openId = loginUser.getOpenId();
-        SysVipInfo sysVipInfo = sysVipInfoService.findByOpenId(openId);
+        SysVipInfo sysVipInfo = sysVipInfoService.findById(loginUser.getId());
+        sysVipInfo.setPointAll(scoreVipDetailDao.selectUserTotalScore(loginUser.getId()));
+        sysVipInfo.setBalance(moneyCardUseDao.selectVipCardTotalMoney(loginUser.getId()));
         AjaxResult res = new AjaxResult();
+        res.putInMap("couponCount", shopCouponRecordDao.countUnuseCouponRecord(loginUser.getId()));
+        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;
     }
@@ -174,8 +202,15 @@
         SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
         SysVipInfo sysVipInfo=new SysVipInfo();
         sysVipInfo.setId(loginUser.getId());
+
         BeanUtil.copyProperties(xcxUserSaveUserInfoDto,sysVipInfo);
         sysVipInfo.setPhone(xcxUserSaveUserInfoDto.getPhoneNumber());
+        if(StringUtils.isBlank(loginUser.getVipName())||loginUser.getVipName().equals("微信用户")){
+            sysVipInfo.setVipName(xcxUserSaveUserInfoDto.getNickName());
+        }
+        if(StringUtils.isBlank(loginUser.getSex())){
+            sysVipInfo.setSex(xcxUserSaveUserInfoDto.getGender()==1?"男":"女");
+        }
 
         int i = sysVipInfoDao.update(sysVipInfo);
 

--
Gitblit v1.9.1