From f96ad6ec73b3da7df5c08471f0d567d46fc767e8 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Fri, 09 Apr 2021 14:34:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxUserAction.java | 27 ++++++++++++++++++++++++---
1 files changed, 24 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 4ccb773..c4c6da2 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
@@ -18,10 +18,13 @@
import com.matrix.system.fenxiao.entity.ShopSalesmanApply;
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,6 +61,11 @@
@Autowired
WeChatApiTools weChatApiTools;
+ @Autowired
+ private ScoreVipDetailDao scoreVipDetailDao;
+
+ @Autowired
+ private MoneyCardUseDao moneyCardUseDao;
@Autowired
private WeixinServiceUtil weixinServiceUtil;
@@ -108,10 +116,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 +142,9 @@
return res;
}
+ @Autowired
+ ShopCouponRecordDao shopCouponRecordDao;
+
/**
* 查询用户信息
*/
@@ -141,9 +152,12 @@
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",0);
res.putInMap("userInfo", sysVipInfo);
res.setStatus(AjaxResult.STATUS_SUCCESS);
return res;
@@ -174,8 +188,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