获取积分列表

ruoyi-framework/src/main/java/com/ruoyi/framework/recovery/domain/RecContent.java

@@ -28,13 +28,13 @@ public class RecContent extends BaseEntity
     private Long thumbs;
 
     /** 创建时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date createDate;
 
     /** 更新时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date updateDate;
 
     private String images;

ruoyi-framework/src/main/java/com/ruoyi/framework/recovery/domain/vo/CreditVo.java

@@ -0,0 +1,36 @@
+package com.ruoyi.framework.recovery.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+// 查询积分记录
+@Data
+public class CreditVo {
+    /**
+     * 用户openid
+     */
+    private String openId;
+
+    /**
+     * 积分id
+     */
+    private Long creditId;
+
+    /**
+     * 积分类型
+     */
+    private String creditType;
+
+    /**
+     * 积分数
+     */
+    private Long creditNum;
+
+    /**
+     * 产生积分时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date creditDate;
+}

ruoyi-framework/src/main/java/com/ruoyi/framework/recovery/mapper/WxCreditMapper.java

@@ -3,6 +3,7 @@ package com.ruoyi.framework.recovery.mapper;
 import java.util.Date;
 import java.util.List;
 import com.ruoyi.framework.recovery.domain.WxCredit;
+import com.ruoyi.framework.recovery.domain.vo.CreditVo;
 import org.apache.ibatis.annotations.Param;
 
 /**
@@ -79,4 +80,12 @@ public interface WxCreditMapper
      * @return 结果集
      */
     List<Long> selectWxCreditUser(@Param("openId") String wxOpenid, @Param("start") Date start, @Param("end") Date end);
+
+    /**
+     * 根据openId查询用户积分记录
+     *
+     * @param wxOpenid 用户唯一标识
+     * @return 记录
+     */
+    List<CreditVo> selectWxCreditByOpenId(@Param("openId") String wxOpenid);
 }

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/WxLoginService.java

@@ -64,7 +64,7 @@ public class WxLoginService {
         String token = wxTokenService.createAppToken(loginWxUser);
         ajax.put(Constants.TOKEN, token);
         ajax.put(Constants.OPEN_ID, String.valueOf(jsonObject.get("openid")));
-        ajax.put("id", wxUser.getId());
+        ajax.put("wxUser", wxUser);
         return ajax;
     }
 

ruoyi-system/src/main/resources/mapper/system/WxCreditMapper.xml

@@ -35,6 +35,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectWxCreditUser" resultType="java.lang.Long">
         select credit_id from wx_credit_user where open_id = #{openId} and create_date between #{start} and #{end}
     </select>
+    <select id="selectWxCreditByOpenId" resultType="com.ruoyi.framework.recovery.domain.vo.CreditVo">
+        select wcu.open_id as openId, wcu.create_date as createDate,  wcu.credit_id as creditId, wc.credit_type as creditType,
+               wc.credit_num as creditNum
+               from wx_credit_user wcu
+                   left join wx_credit wc on wc.id = wcu.credit_id
+               where wcu.open_id = #{openId}
+    </select>
 
     <insert id="insertWxCredit" parameterType="WxCredit">
         insert into wx_credit

ruoyi-wx/src/main/java/com/ruoyi/wx/web/controller/WxPersonCenterController.java

@@ -2,6 +2,7 @@ package com.ruoyi.wx.web.controller;
 
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.framework.recovery.domain.dto.UserCouponsDto;
+import com.ruoyi.framework.recovery.domain.vo.CreditVo;
 import com.ruoyi.framework.recovery.domain.vo.UserCouponsVo;
 import com.ruoyi.wx.web.domain.dto.CreditDto;
 import com.ruoyi.wx.web.service.IWxPersonCenterService;
@@ -52,6 +53,19 @@ public class WxPersonCenterController {
         }
     }
 
+    /**
+     * 新增积分
+     */
+    @GetMapping("/get/credit")
+    public AjaxResult getCredit() {
+        try {
+            List<CreditVo> creditVos = wxPersonCenterService.getCredit();
+            return AjaxResult.success(creditVos);
+        } catch (Exception e) {
+            return AjaxResult.error(e.getMessage());
+        }
+    }
+
     /**
      * 查询用户领取的优惠卷
      */

ruoyi-wx/src/main/java/com/ruoyi/wx/web/domain/dto/CreditDto.java

@@ -1,10 +1,12 @@
 package com.ruoyi.wx.web.domain.dto;
 
 import com.ruoyi.common.annotation.Excel;
+import lombok.Data;
 
 /**
  * 增加积分前端入参
  */
+@Data
 public class CreditDto {
     /**
      * 积分id
@@ -18,38 +20,4 @@ public class CreditDto {
     /** 积分数 */
     @Excel(name = "积分数")
     private Long creditNum;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getCreditType() {
-        return creditType;
-    }
-
-    public void setCreditType(String creditType) {
-        this.creditType = creditType;
-    }
-
-    public Long getCreditNum() {
-        return creditNum;
-    }
-
-    public void setCreditNum(Long creditNum) {
-        this.creditNum = creditNum;
-    }
-
-    @Override
-    public String toString() {
-        final StringBuffer sb = new StringBuffer("CreditDto{");
-        sb.append("id=").append(id);
-        sb.append(", creditType='").append(creditType).append('\'');
-        sb.append(", creditNum=").append(creditNum);
-        sb.append('}');
-        return sb.toString();
-    }
 }

ruoyi-wx/src/main/java/com/ruoyi/wx/web/service/IWxPersonCenterService.java

@@ -2,6 +2,7 @@ package com.ruoyi.wx.web.service;
 
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.framework.recovery.domain.dto.UserCouponsDto;
+import com.ruoyi.framework.recovery.domain.vo.CreditVo;
 import com.ruoyi.framework.recovery.domain.vo.UserCouponsVo;
 import com.ruoyi.wx.web.domain.dto.CreditDto;
 
@@ -37,4 +38,11 @@ public interface IWxPersonCenterService {
      * @return 结果集
      */
     boolean receiveCoupons(UserCouponsDto dto);
+
+    /**
+     * 查询当前登录用户的积分
+     *
+     * @return 结果集
+     */
+    List<CreditVo> getCredit();
 }

ruoyi-wx/src/main/java/com/ruoyi/wx/web/service/impl/WxPersonCenterServiceImpl.java

@@ -9,6 +9,7 @@ import com.ruoyi.common.utils.bean.BeanUtils;
 import com.ruoyi.framework.recovery.domain.WxCoupons;
 import com.ruoyi.framework.recovery.domain.WxCredit;
 import com.ruoyi.framework.recovery.domain.dto.UserCouponsDto;
+import com.ruoyi.framework.recovery.domain.vo.CreditVo;
 import com.ruoyi.framework.recovery.domain.vo.UserCouponsVo;
 import com.ruoyi.framework.recovery.mapper.WxCouponsMapper;
 import com.ruoyi.framework.recovery.mapper.WxCreditMapper;
@@ -98,4 +99,14 @@ public class WxPersonCenterServiceImpl implements IWxPersonCenterService {
         dto.setCreateTime(new Date());
         return couponsMapper.insertUserCoupons(dto);
     }
+
+    @Override
+    public List<CreditVo> getCredit() {
+        LoginWxUser loginWxUser = SecurityUtils.getLoginWxUser();
+        if (loginWxUser == null) {
+            throw new SecurityException("请登录");
+        }
+        WxUser wxUser = loginWxUser.getWxUser();
+        return wxCreditMapper.selectWxCreditByOpenId(wxUser.getWxOpenid());
+    }
 }