日志增加用户信息

share-admin/src/main/java/share/web/controller/system/BalanceLogController.java

@@ -10,6 +10,7 @@ import share.common.core.page.TableDataInfo;
 import share.common.enums.BusinessType;
 import share.common.utils.poi.ExcelUtil;
 import share.system.domain.BalanceLog;
+import share.system.domain.vo.BalanceLogVo;
 import share.system.service.BalanceLogService;
 
 import javax.servlet.http.HttpServletResponse;
@@ -32,9 +33,9 @@ public class BalanceLogController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('system:balanceLog:list')")
     @GetMapping("/list")
-    public TableDataInfo list(BalanceLog balanceLog) {
+    public TableDataInfo list(BalanceLogVo balanceLog) {
         startPage();
-        List<BalanceLog> list = balanceLogService.selectBalanceLogList(balanceLog);
+        List<BalanceLogVo> list = balanceLogService.selectBalanceLogList(balanceLog);
         return getDataTable(list);
     }
 
@@ -44,9 +45,9 @@ public class BalanceLogController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:balanceLog:export')")
     @Log(title = "余额日志", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, BalanceLog balanceLog) {
-        List<BalanceLog> list = balanceLogService.selectBalanceLogList(balanceLog);
-        ExcelUtil<BalanceLog> util = new ExcelUtil<BalanceLog>(BalanceLog.class);
+    public void export(HttpServletResponse response, BalanceLogVo balanceLog) {
+        List<BalanceLogVo> list = balanceLogService.selectBalanceLogList(balanceLog);
+        ExcelUtil<BalanceLogVo> util = new ExcelUtil<BalanceLogVo>(BalanceLogVo.class);
         util.exportExcel(response, list, "余额日志数据");
     }
 

share-admin/src/main/java/share/web/controller/system/DurationLogController.java

@@ -10,6 +10,7 @@ import share.common.core.page.TableDataInfo;
 import share.common.enums.BusinessType;
 import share.common.utils.poi.ExcelUtil;
 import share.system.domain.DurationLog;
+import share.system.domain.vo.DurationLogVo;
 import share.system.service.DurationLogService;
 
 import javax.servlet.http.HttpServletResponse;
@@ -32,9 +33,9 @@ public class DurationLogController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('system:durationLog:list')")
     @GetMapping("/list")
-    public TableDataInfo list(DurationLog durationLog) {
+    public TableDataInfo list(DurationLogVo durationLog) {
         startPage();
-        List<DurationLog> list = durationLogService.selectDurationLogList(durationLog);
+        List<DurationLogVo> list = durationLogService.selectDurationLogList(durationLog);
         return getDataTable(list);
     }
 
@@ -44,9 +45,9 @@ public class DurationLogController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:durationLog:export')")
     @Log(title = "时长日志", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, DurationLog durationLog) {
-        List<DurationLog> list = durationLogService.selectDurationLogList(durationLog);
-        ExcelUtil<DurationLog> util = new ExcelUtil<DurationLog>(DurationLog.class);
+    public void export(HttpServletResponse response, DurationLogVo durationLog) {
+        List<DurationLogVo> list = durationLogService.selectDurationLogList(durationLog);
+        ExcelUtil<DurationLogVo> util = new ExcelUtil<DurationLogVo>(DurationLogVo.class);
         util.exportExcel(response, list, "时长日志数据");
     }
 

share-admin/src/main/java/share/web/controller/system/IntegralLogController.java

@@ -10,6 +10,7 @@ import share.common.core.page.TableDataInfo;
 import share.common.enums.BusinessType;
 import share.common.utils.poi.ExcelUtil;
 import share.system.domain.IntegralLog;
+import share.system.domain.vo.IntegralLogVo;
 import share.system.service.IntegralLogService;
 
 import javax.servlet.http.HttpServletResponse;
@@ -32,9 +33,9 @@ public class IntegralLogController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('system:integralLog:list')")
     @GetMapping("/list")
-    public TableDataInfo list(IntegralLog integralLog) {
+    public TableDataInfo list(IntegralLogVo integralLog) {
         startPage();
-        List<IntegralLog> list = integralLogService.selectIntegralLogList(integralLog);
+        List<IntegralLogVo> list = integralLogService.selectIntegralLogList(integralLog);
         return getDataTable(list);
     }
 
@@ -44,9 +45,9 @@ public class IntegralLogController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:integralLog:export')")
     @Log(title = "积分日志", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, IntegralLog integralLog) {
-        List<IntegralLog> list = integralLogService.selectIntegralLogList(integralLog);
-        ExcelUtil<IntegralLog> util = new ExcelUtil<IntegralLog>(IntegralLog.class);
+    public void export(HttpServletResponse response, IntegralLogVo integralLog) {
+        List<IntegralLogVo> list = integralLogService.selectIntegralLogList(integralLog);
+        ExcelUtil<IntegralLogVo> util = new ExcelUtil<IntegralLogVo>(IntegralLogVo.class);
         util.exportExcel(response, list, "积分日志数据");
     }
 

share-admin/src/main/java/share/web/controller/system/MemberProgressLogController.java

@@ -10,6 +10,7 @@ import share.common.core.page.TableDataInfo;
 import share.common.enums.BusinessType;
 import share.common.utils.poi.ExcelUtil;
 import share.system.domain.MemberProgressLog;
+import share.system.domain.vo.MemberProgressLogVo;
 import share.system.service.MemberProgressLogService;
 
 import javax.servlet.http.HttpServletResponse;
@@ -32,9 +33,9 @@ public class MemberProgressLogController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('system:memberProgressLog:list')")
     @GetMapping("/list")
-    public TableDataInfo list(MemberProgressLog memberProgressLog) {
+    public TableDataInfo list(MemberProgressLogVo memberProgressLog) {
         startPage();
-        List<MemberProgressLog> list = memberProgressLogService.selectMemberProgressLogList(memberProgressLog);
+        List<MemberProgressLogVo> list = memberProgressLogService.selectMemberProgressLogList(memberProgressLog);
         return getDataTable(list);
     }
 
@@ -44,9 +45,9 @@ public class MemberProgressLogController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:memberProgressLog:export')")
     @Log(title = "会员进度日志", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, MemberProgressLog memberProgressLog) {
-        List<MemberProgressLog> list = memberProgressLogService.selectMemberProgressLogList(memberProgressLog);
-        ExcelUtil<MemberProgressLog> util = new ExcelUtil<MemberProgressLog>(MemberProgressLog.class);
+    public void export(HttpServletResponse response, MemberProgressLogVo memberProgressLog) {
+        List<MemberProgressLogVo> list = memberProgressLogService.selectMemberProgressLogList(memberProgressLog);
+        ExcelUtil<MemberProgressLogVo> util = new ExcelUtil<MemberProgressLogVo>(MemberProgressLogVo.class);
         util.exportExcel(response, list, "会员进度日志数据");
     }
 

share-front/src/main/java/share/web/controller/system/BalanceLogController.java

@@ -9,6 +9,7 @@ import share.common.core.page.TableDataInfo;
 import share.common.enums.BusinessType;
 import share.common.utils.poi.ExcelUtil;
 import share.system.domain.BalanceLog;
+import share.system.domain.vo.BalanceLogVo;
 import share.system.service.BalanceLogService;
 
 import javax.servlet.http.HttpServletResponse;
@@ -30,9 +31,9 @@ public class BalanceLogController extends BaseController {
      * 查询余额日志列表
      */
     @GetMapping("/list")
-    public TableDataInfo list(BalanceLog balanceLog) {
+    public TableDataInfo list(BalanceLogVo balanceLog) {
         startPage();
-        List<BalanceLog> list = balanceLogService.selectBalanceLogList(balanceLog);
+        List<BalanceLogVo> list = balanceLogService.selectBalanceLogList(balanceLog);
         return getDataTable(list);
     }
 
@@ -41,9 +42,9 @@ public class BalanceLogController extends BaseController {
      */
     @Log(title = "余额日志", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, BalanceLog balanceLog) {
-        List<BalanceLog> list = balanceLogService.selectBalanceLogList(balanceLog);
-        ExcelUtil<BalanceLog> util = new ExcelUtil<BalanceLog>(BalanceLog.class);
+    public void export(HttpServletResponse response, BalanceLogVo balanceLog) {
+        List<BalanceLogVo> list = balanceLogService.selectBalanceLogList(balanceLog);
+        ExcelUtil<BalanceLogVo> util = new ExcelUtil<BalanceLogVo>(BalanceLogVo.class);
         util.exportExcel(response, list, "余额日志数据");
     }
 

share-front/src/main/java/share/web/controller/system/DurationLogController.java

@@ -9,6 +9,7 @@ import share.common.core.page.TableDataInfo;
 import share.common.enums.BusinessType;
 import share.common.utils.poi.ExcelUtil;
 import share.system.domain.DurationLog;
+import share.system.domain.vo.DurationLogVo;
 import share.system.service.DurationLogService;
 
 import javax.servlet.http.HttpServletResponse;
@@ -30,9 +31,9 @@ public class DurationLogController extends BaseController {
      * 查询时长日志列表
      */
     @GetMapping("/list")
-    public TableDataInfo list(DurationLog durationLog) {
+    public TableDataInfo list(DurationLogVo durationLog) {
         startPage();
-        List<DurationLog> list = durationLogService.selectDurationLogList(durationLog);
+        List<DurationLogVo> list = durationLogService.selectDurationLogList(durationLog);
         return getDataTable(list);
     }
 
@@ -41,9 +42,9 @@ public class DurationLogController extends BaseController {
      */
     @Log(title = "时长日志", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, DurationLog durationLog) {
-        List<DurationLog> list = durationLogService.selectDurationLogList(durationLog);
-        ExcelUtil<DurationLog> util = new ExcelUtil<DurationLog>(DurationLog.class);
+    public void export(HttpServletResponse response, DurationLogVo durationLog) {
+        List<DurationLogVo> list = durationLogService.selectDurationLogList(durationLog);
+        ExcelUtil<DurationLogVo> util = new ExcelUtil<DurationLogVo>(DurationLogVo.class);
         util.exportExcel(response, list, "时长日志数据");
     }
 

share-front/src/main/java/share/web/controller/system/EquityMembersOrderController.java

@@ -93,7 +93,6 @@ public class EquityMembersOrderController extends BaseController {
         return toAjax(equityMembersOrderService.deleteEquityMembersOrderByIds(ids));
     }
 
-    @Log(title = "权益会员下单", businessType = BusinessType.INSERT)
     @PostMapping("/createEquityMembers")
     public R<RechargePayResultResponse> createOrder(@RequestBody @Validated CreateEquityMembersRequest request) {
         if ("1".equals(redisUtil.frontInOutLogSwitch())) {

share-front/src/main/java/share/web/controller/system/IntegralLogController.java

@@ -9,6 +9,7 @@ import share.common.core.page.TableDataInfo;
 import share.common.enums.BusinessType;
 import share.common.utils.poi.ExcelUtil;
 import share.system.domain.IntegralLog;
+import share.system.domain.vo.IntegralLogVo;
 import share.system.service.IntegralLogService;
 
 import javax.servlet.http.HttpServletResponse;
@@ -30,9 +31,9 @@ public class IntegralLogController extends BaseController {
      * 查询积分日志列表
      */
     @GetMapping("/list")
-    public TableDataInfo list(IntegralLog integralLog) {
+    public TableDataInfo list(IntegralLogVo integralLog) {
         startPage();
-        List<IntegralLog> list = integralLogService.selectIntegralLogList(integralLog);
+        List<IntegralLogVo> list = integralLogService.selectIntegralLogList(integralLog);
         return getDataTable(list);
     }
 
@@ -41,9 +42,9 @@ public class IntegralLogController extends BaseController {
      */
     @Log(title = "积分日志", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, IntegralLog integralLog) {
-        List<IntegralLog> list = integralLogService.selectIntegralLogList(integralLog);
-        ExcelUtil<IntegralLog> util = new ExcelUtil<IntegralLog>(IntegralLog.class);
+    public void export(HttpServletResponse response, IntegralLogVo integralLog) {
+        List<IntegralLogVo> list = integralLogService.selectIntegralLogList(integralLog);
+        ExcelUtil<IntegralLogVo> util = new ExcelUtil<IntegralLogVo>(IntegralLogVo.class);
         util.exportExcel(response, list, "积分日志数据");
     }
 

share-front/src/main/java/share/web/controller/system/RechargeController.java

@@ -92,7 +92,6 @@ public class RechargeController extends BaseController {
         return toAjax(rechargeService.deleteRechargeByIds(ids));
     }
 
-    @Log(title = "充值下单", businessType = BusinessType.INSERT)
     @PostMapping("/createRecharge")
     public R<RechargePayResultResponse> createOrder(@RequestBody @Validated CreateRechargeRequest request) {
         if ("1".equals(redisUtil.frontInOutLogSwitch())) {

share-system/src/main/java/share/system/domain/DurationLog.java

@@ -2,6 +2,7 @@ package share.system.domain;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -19,6 +20,7 @@ import java.util.Date;
  * @date 2024-06-24
  */
 @Data
+@TableName(value = "s_duration_log")
 public class DurationLog extends BaseEntity {
     private static final long serialVersionUID = 1L;
 

share-system/src/main/java/share/system/domain/vo/BalanceLogVo.java

+package share.system.domain.vo;
+
+import lombok.Data;
+import share.system.domain.BalanceLog;
+
+@Data
+public class BalanceLogVo extends BalanceLog {
+    private String nickName;
+
+    private String avatar;
+
+    private String phone;
+}

share-system/src/main/java/share/system/domain/vo/DurationLogVo.java

+package share.system.domain.vo;
+
+import lombok.Data;
+import share.system.domain.DurationLog;
+
+@Data
+public class DurationLogVo extends DurationLog {
+    private String nickName;
+
+    private String avatar;
+
+    private String phone;
+}

share-system/src/main/java/share/system/domain/vo/IntegralLogVo.java

+package share.system.domain.vo;
+
+import lombok.Data;
+import share.system.domain.IntegralLog;
+
+@Data
+public class IntegralLogVo extends IntegralLog {
+    private String nickName;
+
+    private String avatar;
+
+    private String phone;
+}

share-system/src/main/java/share/system/domain/vo/MemberProgressLogVo.java

+package share.system.domain.vo;
+
+import lombok.Data;
+import share.system.domain.MemberProgressLog;
+
+@Data
+public class MemberProgressLogVo extends MemberProgressLog {
+    private String nickName;
+
+    private String avatar;
+
+    private String phone;
+}

share-system/src/main/java/share/system/mapper/BalanceLogMapper.java

@@ -2,6 +2,7 @@ package share.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import share.system.domain.BalanceLog;
+import share.system.domain.vo.BalanceLogVo;
 
 import java.util.List;
 
@@ -26,7 +27,7 @@ public interface BalanceLogMapper extends BaseMapper<BalanceLog> {
      * @param balanceLog 余额日志
      * @return 余额日志集合
      */
-    public List<BalanceLog> selectBalanceLogList(BalanceLog balanceLog);
+    public List<BalanceLogVo> selectBalanceLogList(BalanceLogVo balanceLog);
 
     /**
      * 新增余额日志

share-system/src/main/java/share/system/mapper/DurationLogMapper.java

@@ -2,6 +2,7 @@ package share.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import share.system.domain.DurationLog;
+import share.system.domain.vo.DurationLogVo;
 
 import java.util.List;
 
@@ -26,7 +27,7 @@ public interface DurationLogMapper extends BaseMapper<DurationLog> {
      * @param durationLog 时长日志
      * @return 时长日志集合
      */
-    public List<DurationLog> selectDurationLogList(DurationLog durationLog);
+    public List<DurationLogVo> selectDurationLogList(DurationLogVo durationLog);
 
     /**
      * 新增时长日志

share-system/src/main/java/share/system/mapper/IntegralLogMapper.java

@@ -2,6 +2,7 @@ package share.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import share.system.domain.IntegralLog;
+import share.system.domain.vo.IntegralLogVo;
 
 import java.util.List;
 
@@ -26,7 +27,7 @@ public interface IntegralLogMapper extends BaseMapper<IntegralLog> {
      * @param integralLog 积分日志
      * @return 积分日志集合
      */
-    public List<IntegralLog> selectIntegralLogList(IntegralLog integralLog);
+    public List<IntegralLogVo> selectIntegralLogList(IntegralLogVo integralLog);
 
     /**
      * 新增积分日志

share-system/src/main/java/share/system/mapper/MemberProgressLogMapper.java

@@ -2,6 +2,7 @@ package share.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import share.system.domain.MemberProgressLog;
+import share.system.domain.vo.MemberProgressLogVo;
 
 import java.util.List;
 
@@ -26,7 +27,7 @@ public interface MemberProgressLogMapper extends BaseMapper<MemberProgressLog> {
      * @param memberProgressLog 会员进度日志
      * @return 会员进度日志集合
      */
-    public List<MemberProgressLog> selectMemberProgressLogList(MemberProgressLog memberProgressLog);
+    public List<MemberProgressLogVo> selectMemberProgressLogList(MemberProgressLogVo memberProgressLog);
 
     /**
      * 新增会员进度日志

share-system/src/main/java/share/system/service/BalanceLogService.java

@@ -2,6 +2,7 @@ package share.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import share.system.domain.BalanceLog;
+import share.system.domain.vo.BalanceLogVo;
 
 import java.util.List;
 
@@ -26,7 +27,7 @@ public interface BalanceLogService extends IService<BalanceLog> {
      * @param balanceLog 余额日志
      * @return 余额日志集合
      */
-    public List<BalanceLog> selectBalanceLogList(BalanceLog balanceLog);
+    public List<BalanceLogVo> selectBalanceLogList(BalanceLogVo balanceLog);
 
     /**
      * 新增余额日志

share-system/src/main/java/share/system/service/DurationLogService.java

@@ -2,6 +2,7 @@ package share.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import share.system.domain.DurationLog;
+import share.system.domain.vo.DurationLogVo;
 
 import java.util.List;
 
@@ -26,7 +27,7 @@ public interface DurationLogService extends IService<DurationLog> {
      * @param durationLog 时长日志
      * @return 时长日志集合
      */
-    public List<DurationLog> selectDurationLogList(DurationLog durationLog);
+    public List<DurationLogVo> selectDurationLogList(DurationLogVo durationLog);
 
     /**
      * 新增时长日志

share-system/src/main/java/share/system/service/IntegralLogService.java

@@ -2,6 +2,7 @@ package share.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import share.system.domain.IntegralLog;
+import share.system.domain.vo.IntegralLogVo;
 
 import java.util.List;
 
@@ -26,7 +27,7 @@ public interface IntegralLogService extends IService<IntegralLog> {
      * @param integralLog 积分日志
      * @return 积分日志集合
      */
-    public List<IntegralLog> selectIntegralLogList(IntegralLog integralLog);
+    public List<IntegralLogVo> selectIntegralLogList(IntegralLogVo integralLog);
 
     /**
      * 新增积分日志

share-system/src/main/java/share/system/service/MemberProgressLogService.java

@@ -2,6 +2,7 @@ package share.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import share.system.domain.MemberProgressLog;
+import share.system.domain.vo.MemberProgressLogVo;
 
 import java.util.List;
 
@@ -26,7 +27,7 @@ public interface MemberProgressLogService extends IService<MemberProgressLog> {
      * @param memberProgressLog 会员进度日志
      * @return 会员进度日志集合
      */
-    public List<MemberProgressLog> selectMemberProgressLogList(MemberProgressLog memberProgressLog);
+    public List<MemberProgressLogVo> selectMemberProgressLogList(MemberProgressLogVo memberProgressLog);
 
     /**
      * 新增会员进度日志

share-system/src/main/java/share/system/service/impl/BalanceLogServiceImpl.java

@@ -5,6 +5,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import share.common.utils.DateUtils;
 import share.system.domain.BalanceLog;
+import share.system.domain.vo.BalanceLogVo;
 import share.system.mapper.BalanceLogMapper;
 import share.system.service.BalanceLogService;
 
@@ -39,7 +40,7 @@ public class BalanceLogServiceImpl extends ServiceImpl<BalanceLogMapper, Balance
      * @return 余额日志
      */
     @Override
-    public List<BalanceLog> selectBalanceLogList(BalanceLog balanceLog) {
+    public List<BalanceLogVo> selectBalanceLogList(BalanceLogVo balanceLog) {
         return balanceLogMapper.selectBalanceLogList(balanceLog);
     }
 

share-system/src/main/java/share/system/service/impl/DurationLogServiceImpl.java

@@ -5,6 +5,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import share.common.utils.DateUtils;
 import share.system.domain.DurationLog;
+import share.system.domain.vo.DurationLogVo;
 import share.system.mapper.DurationLogMapper;
 import share.system.service.DurationLogService;
 
@@ -39,7 +40,7 @@ public class DurationLogServiceImpl extends ServiceImpl<DurationLogMapper, Durat
      * @return 时长日志
      */
     @Override
-    public List<DurationLog> selectDurationLogList(DurationLog durationLog) {
+    public List<DurationLogVo> selectDurationLogList(DurationLogVo durationLog) {
         return durationLogMapper.selectDurationLogList(durationLog);
     }
 

share-system/src/main/java/share/system/service/impl/IntegralLogServiceImpl.java

@@ -5,6 +5,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import share.common.utils.DateUtils;
 import share.system.domain.IntegralLog;
+import share.system.domain.vo.IntegralLogVo;
 import share.system.mapper.IntegralLogMapper;
 import share.system.service.IntegralLogService;
 
@@ -39,7 +40,7 @@ public class IntegralLogServiceImpl extends ServiceImpl<IntegralLogMapper, Integ
      * @return 积分日志
      */
     @Override
-    public List<IntegralLog> selectIntegralLogList(IntegralLog integralLog) {
+    public List<IntegralLogVo> selectIntegralLogList(IntegralLogVo integralLog) {
         return integralLogMapper.selectIntegralLogList(integralLog);
     }
 

share-system/src/main/java/share/system/service/impl/MemberProgressLogServiceImpl.java

@@ -5,6 +5,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import share.common.utils.DateUtils;
 import share.system.domain.MemberProgressLog;
+import share.system.domain.vo.MemberProgressLogVo;
 import share.system.mapper.MemberProgressLogMapper;
 import share.system.service.MemberProgressLogService;
 
@@ -39,7 +40,7 @@ public class MemberProgressLogServiceImpl extends ServiceImpl<MemberProgressLogM
      * @return 会员进度日志
      */
     @Override
-    public List<MemberProgressLog> selectMemberProgressLogList(MemberProgressLog memberProgressLog) {
+    public List<MemberProgressLogVo> selectMemberProgressLogList(MemberProgressLogVo memberProgressLog) {
         return memberProgressLogMapper.selectMemberProgressLogList(memberProgressLog);
     }
 

share-system/src/main/resources/mapper/system/BalanceLogMapper.xml

@@ -4,9 +4,12 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="share.system.mapper.BalanceLogMapper">
 
-    <resultMap type="BalanceLog" id="BalanceLogResult">
+    <resultMap type="BalanceLogVo" id="BalanceLogResult">
         <result property="id" column="id"/>
         <result property="consumerId" column="consumer_id"/>
+        <result property="nickName" column="nick_name"/>
+        <result property="phone" column="phone"/>
+        <result property="avatar" column="avatar"/>
         <result property="variableAmount" column="variable_amount"/>
         <result property="currentBalance" column="current_balance"/>
         <result property="operationType" column="operation_type"/>
@@ -35,15 +38,34 @@
         from s_balance_log
     </sql>
 
-    <select id="selectBalanceLogList" parameterType="BalanceLog" resultMap="BalanceLogResult">
-        <include refid="selectBalanceLogVo"/>
+    <select id="selectBalanceLogList" parameterType="BalanceLogVo" resultMap="BalanceLogResult">
+        select b.id,
+        b.consumer_id,
+        c.nick_name,
+        c.phone,
+        c.avatar,
+        b.variable_amount,
+        b.current_balance,
+        b.operation_type,
+        b.operation_time,
+        b. is_delete,
+        b. create_by,
+        b. create_time,
+        b. update_by,
+        b.update_time,
+        b. remark
+        from s_balance_log b join s_consumer c on b.consumer_id = c.id
         <where>
-            <if test="consumerId != null ">and consumer_id = #{consumerId}</if>
-            <if test="variableAmount != null ">and variable_amount = #{variableAmount}</if>
-            <if test="currentBalance != null ">and current_balance = #{currentBalance}</if>
-            <if test="operationType != null ">and operation_type = #{operationType}</if>
-            <if test="operationTime != null ">and operation_time = #{operationTime}</if>
-            <if test="isDelete != null ">and is_delete = #{isDelete}</if>
+            <if test="nickName != null  and nickName != ''">and c.nick_name like concat('%', #{nickName},'%')
+            </if>
+            <if test="phone != null  and phone != ''">and c.phone like concat('%', #{phone},'%')
+            </if>
+            <if test="consumerId != null ">and b.consumer_id = #{consumerId}</if>
+            <if test="variableAmount != null ">and b.variable_amount = #{variableAmount}</if>
+            <if test="currentBalance != null ">and b.current_balance = #{currentBalance}</if>
+            <if test="operationType != null ">and b.operation_type = #{operationType}</if>
+            <if test="operationTime != null ">and b.operation_time = #{operationTime}</if>
+            <if test="isDelete != null ">and b.is_delete = #{isDelete}</if>
         </where>
     </select>
 

share-system/src/main/resources/mapper/system/DurationLogMapper.xml

@@ -4,9 +4,12 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="share.system.mapper.DurationLogMapper">
 
-    <resultMap type="DurationLog" id="DurationLogResult">
+    <resultMap type="DurationLogVo" id="DurationLogResult">
         <result property="id" column="id"/>
         <result property="consumerId" column="consumer_id"/>
+        <result property="nickName" column="nick_name"/>
+        <result property="phone" column="phone"/>
+        <result property="avatar" column="avatar"/>
         <result property="variableDuration" column="variable_duration"/>
         <result property="currentDuration" column="current_duration"/>
         <result property="operationType" column="operation_type"/>
@@ -35,15 +38,34 @@
         from s_duration_log
     </sql>
 
-    <select id="selectDurationLogList" parameterType="DurationLog" resultMap="DurationLogResult">
-        <include refid="selectDurationLogVo"/>
+    <select id="selectDurationLogList" parameterType="DurationLogVo" resultMap="DurationLogResult">
+        select d.id,
+        d.consumer_id,
+        c.nick_name,
+        c.phone,
+        c.avatar,
+        d.variable_duration,
+        d.current_duration,
+        d.operation_type,
+        d.operation_time,
+        d.is_delete,
+        d.create_by,
+        d.create_time,
+        d.update_by,
+        d.update_time,
+        d.remark
+        from s_duration_log d join s_consumer c on d.consumer_id = c.id
         <where>
-            <if test="consumerId != null ">and consumer_id = #{consumerId}</if>
-            <if test="variableDuration != null ">and variable_duration = #{variableDuration}</if>
-            <if test="currentDuration != null ">and current_duration = #{currentDuration}</if>
-            <if test="operationType != null ">and operation_type = #{operationType}</if>
-            <if test="operationTime != null ">and operation_time = #{operationTime}</if>
-            <if test="isDelete != null ">and is_delete = #{isDelete}</if>
+            <if test="nickName != null  and nickName != ''">and c.nick_name like concat('%', #{nickName},'%')
+            </if>
+            <if test="phone != null  and phone != ''">and c.phone like concat('%', #{phone},'%')
+            </if>
+            <if test="consumerId != null ">and d.consumer_id = #{consumerId}</if>
+            <if test="variableDuration != null ">and d.variable_duration = #{variableDuration}</if>
+            <if test="currentDuration != null ">and d.current_duration = #{currentDuration}</if>
+            <if test="operationType != null ">and d.operation_type = #{operationType}</if>
+            <if test="operationTime != null ">and d.operation_time = #{operationTime}</if>
+            <if test="isDelete != null ">and d.is_delete = #{isDelete}</if>
         </where>
     </select>
 

share-system/src/main/resources/mapper/system/IntegralLogMapper.xml

@@ -4,9 +4,12 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="share.system.mapper.IntegralLogMapper">
 
-    <resultMap type="IntegralLog" id="IntegralLogResult">
+    <resultMap type="IntegralLogVo" id="IntegralLogResult">
         <result property="id" column="id"/>
         <result property="consumerId" column="consumer_id"/>
+        <result property="nickName" column="nick_name"/>
+        <result property="phone" column="phone"/>
+        <result property="avatar" column="avatar"/>
         <result property="variableIntegral" column="variable_integral"/>
         <result property="currentIntegral" column="current_integral"/>
         <result property="operationType" column="operation_type"/>
@@ -36,14 +39,33 @@
     </sql>
 
     <select id="selectIntegralLogList" parameterType="IntegralLog" resultMap="IntegralLogResult">
-        <include refid="selectIntegralLogVo"/>
+        select i.id,
+        i. consumer_id,
+        c.nick_name,
+        c.phone,
+        c.avatar,
+        i.variable_integral,
+        i.current_integral,
+        i.operation_type,
+        i.operation_time,
+        i.is_delete,
+        i.create_by,
+        i.create_time,
+        i.update_by,
+        i.update_time,
+        i.remark
+        from s_integral_log i join s_consumer c on i.consumer_id = c.id
         <where>
-            <if test="consumerId != null ">and consumer_id = #{consumerId}</if>
-            <if test="variableIntegral != null ">and variable_integral = #{variableIntegral}</if>
-            <if test="currentIntegral != null ">and current_integral = #{currentIntegral}</if>
-            <if test="operationType != null ">and operation_type = #{operationType}</if>
-            <if test="operationTime != null ">and operation_time = #{operationTime}</if>
-            <if test="isDelete != null ">and is_delete = #{isDelete}</if>
+            <if test="nickName != null  and nickName != ''">and c.nick_name like concat('%', #{nickName},'%')
+            </if>
+            <if test="phone != null  and phone != ''">and c.phone like concat('%', #{phone},'%')
+            </if>
+            <if test="consumerId != null ">and i.consumer_id = #{consumerId}</if>
+            <if test="variableIntegral != null ">and i.variable_integral = #{variableIntegral}</if>
+            <if test="currentIntegral != null ">and i.current_integral = #{currentIntegral}</if>
+            <if test="operationType != null ">and i.operation_type = #{operationType}</if>
+            <if test="operationTime != null ">and i.operation_time = #{operationTime}</if>
+            <if test="isDelete != null ">and i.is_delete = #{isDelete}</if>
         </where>
     </select>
 

share-system/src/main/resources/mapper/system/MemberProgressLogMapper.xml

@@ -4,9 +4,12 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="share.system.mapper.MemberProgressLogMapper">
 
-    <resultMap type="MemberProgressLog" id="MemberProgressLogResult">
+    <resultMap type="MemberProgressLogVo" id="MemberProgressLogResult">
         <result property="id" column="id"/>
         <result property="consumerId" column="consumer_id"/>
+        <result property="nickName" column="nick_name"/>
+        <result property="phone" column="phone"/>
+        <result property="avatar" column="avatar"/>
         <result property="variableProgress" column="variable_progress"/>
         <result property="currentProgress" column="current_progress"/>
         <result property="operationType" column="operation_type"/>
@@ -35,15 +38,34 @@
         from s_member_progress_log
     </sql>
 
-    <select id="selectMemberProgressLogList" parameterType="MemberProgressLog" resultMap="MemberProgressLogResult">
-        <include refid="selectMemberProgressLogVo"/>
+    <select id="selectMemberProgressLogList" parameterType="MemberProgressLogVo" resultMap="MemberProgressLogResult">
+        select m.id,
+        m.consumer_id,
+        c.nick_name,
+        c.phone,
+        c.avatar,
+        m.variable_progress,
+        m.current_progress,
+        m.operation_type,
+        m.operation_time,
+        m.is_delete,
+        m.create_by,
+        m.create_time,
+        m.update_by,
+        m.update_time,
+        m.remark
+        from s_member_progress_log m join s_consumer c on m.consumer_id = c.id
         <where>
-            <if test="consumerId != null ">and consumer_id = #{consumerId}</if>
-            <if test="variableProgress != null ">and variable_progress = #{variableProgress}</if>
-            <if test="currentProgress != null ">and current_progress = #{currentProgress}</if>
-            <if test="operationType != null ">and operation_type = #{operationType}</if>
-            <if test="operationTime != null ">and operation_time = #{operationTime}</if>
-            <if test="isDelete != null ">and is_delete = #{isDelete}</if>
+            <if test="nickName != null  and nickName != ''">and c.nick_name like concat('%', #{nickName},'%')
+            </if>
+            <if test="phone != null  and phone != ''">and c.phone like concat('%', #{phone},'%')
+            </if>
+            <if test="consumerId != null ">and m.consumer_id = #{consumerId}</if>
+            <if test="variableProgress != null ">and m.variable_progress = #{variableProgress}</if>
+            <if test="currentProgress != null ">and m.current_progress = #{currentProgress}</if>
+            <if test="operationType != null ">and m.operation_type = #{operationType}</if>
+            <if test="operationTime != null ">and m.operation_time = #{operationTime}</if>
+            <if test="isDelete != null ">and m.is_delete = #{isDelete}</if>
         </where>
     </select>