Browse Source

根据userId查询用户积分流水列表

bihuisong 4 months ago
parent
commit
4909094c9f

+ 1 - 1
qmjszx-admin/src/main/java/beilv/web/controller/system/AppMemberController.java

@@ -45,7 +45,7 @@ public class AppMemberController extends BaseController {
     @Log(title = "app修改保存会员用户信息", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     @ResponseBody
-    public AjaxResult editSave(SysMember sysMember) {
+    public AjaxResult editSave(@RequestBody SysMember sysMember) {
         return toAjax(sysMemberService.updateSysMember(sysMember));
     }
 }

+ 5 - 4
qmjszx-business/src/main/java/beilv/userbill/controller/AppUserBillController.java

@@ -6,6 +6,7 @@ import beilv.common.core.domain.AjaxResult;
 import beilv.common.core.page.TableDataInfo;
 import beilv.common.enums.BusinessType;
 import beilv.common.utils.poi.ExcelUtil;
+import beilv.system.domain.SysMember;
 import beilv.system.domain.dto.SysMemberDTO;
 import beilv.system.service.ISysMemberService;
 import beilv.userbill.domain.SysUserBill;
@@ -31,15 +32,15 @@ public class AppUserBillController extends BaseController {
     @Autowired
     private ISysUserBillService sysUserBillService;
 
+
     /**
      * 根据userId查询用户积分流水列表
      */
-    @GetMapping("/selectBillListByUserId/{userId}")
+    @GetMapping("/selectBillListByUserId")
     @ResponseBody
-    public TableDataInfo selectBillListByMemberId(@PathVariable("userId") Long userId) {
+    public TableDataInfo listByUserId(SysUserBill sysUserBill) {
         startPage();
-        List<SysUserBill> list = sysUserBillService.listByUserId(userId);
+        List<SysUserBill> list = sysUserBillService.listByUserId(sysUserBill.getId());
         return getDataTable(list);
     }
-
 }

+ 32 - 0
qmjszx-system/src/main/java/beilv/system/domain/SysMember.java

@@ -2,6 +2,7 @@ package beilv.system.domain;
 
 import beilv.common.annotation.Excel;
 import beilv.common.core.domain.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -66,6 +67,19 @@ public class SysMember extends BaseEntity {
     private BigDecimal integral;
 
     /**
+     * 电子邮箱
+     */
+    @Excel(name = "电子邮箱")
+    private String email;
+
+    /**
+     * 出生日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @Excel(name = "出生日期")
+    private Date birthday;
+
+    /**
      * 删除
      */
     private Integer delFlag;
@@ -143,6 +157,22 @@ public class SysMember extends BaseEntity {
         return openId;
     }
 
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public Date getBirthday() {
+        return birthday;
+    }
+
+    public void setBirthday(Date birthday) {
+        this.birthday = birthday;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
@@ -152,6 +182,8 @@ public class SysMember extends BaseEntity {
                 .append("sex", getSex())
                 .append("address", getAddress())
                 .append("city", getCity())
+                .append("email", getEmail())
+                .append("birthday", getBirthday())
                 .append("createBy", getCreateBy())
                 .append("createTime", getCreateTime())
                 .append("updateBy", getUpdateBy())

+ 10 - 0
qmjszx-system/src/main/resources/mapper/system/SysMemberMapper.xml

@@ -11,6 +11,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="sex"    column="sex"    />
         <result property="address"    column="address"    />
         <result property="city"    column="city"    />
+        <result property="email"    column="email"    />
+        <result property="birthday"    column="birthday"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
@@ -27,6 +29,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                sex,
                address,
                city,
+               email,
+               birthday,
                create_by,
                create_time,
                update_by,
@@ -58,6 +62,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="sex != null">sex,</if>
             <if test="address != null">address,</if>
             <if test="city != null">city,</if>
+            <if test="email != null">email,</if>
+            <if test="birthday != null">birthday,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
@@ -72,6 +78,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="sex != null">#{sex},</if>
             <if test="address != null">addressmobile},</if>
             <if test="city != null">#{city},</if>
+            <if test="email != null">#{email},</if>
+            <if test="birthday != null">#{birthday},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
@@ -90,6 +98,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="sex != null">sex = #{sex},</if>
             <if test="address != null">address = #{address},</if>
             <if test="city != null">city = #{city},</if>
+            <if test="email != null">email = #{email},</if>
+            <if test="birthday != null">birthday = #{birthday},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>