he2802 4 سال پیش
والد
کامیت
54f735fc10

+ 3 - 0
zhongzheng-api/src/main/java/com/zhongzheng/controller/user/UserController.java

@@ -26,6 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
@@ -72,10 +73,12 @@ public class UserController extends BaseController {
         int collectTotal = iUserService.getCollectTotal(loginUser.getUser().getUserId());
         Integer rank = iUserService.getRank(loginUser.getUser().getUserId());
         Integer issue = iUserService.getIssue(loginUser.getUser().getUserId());
+        BigDecimal money = iUserService.getMoney(loginUser.getUser().getUserId());
         Map<String,Object> map = new HashMap<>();
         map.put("collectTotal",collectTotal);
         map.put("rank",rank);
         map.put("issue",issue);
+        map.put("money",money);
         return AjaxResult.success(map);
     }
 

+ 14 - 0
zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/UserServiceImpl.java

@@ -5,6 +5,7 @@ import cn.hutool.core.convert.Convert;
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.Page;
@@ -24,6 +25,7 @@ import com.zhongzheng.modules.collect.domain.CollectNote;
 import com.zhongzheng.modules.collect.mapper.CollectBankMapper;
 import com.zhongzheng.modules.collect.mapper.CollectCourseMapper;
 import com.zhongzheng.modules.collect.mapper.CollectNoteMapper;
+import com.zhongzheng.modules.course.domain.MajorCategory;
 import com.zhongzheng.modules.user.bo.*;
 import com.zhongzheng.modules.user.domain.User;
 import com.zhongzheng.modules.user.domain.UserBankRecord;
@@ -383,6 +385,18 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         return 0;
     }
 
+    @Override
+    public BigDecimal getMoney(Long userId) {
+        User info = getOne(new QueryWrapper<User>()
+                .select("money")
+                .eq("user_id",userId)
+                .last("limit 1"));
+        if (Validator.isNotNull(info)) {
+            return info.getMoney();
+        }
+        return null;
+    }
+
     /**
      * 获取当前月第一天
      * @param month

+ 6 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/User.java

@@ -140,4 +140,10 @@ private static final long serialVersionUID=1L;
 
     /** 邀请用户ID用户积分 */
     private String inviteUserAccount;
+
+    /** 余额 */
+    private BigDecimal money;
+
+    /** 公众号openid */
+    private String gzhOpenId;
 }

+ 3 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/IUserService.java

@@ -9,6 +9,7 @@ import com.zhongzheng.modules.user.bo.UserAddBo;
 import com.zhongzheng.modules.user.bo.UserEditBo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.math.BigDecimal;
 import java.util.Collection;
 import java.util.List;
 
@@ -64,4 +65,6 @@ public interface IUserService extends IService<User> {
 	Integer getRank(Long userId);
 
     Integer getIssue(Long userId);
+
+	BigDecimal getMoney(Long userId);
 }