From 1443f8eb9f3b001e84f101852aa5f6ec7f49f4c9 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Fri, 09 Apr 2021 14:34:12 +0800
Subject: [PATCH] 微信储值卡充值接口

---
 zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxUserAction.java |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 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 9cac99e..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;
@@ -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;

--
Gitblit v1.9.1