Merge branch 'refs/heads/test' into test-lms

# Conflicts:
#	share-quartz/src/main/java/share/quartz/task/RedisTask.java
#	share-system/src/main/java/share/system/domain/vo/SConsumerVo.java
#	share-system/src/main/java/share/system/service/impl/SConsumerServiceImpl.java
#	share-system/src/main/java/share/system/service/impl/SOrderServiceImpl.java

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

+package share.web.controller.system;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import share.common.annotation.Log;
+import share.common.core.controller.BaseController;
+import share.common.core.domain.AjaxResult;
+import share.common.enums.BusinessType;
+import share.system.domain.EquityFundExcess;
+import share.system.domain.vo.EquityFundExcessVo;
+import share.system.service.EquityFundExcessService;
+import share.common.utils.poi.ExcelUtil;
+import share.common.core.page.TableDataInfo;
+
+/**
+ * 权益金过度Controller
+ * 
+ * @author wuwenlong
+ * @date 2024-09-20
+ */
+@RestController
+@RequestMapping("/system/equityFundExcess")
+public class EquityFundExcessController extends BaseController
+{
+    @Autowired
+    private EquityFundExcessService equityFundExcessService;
+
+    /**
+     * 查询权益金过度列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:equityFundExcess:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(EquityFundExcessVo equityFundExcess)
+    {
+        startPage();
+        List<EquityFundExcess> list = equityFundExcessService.selectEquityFundExcessList(equityFundExcess);
+        TableDataInfo dataTable = getDataTable(list);
+        return equityFundExcessService.pageList(dataTable,equityFundExcess);
+    }
+
+    /**
+     * 导出权益金过度列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:equityFundExcess:export')")
+    @Log(title = "权益金过度", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, EquityFundExcess equityFundExcess)
+    {
+        List<EquityFundExcess> list = equityFundExcessService.selectEquityFundExcessList(equityFundExcess);
+        ExcelUtil<EquityFundExcess> util = new ExcelUtil<EquityFundExcess>(EquityFundExcess.class);
+        util.exportExcel(response, list, "权益金过度数据");
+    }
+
+    /**
+     * 获取权益金过度详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:equityFundExcess:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(equityFundExcessService.selectEquityFundExcessById(id));
+    }
+
+    /**
+     * 新增权益金过度
+     */
+    @PreAuthorize("@ss.hasPermi('system:equityFundExcess:add')")
+    @Log(title = "权益金过度", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody EquityFundExcess equityFundExcess)
+    {
+        return toAjax(equityFundExcessService.insertEquityFundExcess(equityFundExcess));
+    }
+
+    /**
+     * 修改权益金过度
+     */
+    @PreAuthorize("@ss.hasPermi('system:equityFundExcess:edit')")
+    @Log(title = "权益金过度", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody EquityFundExcess equityFundExcess)
+    {
+        return toAjax(equityFundExcessService.updateEquityFundExcess(equityFundExcess));
+    }
+
+    /**
+     * 删除权益金过度
+     */
+    @PreAuthorize("@ss.hasPermi('system:equityFundExcess:remove')")
+    @Log(title = "权益金过度", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(equityFundExcessService.deleteEquityFundExcessByIds(ids));
+    }
+}

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

@@ -17,6 +17,7 @@ import share.common.core.controller.BaseController;
 import share.common.core.domain.AjaxResult;
 import share.common.enums.BusinessType;
 import share.system.domain.EquityFundLog;
+import share.system.domain.vo.EquityFundLogVo;
 import share.system.service.EquityFundLogService;
 import share.common.utils.poi.ExcelUtil;
 import share.common.core.page.TableDataInfo;
@@ -39,11 +40,12 @@ public class EquityFundLogController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:equityFundLog:list')")
     @GetMapping("/list")
-    public TableDataInfo list(EquityFundLog equityFundLog)
+    public TableDataInfo list(EquityFundLogVo equityFundLog)
     {
         startPage();
         List<EquityFundLog> list = equityFundLogService.selectEquityFundLogList(equityFundLog);
-        return getDataTable(list);
+        TableDataInfo dataTable = getDataTable(list);
+        return equityFundLogService.pageList(dataTable,equityFundLog);
     }
 
     /**

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

@@ -17,6 +17,7 @@ import share.common.core.controller.BaseController;
 import share.common.core.domain.AjaxResult;
 import share.common.enums.BusinessType;
 import share.system.domain.SConsumer;
+import share.system.domain.vo.SConsumerVo;
 import share.system.service.SConsumerService;
 import share.common.utils.poi.ExcelUtil;
 import share.common.core.page.TableDataInfo;
@@ -34,6 +35,8 @@ public class SConsumerController extends BaseController
     @Autowired
     private SConsumerService sConsumerService;
 
+
+
     /**
      * 查询会员用户列表
      */
@@ -46,6 +49,18 @@ public class SConsumerController extends BaseController
         return getDataTable(list);
     }
 
+
+    /**
+     * 查询会员用户列表
+     */
+//    @PreAuthorize("@ss.hasPermi('system:consumer:list')")
+    @GetMapping("/selectConsumernotById")
+    public TableDataInfo selectConsumernotById(SConsumerVo sConsumer)
+    {
+        return sConsumerService.selectConsumernotById(sConsumer);
+    }
+
+
     @GetMapping("/query")
     public AjaxResult query() {
         return success(sConsumerService.selectSConsumerList(new SConsumer()));

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

@@ -18,6 +18,7 @@ import share.common.core.controller.BaseController;
 import share.common.core.domain.AjaxResult;
 import share.common.enums.BusinessType;
 import share.system.domain.SharingActivities;
+import share.system.domain.vo.SharingActivitiesVo;
 import share.system.service.SharingActivitiesService;
 import share.common.utils.poi.ExcelUtil;
 import share.common.core.page.TableDataInfo;
@@ -39,10 +40,11 @@ public class SharingActivitiesController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('system:activities:list')")
     @GetMapping("/list")
-    public TableDataInfo list(SharingActivities sharingActivities) {
+    public TableDataInfo list(SharingActivitiesVo sharingActivities) {
         startPage();
         List<SharingActivities> list = sharingActivitiesService.selectSharingActivitiesList(sharingActivities);
-        return getDataTable(list);
+        TableDataInfo dataTable = getDataTable(list);
+        return sharingActivitiesService.pageList(dataTable,sharingActivities);
     }
 
     /**
@@ -85,6 +87,7 @@ public class SharingActivitiesController extends BaseController {
     @Log(title = "分享活动绑定关系", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody SharingActivities sharingActivities) {
+
         return toAjax(sharingActivitiesService.updateSharingActivities(sharingActivities));
     }
 

share-common/src/main/java/share/common/constant/Constants.java

@@ -11,9 +11,11 @@ public class Constants
 {
 
     //订单提前进场时间限制
-    public final static Integer OPEN_DOOR_AHEAD_HOUR = 30;
+    public final static Integer OPEN_DOOR_AHEAD_HOUR = 60;
     //订单提前进场时间限制 -1
-    public final static Integer OPEN_DOOR_AHEAD_HOUR_MINUS = -30;
+    public final static Integer OPEN_DOOR_AHEAD_HOUR_MINUS = -60;
+    //房间锁定时间
+    public final static Integer ROOM_LOCK_HOUR = 30;
 
     //保洁锁定订单房间状态延迟时间
     public final static Integer ROOM_LOCK_DELAY_MINUTE = 60;

share-common/src/main/java/share/common/enums/EquityFundTypeEnum.java

+package share.common.enums;
+
+public enum EquityFundTypeEnum {
+
+    RECHARGE("0",  "充值"),
+    RIGHTS("1", "权益购买"),
+    ORDER("2","订单消费"),
+    ORDER_REFUND("3","订单消费退款"),
+    WITHDRAW_BALANCE("4","权益金提现到余额"),
+    WITHDRAW_WX("5","权益金提现到微信"),
+    ;
+
+
+    EquityFundTypeEnum() {
+    }
+
+    EquityFundTypeEnum(String code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    private String code;
+    private String name;
+}

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

+package share.web.controller.system;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+import share.common.annotation.Log;
+import share.common.core.controller.BaseController;
+import share.common.core.domain.AjaxResult;
+import share.common.core.page.TableDataInfo;
+import share.common.enums.BusinessType;
+import share.common.utils.poi.ExcelUtil;
+import share.system.domain.EquityFundExcess;
+import share.system.domain.SConsumer;
+import share.system.domain.vo.EquityFundExcessVo;
+import share.system.domain.vo.FrontTokenComponent;
+import share.system.service.EquityFundExcessService;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 权益金过度Controller
+ * 
+ * @author wuwenlong
+ * @date 2024-09-20
+ */
+@RestController
+@RequestMapping("/equityFundExcess")
+public class EquityFundExcessController extends BaseController
+{
+    @Autowired
+    private EquityFundExcessService equityFundExcessService;
+
+    /**
+     * 查询权益金过度列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:equityFundExcess:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(EquityFundExcessVo equityFundExcess)
+    {
+        SConsumer user = FrontTokenComponent.getWxSConsumerEntry();
+        equityFundExcess.setUid(user.getId());
+        startPage();
+        List<EquityFundExcess> list = equityFundExcessService.selectEquityFundExcessList(equityFundExcess);
+        TableDataInfo dataTable = getDataTable(list);
+        return equityFundExcessService.pageList(dataTable,equityFundExcess);
+    }
+}

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

@@ -11,7 +11,9 @@ import share.common.enums.BusinessType;
 import share.common.utils.poi.ExcelUtil;
 import share.system.domain.EquityFundLog;
 import share.system.domain.SConsumer;
+import share.system.domain.SharingActivities;
 import share.system.domain.vo.DurationLogVo;
+import share.system.domain.vo.EquityFundLogVo;
 import share.system.domain.vo.FrontTokenComponent;
 import share.system.service.EquityFundLogService;
 
@@ -34,12 +36,13 @@ public class EquityFundLogController extends BaseController {
      * 查询本人权益金记录列表
      */
     @GetMapping("/list")
-    public TableDataInfo list(EquityFundLog equityFundLog) {
-        startPage();
+    public TableDataInfo list(EquityFundLogVo equityFundLog) {
         SConsumer user = FrontTokenComponent.getWxSConsumerEntry();
         equityFundLog.setUid(user.getId());
+        startPage();
         List<EquityFundLog> list = equityFundLogService.selectEquityFundLogList(equityFundLog);
-        return getDataTable(list);
+        TableDataInfo dataTable = getDataTable(list);
+        return equityFundLogService.pageList(dataTable,equityFundLog);
     }
 
 

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

 package share.web.controller.system;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-import share.common.annotation.Log;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import share.common.core.controller.BaseController;
 import share.common.core.domain.AjaxResult;
 import share.common.core.page.TableDataInfo;
-import share.common.enums.BusinessType;
-import share.common.utils.poi.ExcelUtil;
-import share.system.domain.EquityFundLog;
 import share.system.domain.SConsumer;
 import share.system.domain.SharingActivities;
 import share.system.domain.vo.FrontTokenComponent;
+import share.system.domain.vo.SharingActivitiesVo;
 import share.system.service.SharingActivitiesService;
 
-import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
@@ -34,20 +31,40 @@ public class SharingActivitiesController extends BaseController {
      * 查询分享活动绑定关系列表
      */
     @GetMapping("/list")
-    public TableDataInfo list(SharingActivities sharingActivities) {
-        startPage();
+    public TableDataInfo list(SharingActivitiesVo sharingActivities) {
         SConsumer user = FrontTokenComponent.getWxSConsumerEntry();
         sharingActivities.setUid(user.getId());
+        startPage();
         List<SharingActivities> list = sharingActivitiesService.selectSharingActivitiesList(sharingActivities);
-        return getDataTable(list);
+        TableDataInfo dataTable = getDataTable(list);
+        return sharingActivitiesService.pageList(dataTable,sharingActivities);
+
     }
 
     @GetMapping("/query")
-    public AjaxResult query(SharingActivities sharingActivities) {
+    public TableDataInfo query(SharingActivitiesVo sharingActivities) {
         SConsumer user = FrontTokenComponent.getWxSConsumerEntry();
         sharingActivities.setNewUid(user.getId());
+        startPage();
         List<SharingActivities> list = sharingActivitiesService.selectSharingActivitiesList(sharingActivities);
-        return success(list);
+        TableDataInfo dataTable = getDataTable(list);
+        return sharingActivitiesService.pageList(dataTable,sharingActivities);
+    }
+
+    /**
+     * 查询下级数量
+     * @param sharingActivities
+     * @return
+     */
+    @GetMapping("/countNum")
+    public AjaxResult countNum(SharingActivities sharingActivities){
+        SConsumer user = FrontTokenComponent.getWxSConsumerEntry();
+        sharingActivities.setUid(user.getId());
+        return success(sharingActivitiesService.selectSharingActivitiesCount(sharingActivities));
     }
 
+
+
+
+
 }

share-quartz/src/main/java/share/quartz/task/OrderTask.java

@@ -74,6 +74,9 @@ public class OrderTask {
     @Autowired
     private ISCleanRecordsService isCleanRecordsService;
 
+    @Autowired
+    private EquityFundExcessService equityFundExcessService;
+
 
     final int ZERO = 0;
     //10分钟的常量
@@ -341,6 +344,7 @@ public class OrderTask {
         if (orders != null && orders.size() > 0) {
             orders.stream().forEach(sOrder -> {
                 logger.debug("订单号为：" + sOrder.getOrderNo() + "的订单异常");
+                equityFundExcessService.extracted(sOrder);
                 //更改订单状态
                 sOrder.setStatus(OrderStatusEnum.USED.getCode());
                 sOrder.setUpdateTime(new Date());

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

+package share.system.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import share.common.annotation.Excel;
+import share.common.core.domain.BaseEntity;
+import lombok.Data;
+/**
+ * 权益金过度对象 s_equity_fund_excess
+ * 
+ * @author wuwenlong
+ * @date 2024-09-20
+ */
+@Data
+@TableName(value = "s_equity_fund_excess")
+public class EquityFundExcess extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    /** 权益金额 */
+    @Excel(name = "权益金额")
+    private BigDecimal equityFund;
+
+    /** 上级id */
+    private Long uid;
+
+    /** 下级id */
+    private Long newUid;
+
+    /** 订单号 */
+    @Excel(name = "订单号")
+    private String outTradeNo;
+
+    /** 过期时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "过期时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date expireTime;
+
+    //逻辑删除注解(0 未删除 1 已删除)
+    @TableLogic
+    @TableField(select = false)
+    private Integer isDelete;
+
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("equityFund", getEquityFund())
+            .append("uid", getUid())
+            .append("newUid", getNewUid())
+            .append("outTradeNo", getOutTradeNo())
+            .append("expireTime", getExpireTime())
+            .append("isDelete", getIsDelete())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

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

@@ -52,39 +52,9 @@ public class EquityFundLog extends BaseEntity
     //逻辑删除注解(0 未删除 1 已删除)
     @TableLogic
     @TableField(select = false)
-    private Long isDelete;
+    private Integer isDelete;
 
-    /** 上级电话 */
-    @Excel(name = "上级电话")
-    private String phone;
 
-    /** 上级账号 */
-    @Excel(name = "上级账号")
-    private String account;
-
-    /** 上级用户昵称 */
-    @Excel(name = "上级用户昵称")
-    private String nickName;
-
-    /** 下级电话 */
-    @Excel(name = "下级电话")
-    private String newPhone;
-
-    /** 下级账号 */
-    @Excel(name = "下级账号")
-    private String newAccount;
-
-    /** 下级用户昵称 */
-    @Excel(name = "下级用户昵称")
-    private String newNickName;
-
-    /** 上级用户头像 */
-    @Excel(name = "上级用户头像")
-    private String avatar;
-
-    /** 下级用户头像 */
-    @Excel(name = "下级用户头像")
-    private String newAvatar;
 
 
     @Override
@@ -103,14 +73,6 @@ public class EquityFundLog extends BaseEntity
                 .append("updateBy", getUpdateBy())
                 .append("updateTime", getUpdateTime())
                 .append("remark", getRemark())
-                .append("phone", getPhone())
-                .append("account", getAccount())
-                .append("nickName", getNickName())
-                .append("newPhone", getNewPhone())
-                .append("newAccount", getNewAccount())
-                .append("newNickName", getNewNickName())
-                .append("avatar", getAvatar())
-                .append("newAvatar", getNewAvatar())
                 .toString();
     }
 }

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

 package share.system.domain;
 
+import com.baomidou.mybatisplus.annotation.*;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import share.common.annotation.Excel;
 import share.common.core.domain.BaseEntity;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableLogic;
 import lombok.Data;
 /**
  * 分享活动绑定关系对象 s_sharing_activities
@@ -14,11 +13,13 @@ import lombok.Data;
  * @date 2024-09-14
  */
 @Data
+@TableName("s_sharing_activities")
 public class SharingActivities extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** 主键 */
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** 活动类型(0-新用户注册，1-权益金会员分享) */
@@ -37,31 +38,9 @@ public class SharingActivities extends BaseEntity
     //逻辑删除注解(0 未删除 1 已删除)
     @TableLogic
     @TableField(select = false)
-    private Long isDelete;
+    private Integer isDelete;
 
-    /** 上级用户头像 */
-    @Excel(name = "上级用户头像")
-    private String avatar;
 
-    /** 下级用户头像 */
-    @Excel(name = "下级用户头像")
-    private String newAvatar;
-
-    /** 上级用户昵称 */
-    @Excel(name = "上级用户昵称")
-    private String nickName;
-
-    /** 下级用户昵称 */
-    @Excel(name = "下级用户昵称")
-    private String newNickName;
-
-    /** 上级电话 */
-    @Excel(name = "上级电话")
-    private String phone;
-
-    /** 下级电话 */
-    @Excel(name = "下级电话")
-    private String newPhone;
 
 
     @Override
@@ -77,12 +56,6 @@ public class SharingActivities extends BaseEntity
                 .append("updateBy", getUpdateBy())
                 .append("updateTime", getUpdateTime())
                 .append("remark", getRemark())
-                .append("avatar", getAvatar())
-                .append("newAvatar", getNewAvatar())
-                .append("nickName", getNickName())
-                .append("newNickName", getNewNickName())
-                .append("phone", getPhone())
-                .append("newPhone", getNewPhone())
                 .toString();
     }
 }

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

@@ -2,6 +2,9 @@ package share.system.domain.vo;
 
 import lombok.Data;
 import share.system.domain.ConsumerWallet;
+import share.system.domain.EquityFundExcess;
+
+import java.util.List;
 
 @Data
 public class ConsumerWalletVo extends ConsumerWallet {
@@ -13,4 +16,8 @@ public class ConsumerWalletVo extends ConsumerWallet {
      * 用户手机号
      */
     private String phone;
+
+    private List<EquityFundExcessVo> equityFundExcessList;
+
+
 }

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

+package share.system.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import share.system.domain.EquityFundExcess;
+
+import java.util.Date;
+
+@Data
+public class EquityFundExcessVo extends EquityFundExcess {
+    /** 上级电话 */
+
+    private String phone;
+
+    /** 上级用户昵称 */
+    private String nickName;
+
+    /** 下级电话 */
+
+    private String newPhone;
+
+    /** 下级用户昵称 */
+    private String newNickName;
+
+    /** 上级用户头像 */
+    private String avatar;
+
+    /** 下级用户头像 */
+    private String newAvatar;
+
+    /**
+     * 开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    private Date startDate;
+
+    /**
+     * 结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    private Date endDate;
+}

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

+package share.system.domain.vo;
+
+import lombok.Data;
+import share.common.annotation.Excel;
+import share.system.domain.EquityFundLog;
+@Data
+public class EquityFundLogVo extends EquityFundLog {
+    /** 上级电话 */
+    private String phone;
+
+    /** 上级账号 */
+    private String account;
+
+    /** 上级用户昵称 */
+    private String nickName;
+
+    /** 下级电话 */
+
+    private String newPhone;
+
+    /** 下级账号 */
+    private String newAccount;
+
+    /** 下级用户昵称 */
+    private String newNickName;
+
+    /** 上级用户头像 */
+    private String avatar;
+
+    /** 下级用户头像 */
+    private String newAvatar;
+}

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

@@ -38,10 +38,19 @@ public class SConsumerVo extends SConsumer {
 
     private ConsumerMember consumerMember;
 
-    private ConsumerWallet consumerWallet;
+    private ConsumerWalletVo consumerWallet;
 
     private MemberConfigVo memberConfig;
 
+    private Integer pageNum;
+    private Integer pageSize;
+
+    private Long newId;
+
+
+
+
+
     private List<ConsumerMonthlyCardVo> monthlyCardList;
 
     private List<ConsumerSecondaryCardVo> secondaryCardList;

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

+package share.system.domain.vo;
+
+import lombok.Data;
+import share.system.domain.SharingActivities;
+
+@Data
+public class SharingActivitiesVo extends SharingActivities {
+
+    /** 上级用户头像 */
+
+    private String avatar;
+
+    /** 下级用户头像 */
+
+    private String newAvatar;
+
+    /** 上级用户昵称 */
+
+    private String nickName;
+
+    /** 下级用户昵称 */
+
+    private String newNickName;
+
+    /** 上级电话 */
+
+    private String phone;
+
+    /** 下级电话 */
+
+    private String newPhone;
+
+    private Integer pageNum;
+    private Integer pageSize;
+
+
+
+}

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

+package share.system.mapper;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import share.system.domain.EquityFundExcess;
+
+/**
+ * 权益金过度Mapper接口
+ * 
+ * @author wuwenlong
+ * @date 2024-09-20
+ */
+public interface EquityFundExcessMapper extends BaseMapper<EquityFundExcess>
+{
+    /**
+     * 查询权益金过度
+     * 
+     * @param id 权益金过度主键
+     * @return 权益金过度
+     */
+    public EquityFundExcess selectEquityFundExcessById(Long id);
+
+    /**
+     * 查询权益金过度列表
+     * 
+     * @param equityFundExcess 权益金过度
+     * @return 权益金过度集合
+     */
+    public List<EquityFundExcess> selectEquityFundExcessList(EquityFundExcess equityFundExcess);
+
+    /**
+     * 新增权益金过度
+     * 
+     * @param equityFundExcess 权益金过度
+     * @return 结果
+     */
+    public int insertEquityFundExcess(EquityFundExcess equityFundExcess);
+
+    /**
+     * 修改权益金过度
+     * 
+     * @param equityFundExcess 权益金过度
+     * @return 结果
+     */
+    public int updateEquityFundExcess(EquityFundExcess equityFundExcess);
+
+    /**
+     * 删除权益金过度
+     * 
+     * @param id 权益金过度主键
+     * @return 结果
+     */
+    public int deleteEquityFundExcessById(Long id);
+
+    /**
+     * 批量删除权益金过度
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteEquityFundExcessByIds(Long[] ids);
+}

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

+package share.system.service;
+
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.IService;
+import share.common.core.page.TableDataInfo;
+import share.system.domain.EquityFundExcess;
+import share.system.domain.SOrder;
+import share.system.domain.vo.EquityFundExcessVo;
+
+/**
+ * 权益金过度Service接口
+ * 
+ * @author wuwenlong
+ * @date 2024-09-20
+ */
+public interface EquityFundExcessService extends IService<EquityFundExcess>
+{
+    /**
+     * 查询权益金过度
+     * 
+     * @param id 权益金过度主键
+     * @return 权益金过度
+     */
+    public EquityFundExcess selectEquityFundExcessById(Long id);
+
+    /**
+     * 查询权益金过度列表
+     * 
+     * @param equityFundExcess 权益金过度
+     * @return 权益金过度集合
+     */
+    public List<EquityFundExcess> selectEquityFundExcessList(EquityFundExcess equityFundExcess);
+
+    /**
+     * 新增权益金过度
+     * 
+     * @param equityFundExcess 权益金过度
+     * @return 结果
+     */
+    public int insertEquityFundExcess(EquityFundExcess equityFundExcess);
+
+    /**
+     * 修改权益金过度
+     * 
+     * @param equityFundExcess 权益金过度
+     * @return 结果
+     */
+    public int updateEquityFundExcess(EquityFundExcess equityFundExcess);
+
+    /**
+     * 批量删除权益金过度
+     * 
+     * @param ids 需要删除的权益金过度主键集合
+     * @return 结果
+     */
+    public int deleteEquityFundExcessByIds(Long[] ids);
+
+    /**
+     * 删除权益金过度信息
+     * 
+     * @param id 权益金过度主键
+     * @return 结果
+     */
+    public int deleteEquityFundExcessById(Long id);
+
+    List<EquityFundExcessVo> selectEquityFundExcessVoList(Long id);
+
+    TableDataInfo pageList(TableDataInfo dataTable, EquityFundExcessVo equityFundExcess);
+
+    void extracted(SOrder sOrder);
+}

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

@@ -2,7 +2,10 @@ package share.system.service;
 
 import java.util.List;
 import com.baomidou.mybatisplus.extension.service.IService;
+import share.common.core.page.TableDataInfo;
 import share.system.domain.EquityFundLog;
+import share.system.domain.vo.EquityFundLogVo;
+import share.system.domain.vo.SharingActivitiesVo;
 
 /**
  * 权益金记录Service接口
@@ -63,4 +66,8 @@ public interface EquityFundLogService extends IService<EquityFundLog>
     List<EquityFundLog> selectEquityFundLogByUid(Long uid);
 
     List<EquityFundLog> selectEquityFundLogByNewUid(Long newUid);
+
+    TableDataInfo pageList(TableDataInfo info, EquityFundLogVo sharingActivities);
+
+
 }

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

 package share.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import share.common.core.page.TableDataInfo;
 import share.system.domain.SConsumer;
 import share.system.domain.vo.SConsumerVo;
 import share.system.request.RegisterThirdSConsumerRequest;
@@ -128,4 +129,7 @@ public interface SConsumerService extends IService<SConsumer>
     boolean unbind(SConsumer request);
 
     boolean bind(SConsumer request);
+
+    TableDataInfo selectConsumernotById(SConsumerVo sConsumer);
+
 }

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

@@ -3,7 +3,9 @@ package share.system.service;
 import java.util.List;
 import com.baomidou.mybatisplus.extension.service.IService;
 import share.common.core.domain.AjaxResult;
+import share.common.core.page.TableDataInfo;
 import share.system.domain.SharingActivities;
+import share.system.domain.vo.SharingActivitiesVo;
 
 /**
  * 分享活动绑定关系Service接口
@@ -62,4 +64,7 @@ public interface SharingActivitiesService extends IService<SharingActivities>
     public int deleteSharingActivitiesById(Long id);
 
 
+    int selectSharingActivitiesCount(SharingActivities sharingActivities);
+
+    TableDataInfo pageList(TableDataInfo info,SharingActivitiesVo sharingActivities);
 }

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

 package share.system.service.impl;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.BeanUtils;
+import share.common.core.page.TableDataInfo;
 import share.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import share.common.utils.StringUtils;
+import share.system.domain.SConsumer;
+import share.system.domain.vo.EquityFundLogVo;
 import share.system.mapper.EquityFundLogMapper;
 import share.system.domain.EquityFundLog;
 import share.system.service.EquityFundLogService;
+import share.system.service.SConsumerService;
 
 /**
  * 权益金记录Service业务层处理
@@ -23,6 +36,9 @@ public class EquityFundLogServiceImpl extends ServiceImpl<EquityFundLogMapper, E
     @Autowired
     private EquityFundLogMapper equityFundLogMapper;
 
+    @Autowired
+    private SConsumerService sConsumerService;
+
     /**
      * 查询权益金记录
      * 
@@ -44,6 +60,8 @@ public class EquityFundLogServiceImpl extends ServiceImpl<EquityFundLogMapper, E
     @Override
     public List<EquityFundLog> selectEquityFundLogList(EquityFundLog equityFundLog)
     {
+
+
         return equityFundLogMapper.selectEquityFundLogList(equityFundLog);
     }
 
@@ -108,4 +126,59 @@ public class EquityFundLogServiceImpl extends ServiceImpl<EquityFundLogMapper, E
 
         return equityFundLogMapper.selectList(new LambdaQueryWrapper<EquityFundLog>().eq(EquityFundLog::getNewUid,newUid));
     }
+
+    @Override
+    public TableDataInfo pageList(TableDataInfo info, EquityFundLogVo equityFundLog) {
+
+
+        List<EquityFundLogVo> voList = new ArrayList<>();
+        List<EquityFundLog> activities =(List<EquityFundLog>) info.getRows();
+        if (CollectionUtils.isEmpty(activities))  return info;
+        List<Long> collect = activities.stream().map(EquityFundLog::getNewUid).collect(Collectors.toList());
+        List<Long> uids = activities.stream().map(EquityFundLog::getUid).collect(Collectors.toList());
+        LambdaQueryWrapper<SConsumer> newSConsumer =  new LambdaQueryWrapper<SConsumer>();
+        LambdaQueryWrapper<SConsumer> uSConsumer =  new LambdaQueryWrapper<SConsumer>();
+        newSConsumer.in(SConsumer::getId, collect);
+        uSConsumer.in(SConsumer::getId, uids);
+        if(StringUtils.isNotEmpty(equityFundLog.getNewNickName())){
+            newSConsumer.like(SConsumer::getNickName,equityFundLog.getNewNickName());
+        }
+        if(StringUtils.isNotEmpty(equityFundLog.getNewPhone())){
+            newSConsumer.like(SConsumer::getPhone,equityFundLog.getNewPhone());
+        }
+        if(StringUtils.isNotEmpty(equityFundLog.getNickName())){
+            uSConsumer.like(SConsumer::getNickName,equityFundLog.getNickName());
+        }
+        if(StringUtils.isNotEmpty(equityFundLog.getPhone())){
+            uSConsumer.like(SConsumer::getPhone,equityFundLog.getPhone());
+        }
+        Map<Long,SConsumer> newUserMap = sConsumerService.list(newSConsumer)
+                .stream().collect(Collectors.toMap(SConsumer::getId, Function.identity()));
+        Map<Long,SConsumer> userMap = sConsumerService.list(uSConsumer)
+                .stream().collect(Collectors.toMap(SConsumer::getId, Function.identity()));
+        activities.stream().forEach(item ->{
+            EquityFundLogVo vo = new EquityFundLogVo();
+            BeanUtils.copyProperties(item, vo);
+            Set<Long> longs = userMap.keySet();
+            Set<Long> longs1 = newUserMap.keySet();
+            if (!(longs.contains(item.getUid()) && longs1.contains(item.getNewUid()))){
+                return;
+            }
+            SConsumer newConsumer = newUserMap.get(item.getNewUid());
+            SConsumer uConsumer = userMap.get(item.getUid());
+            if(ObjectUtil.isNotEmpty(newConsumer)){
+                vo.setNewAvatar(StringUtils.isNotEmpty(newConsumer.getAvatar()) ?  newConsumer.getAvatar():"");
+                vo.setNewNickName(StringUtils.isNotEmpty(newConsumer.getNickName()) ?  newConsumer.getNickName():"");
+                vo.setNewPhone(StringUtils.isNotEmpty(newConsumer.getPhone()) ?  newConsumer.getPhone():"");
+            }
+            if(ObjectUtil.isNotEmpty(uConsumer)){
+                vo.setAvatar(StringUtils.isNotEmpty(uConsumer.getAvatar()) ?  uConsumer.getAvatar():"");
+                vo.setNickName(StringUtils.isNotEmpty(uConsumer.getNickName()) ?  uConsumer.getNickName():"");
+                vo.setPhone(StringUtils.isNotEmpty(uConsumer.getPhone()) ?  uConsumer.getPhone():"");
+            }
+            voList.add(vo);
+        });
+        info.setRows(voList);
+        return info;
+    }
 }

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

@@ -128,7 +128,7 @@ public class OpenInterfaceServiceImpl implements OpenInterfaceService {
                 throw new BaseException("房间当前时段已被占用不可开门！");
             }
 
-            //判断预约时间是否到达，可提前30分钟开门
+            //判断预约时间是否到达，可提前60分钟开门
             if (DateUtils.addMinutes(sOrder.getPreStartDate(), Constants.OPEN_DOOR_AHEAD_HOUR_MINUS).compareTo(new Date()) > 0) {
                 throw new BaseException("预约时间未到达，可提前" + Constants.OPEN_DOOR_AHEAD_HOUR + "分钟进场，请耐心等候！");
             }

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

@@ -316,12 +316,12 @@ public class SConsumerCenterServiceImpl extends ServiceImpl<SConsumerMapper, SCo
                     SConsumer newConsumer =  sConsumerService.selectSConsumerById(id);
                     SharingActivities sharingActivities = new SharingActivities();
                     sharingActivities.setUid(uid);
-                    sharingActivities.setPhone(consumer.getPhone());
-                    sharingActivities.setAvatar(consumer.getAvatar());
-                    sharingActivities.setNickName(consumer.getNickName());
-                    sharingActivities.setNewPhone(newConsumer.getPhone());
-                    sharingActivities.setNewAvatar(newConsumer.getAvatar());
-                    sharingActivities.setNewNickName(newConsumer.getNickName());
+//                    sharingActivities.setPhone(consumer.getPhone());
+//                    sharingActivities.setAvatar(consumer.getAvatar());
+//                    sharingActivities.setNickName(consumer.getNickName());
+//                    sharingActivities.setNewPhone(newConsumer.getPhone());
+//                    sharingActivities.setNewAvatar(newConsumer.getAvatar());
+//                    sharingActivities.setNewNickName(newConsumer.getNickName());
                     sharingActivities.setNewUid(id);
                     sharingActivities.setCreateTime(DateUtils.getNowDate());
                     sharingActivitiesService.insertSharingActivities(sharingActivities);

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

@@ -13,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import share.common.constant.SmsConstants;
+import share.common.core.page.TableDataInfo;
 import share.common.enums.ConsumerCouponUseStatusEnum;
 import share.common.enums.PositionEnum;
 import share.common.enums.RoleTypeEnum;
@@ -22,15 +23,19 @@ import share.common.utils.BaseUtil;
 import share.common.utils.DateUtil;
 import share.common.utils.DateUtils;
 import share.system.domain.*;
-import share.system.domain.vo.*;
+import share.system.domain.vo.FrontTokenComponent;
+import share.system.domain.vo.MemberConfigVo;
+import share.system.domain.vo.SConsumerVo;
 import share.system.mapper.SConsumerMapper;
 import share.system.mapper.SStoreConsumerMapper;
 import share.system.request.RegisterThirdSConsumerRequest;
 import share.system.service.*;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 会员用户Service业务层处理
@@ -63,6 +68,15 @@ public class SConsumerServiceImpl extends ServiceImpl<SConsumerMapper, SConsumer
     @Autowired
     private ConsumerMonthlyCardService consumerMonthlyCardService;
 
+
+    @Autowired
+    private SConsumerService sConsumerService;
+
+    @Autowired
+    private EquityFundExcessService equityFundExcessService;
+
+
+
     /**
      * 查询会员用户
      * 
@@ -240,7 +254,16 @@ public class SConsumerServiceImpl extends ServiceImpl<SConsumerMapper, SConsumer
             vo.setMemberConfig(memberConfigVo);
         }
         if (ObjectUtil.isNotEmpty(consumerWallet)) {
-            vo.setConsumerWallet(consumerWallet);
+            List<EquityFundExcessVo> equityFundExcessVos =
+                    equityFundExcessService.selectEquityFundExcessVoList(currentUser.getId());
+            ConsumerWalletVo consumerWalletVo = new ConsumerWalletVo();
+            BeanUtils.copyProperties(consumerWallet, consumerWalletVo);
+            if (CollectionUtils.isEmpty(equityFundExcessVos)){
+                consumerWalletVo.setEquityFundExcessList(new ArrayList<>());
+            }else {
+                consumerWalletVo.setEquityFundExcessList(equityFundExcessVos);
+            }
+            vo.setConsumerWallet(consumerWalletVo);
         }
         List<Long> longList = storeConsumerMapper.selectByConsumerId(currentUser.getId(), PositionEnum.CLEANER.getCode());
         if (CollectionUtils.isEmpty(longList)) {

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

 package share.system.service.impl;
 
 import java.time.YearMonth;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.poi.hssf.record.DVALRecord;
+import org.springframework.beans.BeanUtils;
 import org.springframework.data.redis.core.RedisTemplate;
 import share.common.core.domain.AjaxResult;
+import share.common.core.page.TableDataInfo;
 import share.common.core.redis.RedisUtil;
 import share.common.enums.ReceiptRdeisEnum;
 import share.common.enums.YesNoEnum;
 import share.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import share.common.utils.StringUtils;
 import share.system.domain.SConsumer;
+import share.system.domain.vo.SharingActivitiesVo;
 import share.system.mapper.SharingActivitiesMapper;
 import share.system.domain.SharingActivities;
 import share.system.service.SConsumerService;
 import share.system.service.SharingActivitiesService;
 
+import javax.annotation.Resource;
+
 /**
  * 分享活动绑定关系Service业务层处理
  * 
@@ -30,7 +39,7 @@ import share.system.service.SharingActivitiesService;
 @Service
 public class SharingActivitiesServiceImpl extends ServiceImpl<SharingActivitiesMapper, SharingActivities> implements SharingActivitiesService
 {
-    @Autowired
+    @Resource
     private SharingActivitiesMapper sharingActivitiesMapper;
 
     @Autowired
@@ -39,6 +48,10 @@ public class SharingActivitiesServiceImpl extends ServiceImpl<SharingActivitiesM
     @Autowired
     private RedisTemplate redisTemplate;
 
+    @Autowired
+    private SConsumerService sConsumerService;
+
+
     /**
      * 查询分享活动绑定关系
      * 
@@ -60,6 +73,8 @@ public class SharingActivitiesServiceImpl extends ServiceImpl<SharingActivitiesM
     @Override
     public List<SharingActivities> selectSharingActivitiesList(SharingActivities sharingActivities)
     {
+
+
         return sharingActivitiesMapper.selectSharingActivitiesList(sharingActivities);
     }
 
@@ -88,9 +103,9 @@ public class SharingActivitiesServiceImpl extends ServiceImpl<SharingActivitiesM
     {
         SConsumer consumer =  consumerService.selectSConsumerById(sharingActivities.getUid());
         sharingActivities.setUpdateTime(DateUtils.getNowDate());
-        sharingActivities.setAvatar(consumer.getAvatar());
-        sharingActivities.setPhone(consumer.getPhone());
-        sharingActivities.setNickName(consumer.getNickName());
+//        sharingActivities.setAvatar(consumer.getAvatar());
+//        sharingActivities.setPhone(consumer.getPhone());
+//        sharingActivities.setNickName(consumer.getNickName());
         return sharingActivitiesMapper.updateSharingActivities(sharingActivities);
     }
 
@@ -118,6 +133,70 @@ public class SharingActivitiesServiceImpl extends ServiceImpl<SharingActivitiesM
         return sharingActivitiesMapper.deleteSharingActivitiesById(id);
     }
 
+    @Override
+    public int selectSharingActivitiesCount(SharingActivities sharingActivities) {
+
+        return sharingActivitiesMapper.selectCount(new LambdaQueryWrapper<SharingActivities>()
+                .eq(SharingActivities::getUid,sharingActivities.getUid())
+                .eq(SharingActivities::getIsDelete,YesNoEnum.no.getIndex()));
+    }
+
+    @Override
+    public TableDataInfo pageList(TableDataInfo info,SharingActivitiesVo sharingActivities) {
+        List<SharingActivitiesVo> voList = new ArrayList<>();
+        List<SharingActivities> activities =(List<SharingActivities>) info.getRows();
+        if (CollectionUtils.isEmpty(activities)){
+            return info;
+        }
+        List<Long> collect = activities.stream().map(SharingActivities::getNewUid).collect(Collectors.toList());
+        List<Long> uids = activities.stream().map(SharingActivities::getUid).collect(Collectors.toList());
+        LambdaQueryWrapper<SConsumer> newSConsumer =  new LambdaQueryWrapper<SConsumer>();
+        LambdaQueryWrapper<SConsumer> uSConsumer =  new LambdaQueryWrapper<SConsumer>();
+        newSConsumer.in(SConsumer::getId, collect);
+        uSConsumer.in(SConsumer::getId, uids);
+        if(StringUtils.isNotEmpty(sharingActivities.getNewNickName())){
+            newSConsumer.like(SConsumer::getNickName,sharingActivities.getNewNickName());
+        }
+        if(StringUtils.isNotEmpty(sharingActivities.getNewPhone())){
+            newSConsumer.like(SConsumer::getPhone,sharingActivities.getNewPhone());
+        }
+
+        if(StringUtils.isNotEmpty(sharingActivities.getNickName())){
+            uSConsumer.like(SConsumer::getNickName,sharingActivities.getNickName());
+        }
+        if(StringUtils.isNotEmpty(sharingActivities.getPhone())){
+            uSConsumer.like(SConsumer::getPhone,sharingActivities.getPhone());
+        }
+
+        Map<Long,SConsumer> newUserMap = sConsumerService.list(newSConsumer)
+                .stream().collect(Collectors.toMap(SConsumer::getId, Function.identity()));
+        Map<Long,SConsumer> userMap = sConsumerService.list(uSConsumer)
+                .stream().collect(Collectors.toMap(SConsumer::getId, Function.identity()));
+        activities.stream().forEach(item ->{
+            SharingActivitiesVo vo = new SharingActivitiesVo();
+            BeanUtils.copyProperties(item, vo);
+            Set<Long> longs = userMap.keySet();
+            Set<Long> longs1 = newUserMap.keySet();
+            if (!(longs.contains(item.getUid()) && longs1.contains(item.getNewUid()))){
+                return;
+            }
+            SConsumer newConsumer = newUserMap.get(item.getNewUid());
+            SConsumer uConsumer = userMap.get(item.getUid());
+            if(ObjectUtil.isNotEmpty(newConsumer)){
+                vo.setNewAvatar(StringUtils.isNotEmpty(newConsumer.getAvatar()) ?  newConsumer.getAvatar():"");
+                vo.setNewNickName(StringUtils.isNotEmpty(newConsumer.getNickName()) ?  newConsumer.getNickName():"");
+                vo.setNewPhone(StringUtils.isNotEmpty(newConsumer.getPhone()) ?  newConsumer.getPhone():"");
+            }
+            if(ObjectUtil.isNotEmpty(uConsumer)){
+                vo.setAvatar(StringUtils.isNotEmpty(uConsumer.getAvatar()) ?  uConsumer.getAvatar():"");
+                vo.setNickName(StringUtils.isNotEmpty(uConsumer.getNickName()) ?  uConsumer.getNickName():"");
+                vo.setPhone(StringUtils.isNotEmpty(uConsumer.getPhone()) ?  uConsumer.getPhone():"");
+            }
+            voList.add(vo);
+        });
+        info.setRows(voList);
+        return info;
+    }
 
 
 }

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

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="share.system.mapper.EquityFundExcessMapper">
+    
+    <resultMap type="EquityFundExcess" id="EquityFundExcessResult">
+        <result property="id"    column="id"    />
+        <result property="equityFund"    column="equity_fund"    />
+        <result property="uid"    column="uid"    />
+        <result property="newUid"    column="new_uid"    />
+        <result property="outTradeNo"    column="out_trade_no"    />
+        <result property="expireTime"    column="expire_time"    />
+        <result property="isDelete"    column="is_delete"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectEquityFundExcessVo">
+        select id, equity_fund, uid, new_uid, out_trade_no, expire_time, is_delete, create_by, create_time, update_by, update_time, remark from s_equity_fund_excess
+    </sql>
+
+    <select id="selectEquityFundExcessList" parameterType="EquityFundExcess" resultMap="EquityFundExcessResult">
+        <include refid="selectEquityFundExcessVo"/>
+        where is_delete = 0
+            <if test="equityFund != null "> and equity_fund = #{equityFund}</if>
+            <if test="outTradeNo != null  and outTradeNo != ''"> and out_trade_no like concat('%', #{outTradeNo}, '%')</if>
+            <if test="startDate != null">
+                and DATE_FORMAT(expire_time, '%Y-%m-%d') &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d')
+            </if>
+            <if test="endDate != null">
+                and DATE_FORMAT(expire_time, '%Y-%m-%d') &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d')
+            </if>
+    </select>
+    
+    <select id="selectEquityFundExcessById" parameterType="Long" resultMap="EquityFundExcessResult">
+        <include refid="selectEquityFundExcessVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertEquityFundExcess" parameterType="EquityFundExcess" useGeneratedKeys="true" keyProperty="id">
+        insert into s_equity_fund_excess
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="equityFund != null">equity_fund,</if>
+            <if test="uid != null">uid,</if>
+            <if test="newUid != null">new_uid,</if>
+            <if test="outTradeNo != null">out_trade_no,</if>
+            <if test="expireTime != null">expire_time,</if>
+            <if test="isDelete != null">is_delete,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="equityFund != null">#{equityFund},</if>
+            <if test="uid != null">#{uid},</if>
+            <if test="newUid != null">#{newUid},</if>
+            <if test="outTradeNo != null">#{outTradeNo},</if>
+            <if test="expireTime != null">#{expireTime},</if>
+            <if test="isDelete != null">#{isDelete},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateEquityFundExcess" parameterType="EquityFundExcess">
+        update s_equity_fund_excess
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="equityFund != null">equity_fund = #{equityFund},</if>
+            <if test="uid != null">uid = #{uid},</if>
+            <if test="newUid != null">new_uid = #{newUid},</if>
+            <if test="outTradeNo != null">out_trade_no = #{outTradeNo},</if>
+            <if test="expireTime != null">expire_time = #{expireTime},</if>
+            <if test="isDelete != null">is_delete = #{isDelete},</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>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteEquityFundExcessById" parameterType="Long">
+        delete from s_equity_fund_excess where id = #{id}
+    </delete>
+
+    <delete id="deleteEquityFundExcessByIds" parameterType="String">
+        delete from s_equity_fund_excess where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file

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

@@ -18,23 +18,15 @@
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
         <result property="remark"    column="remark"    />
-        <result property="phone"    column="phone"    />
-        <result property="account"    column="account"    />
-        <result property="nickName"    column="nick_name"    />
-        <result property="newPhone"    column="new_phone"    />
-        <result property="newAccount"    column="new_account"    />
-        <result property="newNickName"    column="new_nick_name"    />
-        <result property="avatar"    column="avatar"    />
-        <result property="newAvatar"    column="new_avatar"    />
     </resultMap>
 
     <sql id="selectEquityFundLogVo">
-        select id, equity_fund_type, equity_fund, uid, new_uid, terminal_trace, out_trade_no, is_delete, create_by, create_time, update_by, update_time, remark, phone, account, nick_name, new_phone, new_account, new_nick_name, avatar, new_avatar from s_equity_fund_log
+        select id, equity_fund_type, equity_fund, uid, new_uid, terminal_trace, out_trade_no, is_delete, create_by, create_time, update_by, update_time, remark from s_equity_fund_log
     </sql>
 
     <select id="selectEquityFundLogList" parameterType="EquityFundLog" resultMap="EquityFundLogResult">
         <include refid="selectEquityFundLogVo"/>
-        <where>
+        where is_delete = 0
             <if test="equityFundType != null  and equityFundType != ''"> and equity_fund_type = #{equityFundType}</if>
             <if test="equityFund != null "> and equity_fund = #{equityFund}</if>
             <if test="uid != null "> and uid = #{uid}</if>
@@ -42,15 +34,7 @@
             <if test="terminalTrace != null  and terminalTrace != ''"> and terminal_trace = #{terminalTrace}</if>
             <if test="outTradeNo != null  and outTradeNo != ''"> and out_trade_no = #{outTradeNo}</if>
             <if test="isDelete != null "> and is_delete = #{isDelete}</if>
-            <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
-            <if test="account != null  and account != ''"> and account = #{account}</if>
-            <if test="nickName != null  and nickName != ''"> and nick_name like concat('%', #{nickName}, '%')</if>
-            <if test="newPhone != null  and newPhone != ''"> and new_phone = #{newPhone}</if>
-            <if test="newAccount != null  and newAccount != ''"> and new_account = #{newAccount}</if>
-            <if test="newNickName != null  and newNickName != ''"> and new_nick_name like concat('%', #{newNickName}, '%')</if>
-            <if test="avatar != null  and avatar != ''"> and avatar = #{avatar}</if>
-            <if test="newAvatar != null  and newAvatar != ''"> and new_avatar = #{newAvatar}</if>
-        </where>
+        order by create_time desc
     </select>
 
     <select id="selectEquityFundLogById" parameterType="Long" resultMap="EquityFundLogResult">
@@ -73,14 +57,6 @@
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
-            <if test="phone != null">phone,</if>
-            <if test="account != null">account,</if>
-            <if test="nickName != null">nick_name,</if>
-            <if test="newPhone != null">new_phone,</if>
-            <if test="newAccount != null">new_account,</if>
-            <if test="newNickName != null">new_nick_name,</if>
-            <if test="avatar != null">avatar,</if>
-            <if test="newAvatar != null">new_avatar,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="equityFundType != null and equityFundType != ''">#{equityFundType},</if>
@@ -95,14 +71,6 @@
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
-            <if test="phone != null">#{phone},</if>
-            <if test="account != null">#{account},</if>
-            <if test="nickName != null">#{nickName},</if>
-            <if test="newPhone != null">#{newPhone},</if>
-            <if test="newAccount != null">#{newAccount},</if>
-            <if test="newNickName != null">#{newNickName},</if>
-            <if test="avatar != null">#{avatar},</if>
-            <if test="newAvatar != null">#{newAvatar},</if>
         </trim>
     </insert>
 
@@ -121,14 +89,6 @@
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="remark != null">remark = #{remark},</if>
-            <if test="phone != null">phone = #{phone},</if>
-            <if test="account != null">account = #{account},</if>
-            <if test="nickName != null">nick_name = #{nickName},</if>
-            <if test="newPhone != null">new_phone = #{newPhone},</if>
-            <if test="newAccount != null">new_account = #{newAccount},</if>
-            <if test="newNickName != null">new_nick_name = #{newNickName},</if>
-            <if test="avatar != null">avatar = #{avatar},</if>
-            <if test="newAvatar != null">new_avatar = #{newAvatar},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -126,6 +126,7 @@
         from s_consumer t1
         left join s_store_consumer t2 on t2.consumer_id = t1.id
         where t1.role_type = '1'
+          and t2.position = '1'
           and t1.id in (select consumer_id from s_store_consumer where store_id = #{storeId} and position = '1')
 
     </select>

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

@@ -15,32 +15,21 @@
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
         <result property="remark"    column="remark"    />
-        <result property="avatar"    column="avatar"    />
-        <result property="newAvatar"    column="new_avatar"    />
-        <result property="nickName"    column="nick_name"    />
-        <result property="newNickName"    column="new_nick_name"    />
-        <result property="phone"    column="phone"    />
-        <result property="newPhone"    column="new_phone"    />
     </resultMap>
 
     <sql id="selectSharingActivitiesVo">
-        select id, activity_type, uid, new_uid, is_delete, create_by, create_time, update_by, update_time, remark, avatar, new_avatar, nick_name, new_nick_name, phone, new_phone from s_sharing_activities
+        select id, activity_type, uid, new_uid, is_delete, create_by, create_time, update_by, update_time, remark
+              from s_sharing_activities
     </sql>
 
     <select id="selectSharingActivitiesList" parameterType="SharingActivities" resultMap="SharingActivitiesResult">
         <include refid="selectSharingActivitiesVo"/>
-        <where>
+        where is_delete = 0
             <if test="activityType != null  and activityType != ''"> and activity_type = #{activityType}</if>
             <if test="uid != null "> and uid = #{uid}</if>
             <if test="newUid != null "> and new_uid = #{newUid}</if>
             <if test="isDelete != null "> and is_delete = #{isDelete}</if>
-            <if test="avatar != null  and avatar != ''"> and avatar = #{avatar}</if>
-            <if test="newAvatar != null  and newAvatar != ''"> and new_avatar = #{newAvatar}</if>
-            <if test="nickName != null  and nickName != ''"> and nick_name like concat('%', #{nickName}, '%')</if>
-            <if test="newNickName != null  and newNickName != ''"> and new_nick_name like concat('%', #{newNickName}, '%')</if>
-            <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
-            <if test="newPhone != null  and newPhone != ''"> and new_phone = #{newPhone}</if>
-        </where>
+        order by create_time desc
     </select>
 
     <select id="selectSharingActivitiesById" parameterType="Long" resultMap="SharingActivitiesResult">
@@ -60,12 +49,6 @@
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
-            <if test="avatar != null">avatar,</if>
-            <if test="newAvatar != null">new_avatar,</if>
-            <if test="nickName != null">nick_name,</if>
-            <if test="newNickName != null">new_nick_name,</if>
-            <if test="phone != null">phone,</if>
-            <if test="newPhone != null">new_phone,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="activityType != null and activityType != ''">#{activityType},</if>
@@ -77,12 +60,6 @@
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
-            <if test="avatar != null">#{avatar},</if>
-            <if test="newAvatar != null">#{newAvatar},</if>
-            <if test="nickName != null">#{nickName},</if>
-            <if test="newNickName != null">#{newNickName},</if>
-            <if test="phone != null">#{phone},</if>
-            <if test="newPhone != null">#{newPhone},</if>
         </trim>
     </insert>
 
@@ -97,13 +74,6 @@
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="remark != null">remark = #{remark},</if>
-            <if test="avatar != null">avatar = #{avatar},</if>
-            <if test="newAvatar != null">new_avatar = #{newAvatar},</if>
-            <if test="nickName != null">nick_name = #{nickName},</if>
-            <if test="newNickName != null">new_nick_name = #{newNickName},</if>
-            <if test="phone != null">phone = #{phone},</if>
-            <if test="newPhone != null">new_phone = #{newPhone},</if>
         </trim>
         where id = #{id}
     </update>