Merge branch 'test'

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

@@ -12,8 +12,6 @@ import share.system.domain.vo.SaobeiNotifyResponseVo;
 import share.system.domain.vo.SaobeiNotifyVo;
 import share.system.service.CallbackService;
 
-import javax.servlet.http.HttpServletRequest;
-
 
 /**
  * 支付回调

share-admin/src/main/java/share/web/controller/system/ConsumerMonthlyCardController.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.ConsumerMonthlyCard;
+import share.system.domain.vo.ConsumerMonthlyCardVo;
+import share.system.service.ConsumerMonthlyCardService;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 用户月卡Controller
+ *
+ * @author wuwenlong
+ * @date 2024-08-27
+ */
+@RestController
+@RequestMapping("/system/consumerMonthlyCard")
+public class ConsumerMonthlyCardController extends BaseController {
+    @Autowired
+    private ConsumerMonthlyCardService consumerMonthlyCardService;
+
+    /**
+     * 查询用户月卡列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:consumerMonthlyCard:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(ConsumerMonthlyCardVo consumerMonthlyCard) {
+        startPage();
+        List<ConsumerMonthlyCardVo> list = consumerMonthlyCardService.selectConsumerMonthlyCardList(consumerMonthlyCard);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出用户月卡列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:consumerMonthlyCard:export')")
+    @Log(title = "用户月卡", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, ConsumerMonthlyCardVo consumerMonthlyCard) {
+        List<ConsumerMonthlyCardVo> list = consumerMonthlyCardService.selectConsumerMonthlyCardList(consumerMonthlyCard);
+        ExcelUtil<ConsumerMonthlyCardVo> util = new ExcelUtil<ConsumerMonthlyCardVo>(ConsumerMonthlyCardVo.class);
+        util.exportExcel(response, list, "用户月卡数据");
+    }
+
+    /**
+     * 获取用户月卡详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:consumerMonthlyCard:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return success(consumerMonthlyCardService.selectConsumerMonthlyCardById(id));
+    }
+
+    /**
+     * 新增用户月卡
+     */
+    @PreAuthorize("@ss.hasPermi('system:consumerMonthlyCard:add')")
+    @Log(title = "用户月卡", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ConsumerMonthlyCard consumerMonthlyCard) {
+        return toAjax(consumerMonthlyCardService.insertConsumerMonthlyCard(consumerMonthlyCard));
+    }
+
+    /**
+     * 修改用户月卡
+     */
+    @PreAuthorize("@ss.hasPermi('system:consumerMonthlyCard:edit')")
+    @Log(title = "用户月卡", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody ConsumerMonthlyCard consumerMonthlyCard) {
+        return toAjax(consumerMonthlyCardService.updateConsumerMonthlyCard(consumerMonthlyCard));
+    }
+
+    /**
+     * 删除用户月卡
+     */
+    @PreAuthorize("@ss.hasPermi('system:consumerMonthlyCard:remove')")
+    @Log(title = "用户月卡", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(consumerMonthlyCardService.deleteConsumerMonthlyCardByIds(ids));
+    }
+}

share-admin/src/main/java/share/web/controller/system/ConsumerSecondaryCardController.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.ConsumerSecondaryCard;
+import share.system.domain.vo.ConsumerSecondaryCardVo;
+import share.system.service.ConsumerSecondaryCardService;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 用户次卡Controller
+ *
+ * @author wuwenlong
+ * @date 2024-08-22
+ */
+@RestController
+@RequestMapping("/system/consumerSecondaryCard")
+public class ConsumerSecondaryCardController extends BaseController {
+    @Autowired
+    private ConsumerSecondaryCardService consumerSecondaryCardService;
+
+    /**
+     * 查询用户次卡列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:consumerSecondaryCard:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(ConsumerSecondaryCardVo consumerSecondaryCard) {
+        startPage();
+        List<ConsumerSecondaryCardVo> list = consumerSecondaryCardService.selectConsumerSecondaryCardList(consumerSecondaryCard);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出用户次卡列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:consumerSecondaryCard:export')")
+    @Log(title = "用户次卡", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, ConsumerSecondaryCardVo consumerSecondaryCard) {
+        List<ConsumerSecondaryCardVo> list = consumerSecondaryCardService.selectConsumerSecondaryCardList(consumerSecondaryCard);
+        ExcelUtil<ConsumerSecondaryCardVo> util = new ExcelUtil<ConsumerSecondaryCardVo>(ConsumerSecondaryCardVo.class);
+        util.exportExcel(response, list, "用户次卡数据");
+    }
+
+    /**
+     * 获取用户次卡详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:consumerSecondaryCard:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return success(consumerSecondaryCardService.selectConsumerSecondaryCardById(id));
+    }
+
+    /**
+     * 新增用户次卡
+     */
+    @PreAuthorize("@ss.hasPermi('system:consumerSecondaryCard:add')")
+    @Log(title = "用户次卡", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ConsumerSecondaryCard consumerSecondaryCard) {
+        return toAjax(consumerSecondaryCardService.insertConsumerSecondaryCard(consumerSecondaryCard));
+    }
+
+    /**
+     * 修改用户次卡
+     */
+    @PreAuthorize("@ss.hasPermi('system:consumerSecondaryCard:edit')")
+    @Log(title = "用户次卡", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody ConsumerSecondaryCard consumerSecondaryCard) {
+        return toAjax(consumerSecondaryCardService.updateConsumerSecondaryCard(consumerSecondaryCard));
+    }
+
+    /**
+     * 删除用户次卡
+     */
+    @PreAuthorize("@ss.hasPermi('system:consumerSecondaryCard:remove')")
+    @Log(title = "用户次卡", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(consumerSecondaryCardService.deleteConsumerSecondaryCardByIds(ids));
+    }
+}

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

@@ -96,12 +96,25 @@ public class DeviceController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:device:edit')")
     @Log(title = "设备信息", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/updateDevicePassword")
+    public AjaxResult updateDevicePassword(@RequestBody Device device)
+    {
+        AjaxResult ajaxResult =  deviceService.updateRoomPassword(device);
+        return ajaxResult;
+    }
+
+    /**
+     * 修改设备信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:device:edit')")
+    @Log(title = "设备信息", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody Device device)
     {
         return toAjax(deviceService.updateDevice(device));
     }
 
+
     /**
      * 删除设备信息
      */

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

+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.EquityFundLog;
+import share.system.domain.vo.EquityFundLogVo;
+import share.system.service.EquityFundLogService;
+import share.common.utils.poi.ExcelUtil;
+import share.common.core.page.TableDataInfo;
+
+/**
+ * 权益金记录Controller
+ * 
+ * @author wuwenlong
+ * @date 2024-09-10
+ */
+@RestController
+@RequestMapping("/system/equityFundLog")
+public class EquityFundLogController extends BaseController
+{
+    @Autowired
+    private EquityFundLogService equityFundLogService;
+
+    /**
+     * 查询权益金记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:equityFundLog:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(EquityFundLogVo equityFundLog)
+    {
+        startPage();
+        List<EquityFundLog> list = equityFundLogService.selectEquityFundLogList(equityFundLog);
+        TableDataInfo dataTable = getDataTable(list);
+        return equityFundLogService.pageList(dataTable,equityFundLog);
+    }
+
+    /**
+     * 导出权益金记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:equityFundLog:export')")
+    @Log(title = "权益金记录", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, EquityFundLog equityFundLog)
+    {
+        List<EquityFundLog> list = equityFundLogService.selectEquityFundLogList(equityFundLog);
+        ExcelUtil<EquityFundLog> util = new ExcelUtil<EquityFundLog>(EquityFundLog.class);
+        util.exportExcel(response, list, "权益金记录数据");
+    }
+
+    /**
+     * 获取权益金记录详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:equityFundLog:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(equityFundLogService.selectEquityFundLogById(id));
+    }
+
+    /**
+     * 新增权益金记录
+     */
+    @PreAuthorize("@ss.hasPermi('system:equityFundLog:add')")
+    @Log(title = "权益金记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody EquityFundLog equityFundLog)
+    {
+        return toAjax(equityFundLogService.insertEquityFundLog(equityFundLog));
+    }
+
+    /**
+     * 修改权益金记录
+     */
+    @PreAuthorize("@ss.hasPermi('system:equityFundLog:edit')")
+    @Log(title = "权益金记录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody EquityFundLog equityFundLog)
+    {
+        return toAjax(equityFundLogService.updateEquityFundLog(equityFundLog));
+    }
+
+    /**
+     * 删除权益金记录
+     */
+    @PreAuthorize("@ss.hasPermi('system:equityFundLog:remove')")
+    @Log(title = "权益金记录", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(equityFundLogService.deleteEquityFundLogByIds(ids));
+    }
+}

share-admin/src/main/java/share/web/controller/system/MonthlyCardConfController.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.MonthlyCardConf;
+import share.system.service.MonthlyCardConfService;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 月卡配置Controller
+ *
+ * @author wuwenlong
+ * @date 2024-08-27
+ */
+@RestController
+@RequestMapping("/system/monthlyCardConf")
+public class MonthlyCardConfController extends BaseController {
+    @Autowired
+    private MonthlyCardConfService monthlyCardConfService;
+
+    /**
+     * 查询月卡配置列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:monthlyCardConf:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(MonthlyCardConf monthlyCardConf) {
+        startPage();
+        List<MonthlyCardConf> list = monthlyCardConfService.selectMonthlyCardConfList(monthlyCardConf);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出月卡配置列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:monthlyCardConf:export')")
+    @Log(title = "月卡配置", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, MonthlyCardConf monthlyCardConf) {
+        List<MonthlyCardConf> list = monthlyCardConfService.selectMonthlyCardConfList(monthlyCardConf);
+        ExcelUtil<MonthlyCardConf> util = new ExcelUtil<MonthlyCardConf>(MonthlyCardConf.class);
+        util.exportExcel(response, list, "月卡配置数据");
+    }
+
+    /**
+     * 获取月卡配置详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:monthlyCardConf:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return success(monthlyCardConfService.selectMonthlyCardConfById(id));
+    }
+
+    /**
+     * 新增月卡配置
+     */
+    @PreAuthorize("@ss.hasPermi('system:monthlyCardConf:add')")
+    @Log(title = "月卡配置", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody MonthlyCardConf monthlyCardConf) {
+        return toAjax(monthlyCardConfService.insertMonthlyCardConf(monthlyCardConf));
+    }
+
+    /**
+     * 修改月卡配置
+     */
+    @PreAuthorize("@ss.hasPermi('system:monthlyCardConf:edit')")
+    @Log(title = "月卡配置", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody MonthlyCardConf monthlyCardConf) {
+        return toAjax(monthlyCardConfService.updateMonthlyCardConf(monthlyCardConf));
+    }
+
+    /**
+     * 删除月卡配置
+     */
+    @PreAuthorize("@ss.hasPermi('system:monthlyCardConf:remove')")
+    @Log(title = "月卡配置", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(monthlyCardConfService.deleteMonthlyCardConfByIds(ids));
+    }
+}

share-admin/src/main/java/share/web/controller/system/MonthlyCardLogController.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.MonthlyCardLog;
+import share.system.domain.vo.MonthlyCardLogVo;
+import share.system.service.MonthlyCardLogService;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 月卡使用记录Controller
+ *
+ * @author wuwenlong
+ * @date 2024-08-27
+ */
+@RestController
+@RequestMapping("/system/monthlyCardLog")
+public class MonthlyCardLogController extends BaseController {
+    @Autowired
+    private MonthlyCardLogService monthlyCardLogService;
+
+    /**
+     * 查询月卡使用记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:monthlyCardLog:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(MonthlyCardLogVo monthlyCardLog) {
+        startPage();
+        List<MonthlyCardLogVo> list = monthlyCardLogService.selectMonthlyCardLogList(monthlyCardLog);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出月卡使用记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:monthlyCardLog:export')")
+    @Log(title = "月卡使用记录", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, MonthlyCardLogVo monthlyCardLog) {
+        List<MonthlyCardLogVo> list = monthlyCardLogService.selectMonthlyCardLogList(monthlyCardLog);
+        ExcelUtil<MonthlyCardLogVo> util = new ExcelUtil<MonthlyCardLogVo>(MonthlyCardLogVo.class);
+        util.exportExcel(response, list, "月卡使用记录数据");
+    }
+
+    /**
+     * 获取月卡使用记录详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:monthlyCardLog:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return success(monthlyCardLogService.selectMonthlyCardLogById(id));
+    }
+
+    /**
+     * 新增月卡使用记录
+     */
+    @PreAuthorize("@ss.hasPermi('system:monthlyCardLog:add')")
+    @Log(title = "月卡使用记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody MonthlyCardLog monthlyCardLog) {
+        return toAjax(monthlyCardLogService.insertMonthlyCardLog(monthlyCardLog));
+    }
+
+    /**
+     * 修改月卡使用记录
+     */
+    @PreAuthorize("@ss.hasPermi('system:monthlyCardLog:edit')")
+    @Log(title = "月卡使用记录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody MonthlyCardLog monthlyCardLog) {
+        return toAjax(monthlyCardLogService.updateMonthlyCardLog(monthlyCardLog));
+    }
+
+    /**
+     * 删除月卡使用记录
+     */
+    @PreAuthorize("@ss.hasPermi('system:monthlyCardLog:remove')")
+    @Log(title = "月卡使用记录", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(monthlyCardLogService.deleteMonthlyCardLogByIds(ids));
+    }
+}

share-admin/src/main/java/share/web/controller/system/MonthlyCardOrderController.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.MonthlyCardOrder;
+import share.system.domain.vo.MonthlyCardOrderVo;
+import share.system.service.MonthlyCardOrderService;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 月卡订单Controller
+ *
+ * @author wuwenlong
+ * @date 2024-08-27
+ */
+@RestController
+@RequestMapping("/system/monthlyCardOrder")
+public class MonthlyCardOrderController extends BaseController {
+    @Autowired
+    private MonthlyCardOrderService monthlyCardOrderService;
+
+    /**
+     * 查询月卡订单列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:monthlyCardOrder:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(MonthlyCardOrderVo monthlyCardOrder) {
+        startPage();
+        List<MonthlyCardOrderVo> list = monthlyCardOrderService.selectMonthlyCardOrderList(monthlyCardOrder);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出月卡订单列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:monthlyCardOrder:export')")
+    @Log(title = "月卡订单", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, MonthlyCardOrderVo monthlyCardOrder) {
+        List<MonthlyCardOrderVo> list = monthlyCardOrderService.selectMonthlyCardOrderList(monthlyCardOrder);
+        ExcelUtil<MonthlyCardOrderVo> util = new ExcelUtil<MonthlyCardOrderVo>(MonthlyCardOrderVo.class);
+        util.exportExcel(response, list, "月卡订单数据");
+    }
+
+    /**
+     * 获取月卡订单详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:monthlyCardOrder:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return success(monthlyCardOrderService.selectMonthlyCardOrderById(id));
+    }
+
+    /**
+     * 新增月卡订单
+     */
+    @PreAuthorize("@ss.hasPermi('system:monthlyCardOrder:add')")
+    @Log(title = "月卡订单", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody MonthlyCardOrder monthlyCardOrder) {
+        return toAjax(monthlyCardOrderService.insertMonthlyCardOrder(monthlyCardOrder));
+    }
+
+    /**
+     * 修改月卡订单
+     */
+    @PreAuthorize("@ss.hasPermi('system:monthlyCardOrder:edit')")
+    @Log(title = "月卡订单", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody MonthlyCardOrder monthlyCardOrder) {
+        return toAjax(monthlyCardOrderService.updateMonthlyCardOrder(monthlyCardOrder));
+    }
+
+    /**
+     * 删除月卡订单
+     */
+    @PreAuthorize("@ss.hasPermi('system:monthlyCardOrder:remove')")
+    @Log(title = "月卡订单", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(monthlyCardOrderService.deleteMonthlyCardOrderByIds(ids));
+    }
+}

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/SecondaryCardConfController.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.SecondaryCardConf;
+import share.system.domain.vo.SecondaryCardConfVo;
+import share.system.service.SecondaryCardConfService;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 次卡配置Controller
+ *
+ * @author wuwenlong
+ * @date 2024-08-22
+ */
+@RestController
+@RequestMapping("/system/secondaryCardConf")
+public class SecondaryCardConfController extends BaseController {
+    @Autowired
+    private SecondaryCardConfService secondaryCardConfService;
+
+    /**
+     * 查询次卡配置列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:secondaryCardConf:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SecondaryCardConfVo secondaryCardConf) {
+        startPage();
+        List<SecondaryCardConfVo> list = secondaryCardConfService.selectSecondaryCardConfList(secondaryCardConf);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出次卡配置列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:secondaryCardConf:export')")
+    @Log(title = "次卡配置", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SecondaryCardConfVo secondaryCardConf) {
+        List<SecondaryCardConfVo> list = secondaryCardConfService.selectSecondaryCardConfList(secondaryCardConf);
+        ExcelUtil<SecondaryCardConfVo> util = new ExcelUtil<SecondaryCardConfVo>(SecondaryCardConfVo.class);
+        util.exportExcel(response, list, "次卡配置数据");
+    }
+
+    /**
+     * 获取次卡配置详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:secondaryCardConf:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return success(secondaryCardConfService.selectSecondaryCardConfById(id));
+    }
+
+    /**
+     * 新增次卡配置
+     */
+    @PreAuthorize("@ss.hasPermi('system:secondaryCardConf:add')")
+    @Log(title = "次卡配置", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SecondaryCardConf secondaryCardConf) {
+        return toAjax(secondaryCardConfService.insertSecondaryCardConf(secondaryCardConf));
+    }
+
+    /**
+     * 修改次卡配置
+     */
+    @PreAuthorize("@ss.hasPermi('system:secondaryCardConf:edit')")
+    @Log(title = "次卡配置", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SecondaryCardConf secondaryCardConf) {
+        return toAjax(secondaryCardConfService.updateSecondaryCardConf(secondaryCardConf));
+    }
+
+    /**
+     * 删除次卡配置
+     */
+    @PreAuthorize("@ss.hasPermi('system:secondaryCardConf:remove')")
+    @Log(title = "次卡配置", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(secondaryCardConfService.deleteSecondaryCardConfByIds(ids));
+    }
+}

share-admin/src/main/java/share/web/controller/system/SecondaryCardLogController.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.SecondaryCardLog;
+import share.system.domain.vo.SecondaryCardLogVo;
+import share.system.service.SecondaryCardLogService;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 次卡使用记录Controller
+ *
+ * @author wuwenlong
+ * @date 2024-08-22
+ */
+@RestController
+@RequestMapping("/system/secondaryCardLog")
+public class SecondaryCardLogController extends BaseController {
+    @Autowired
+    private SecondaryCardLogService secondaryCardLogService;
+
+    /**
+     * 查询次卡使用记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:secondaryCardLog:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SecondaryCardLogVo secondaryCardLog) {
+        startPage();
+        List<SecondaryCardLogVo> list = secondaryCardLogService.selectSecondaryCardLogList(secondaryCardLog);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出次卡使用记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:secondaryCardLog:export')")
+    @Log(title = "次卡使用记录", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SecondaryCardLogVo secondaryCardLog) {
+        List<SecondaryCardLogVo> list = secondaryCardLogService.selectSecondaryCardLogList(secondaryCardLog);
+        ExcelUtil<SecondaryCardLogVo> util = new ExcelUtil<SecondaryCardLogVo>(SecondaryCardLogVo.class);
+        util.exportExcel(response, list, "次卡使用记录数据");
+    }
+
+    /**
+     * 获取次卡使用记录详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:secondaryCardLog:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return success(secondaryCardLogService.selectSecondaryCardLogById(id));
+    }
+
+    /**
+     * 新增次卡使用记录
+     */
+    @PreAuthorize("@ss.hasPermi('system:secondaryCardLog:add')")
+    @Log(title = "次卡使用记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SecondaryCardLog secondaryCardLog) {
+        return toAjax(secondaryCardLogService.insertSecondaryCardLog(secondaryCardLog));
+    }
+
+    /**
+     * 修改次卡使用记录
+     */
+    @PreAuthorize("@ss.hasPermi('system:secondaryCardLog:edit')")
+    @Log(title = "次卡使用记录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SecondaryCardLog secondaryCardLog) {
+        return toAjax(secondaryCardLogService.updateSecondaryCardLog(secondaryCardLog));
+    }
+
+    /**
+     * 删除次卡使用记录
+     */
+    @PreAuthorize("@ss.hasPermi('system:secondaryCardLog:remove')")
+    @Log(title = "次卡使用记录", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(secondaryCardLogService.deleteSecondaryCardLogByIds(ids));
+    }
+}

share-admin/src/main/java/share/web/controller/system/SecondaryCardOrderController.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.SecondaryCardOrder;
+import share.system.domain.vo.SecondaryCardOrderVo;
+import share.system.service.SecondaryCardOrderService;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 次卡购买记录Controller
+ *
+ * @author wuwenlong
+ * @date 2024-08-22
+ */
+@RestController
+@RequestMapping("/system/secondaryCardOrder")
+public class SecondaryCardOrderController extends BaseController {
+    @Autowired
+    private SecondaryCardOrderService secondaryCardOrderService;
+
+    /**
+     * 查询次卡购买记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:secondaryCardOrder:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SecondaryCardOrderVo secondaryCardOrder) {
+        startPage();
+        List<SecondaryCardOrderVo> list = secondaryCardOrderService.selectSecondaryCardOrderList(secondaryCardOrder);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出次卡购买记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:secondaryCardOrder:export')")
+    @Log(title = "次卡购买记录", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SecondaryCardOrderVo secondaryCardOrder) {
+        List<SecondaryCardOrderVo> list = secondaryCardOrderService.selectSecondaryCardOrderList(secondaryCardOrder);
+        ExcelUtil<SecondaryCardOrderVo> util = new ExcelUtil<SecondaryCardOrderVo>(SecondaryCardOrderVo.class);
+        util.exportExcel(response, list, "次卡购买记录数据");
+    }
+
+    /**
+     * 获取次卡购买记录详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:secondaryCardOrder:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return success(secondaryCardOrderService.selectSecondaryCardOrderById(id));
+    }
+
+    /**
+     * 新增次卡购买记录
+     */
+    @PreAuthorize("@ss.hasPermi('system:secondaryCardOrder:add')")
+    @Log(title = "次卡购买记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SecondaryCardOrder secondaryCardOrder) {
+        return toAjax(secondaryCardOrderService.insertSecondaryCardOrder(secondaryCardOrder));
+    }
+
+    /**
+     * 修改次卡购买记录
+     */
+    @PreAuthorize("@ss.hasPermi('system:secondaryCardOrder:edit')")
+    @Log(title = "次卡购买记录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SecondaryCardOrder secondaryCardOrder) {
+        return toAjax(secondaryCardOrderService.updateSecondaryCardOrder(secondaryCardOrder));
+    }
+
+    /**
+     * 删除次卡购买记录
+     */
+    @PreAuthorize("@ss.hasPermi('system:secondaryCardOrder:remove')")
+    @Log(title = "次卡购买记录", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(secondaryCardOrderService.deleteSecondaryCardOrderByIds(ids));
+    }
+}

share-admin/src/main/java/share/web/controller/system/SharingActivitiesController.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.SharingActivities;
+import share.system.domain.vo.SharingActivitiesVo;
+import share.system.service.SharingActivitiesService;
+import share.common.utils.poi.ExcelUtil;
+import share.common.core.page.TableDataInfo;
+
+/**
+ * 分享活动绑定关系Controller
+ *
+ * @author wuwenlong
+ * @date 2024-09-02
+ */
+@RestController
+@RequestMapping("/system/activities")
+public class SharingActivitiesController extends BaseController {
+    @Autowired
+    private SharingActivitiesService sharingActivitiesService;
+
+    /**
+     * 查询分享活动绑定关系列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:activities:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SharingActivitiesVo sharingActivities) {
+        startPage();
+        List<SharingActivities> list = sharingActivitiesService.selectSharingActivitiesList(sharingActivities);
+        TableDataInfo dataTable = getDataTable(list);
+        return sharingActivitiesService.pageList(dataTable,sharingActivities);
+    }
+
+    /**
+     * 导出分享活动绑定关系列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:activities:export')")
+    @Log(title = "分享活动绑定关系", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SharingActivities sharingActivities) {
+        List<SharingActivities> list = sharingActivitiesService.selectSharingActivitiesList(sharingActivities);
+        ExcelUtil<SharingActivities> util = new ExcelUtil<SharingActivities>(SharingActivities.class);
+        util.exportExcel(response, list, "分享活动绑定关系数据");
+    }
+
+    /**
+     * 获取分享活动绑定关系详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:activities:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+
+        return success(sharingActivitiesService.selectSharingActivitiesUserById(id));
+    }
+
+    /**
+     * 新增分享活动绑定关系
+     */
+    @PreAuthorize("@ss.hasPermi('system:activities:add')")
+    @Log(title = "分享活动绑定关系", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SharingActivities sharingActivities) {
+
+        return toAjax(sharingActivitiesService.insertSharingActivities(sharingActivities));
+    }
+
+
+    /**
+     * 修改分享活动绑定关系
+     */
+    @PreAuthorize("@ss.hasPermi('system:activities:edit')")
+    @Log(title = "分享活动绑定关系", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SharingActivities sharingActivities) {
+
+        return toAjax(sharingActivitiesService.updateSharingActivities(sharingActivities));
+    }
+
+    /**
+     * 删除分享活动绑定关系
+     */
+    @PreAuthorize("@ss.hasPermi('system:activities:remove')")
+    @Log(title = "分享活动绑定关系", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(sharingActivitiesService.deleteSharingActivitiesByIds(ids));
+    }
+}

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/constant/PayConstants.java

@@ -47,4 +47,8 @@ public class PayConstants {
 
     // 扫呗支付回调地址
     public static final String SAOBEI_PAY_NOTIFY_API_URI = "/prod-api/admin/payment/callback/saobei/wechat";
+
+    // 微信商家给用户转账到零钱-回调地址
+    public static final String WX_INITIATEBATCHTRANSFER_NOTIFY_API_URI = "/prod-api/admin/payment/callback/wechat/initiateBatchTransfer";
+
 }

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

+package share.common.enums;
+
+public enum DurationTypeEnum {
+    RECHARGE(0,  "充值"),
+    ORDER(1,"订单消费"),
+    SHARE(2, "分享赠送"),
+    ORDER_REFUND(3,"订单消费退款"),
+    ;
+
+
+    private Integer code;
+    private String name;
+
+    DurationTypeEnum() {
+    }
+    DurationTypeEnum(Integer code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+    DurationTypeEnum(Integer code) {
+        this.code = code;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+}

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-common/src/main/java/share/common/enums/OrderTypeEnum.java

@@ -10,7 +10,13 @@ public enum OrderTypeEnum {
     RESERVER(1,"reserver","预定"),
     RENEW(2,"renew","续费"),
     RECHARGE(3, "recharge", "充值"),
-    RIGHTS(4, "rights", "权益");
+    RIGHTS(4, "rights", "权益"),
+    //次卡
+    SECONDARY_CARD(5, "secondary_card", "次卡"),
+    //月卡
+    MONTH_CARD(6, "month_card", "月卡"),
+    ;
+
 
     private Integer code;
     private String value;

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

@@ -4,6 +4,8 @@ public enum StoreStatusEnum {
     // 0:停业 1:正常营业
     STOP("0", "停业"),
     NORMAL("1", "正常营业"),
+    //维修中
+    REPAIR("2", "维修中"),
     ;
 
     private String index;

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

@@ -11,7 +11,6 @@ import share.common.core.page.TableDataInfo;
 import share.common.enums.YesNoEnum;
 import share.system.domain.Activity;
 import share.system.domain.vo.ActivityDto;
-import share.system.domain.vo.ActivityVo;
 import share.system.service.ActivityService;
 
 import java.util.Date;
@@ -43,7 +42,7 @@ public class ActivityController extends BaseController {
     @GetMapping("/query")
     public AjaxResult query(ActivityDto dto) {
         dto.setIsOpen(Long.valueOf(YesNoEnum.yes.getIndex()));
-        Map<Date, List<ActivityVo>> map = activityService.queryList(dto);
+        Map<Date, List<Activity>> map = activityService.queryList(dto);
         return success(map);
     }
 

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

+package share.web.controller.system;
+
+import org.springframework.beans.factory.annotation.Autowired;
+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.system.domain.vo.ConsumerMonthlyCardVo;
+import share.system.service.ConsumerMonthlyCardService;
+
+import java.util.List;
+
+/**
+ * 用户月卡Controller
+ *
+ * @author wuwenlong
+ * @date 2024-08-27
+ */
+@RestController
+@RequestMapping("/consumerMonthlyCard")
+public class ConsumerMonthlyCardController extends BaseController {
+    @Autowired
+    private ConsumerMonthlyCardService consumerMonthlyCardService;
+
+    /**
+     * 查询用户月卡列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(ConsumerMonthlyCardVo consumerMonthlyCard) {
+        startPage();
+        List<ConsumerMonthlyCardVo> list = consumerMonthlyCardService.selectConsumerMonthlyCardList(consumerMonthlyCard);
+        return getDataTable(list);
+    }
+
+
+    @GetMapping("/query")
+    public AjaxResult selectByConsumerId() {
+        return success(consumerMonthlyCardService.selectByConsumerId());
+    }
+}

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

+package share.web.controller.system;
+
+import org.springframework.beans.factory.annotation.Autowired;
+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.system.domain.vo.ConsumerSecondaryCardVo;
+import share.system.service.ConsumerSecondaryCardService;
+
+import java.util.List;
+
+/**
+ * 用户次卡Controller
+ *
+ * @author wuwenlong
+ * @date 2024-08-22
+ */
+@RestController
+@RequestMapping("/consumerSecondaryCard")
+public class ConsumerSecondaryCardController extends BaseController {
+    @Autowired
+    private ConsumerSecondaryCardService consumerSecondaryCardService;
+
+    /**
+     * 查询用户次卡列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(ConsumerSecondaryCardVo consumerSecondaryCard) {
+        startPage();
+        List<ConsumerSecondaryCardVo> list = consumerSecondaryCardService.selectConsumerSecondaryCardList(consumerSecondaryCard);
+        return getDataTable(list);
+    }
+
+    @GetMapping("/query")
+    public AjaxResult selectByConsumerId() {
+        return success(consumerSecondaryCardService.selectByConsumerId());
+    }
+
+}

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

 package share.web.controller.system;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -7,11 +8,13 @@ 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.DurationTypeEnum;
 import share.system.domain.SConsumer;
 import share.system.domain.vo.DurationLogVo;
 import share.system.domain.vo.FrontTokenComponent;
 import share.system.service.DurationLogService;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -45,4 +48,12 @@ public class DurationLogController extends BaseController {
         List<DurationLogVo> list = durationLogService.selectDurationLogList(durationLog);
         return success(list);
     }
+
+    @GetMapping("/sumVariableDuration")
+    public AjaxResult sumVariableDuration(DurationLogVo durationLog) {
+        SConsumer user = FrontTokenComponent.getWxSConsumerEntry();
+        durationLog.setConsumerId(user.getId());
+        BigDecimal  sumVariableDuration = durationLogService.sumVariableDuration(durationLog);
+        return success(sumVariableDuration);
+    }
 }

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.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.page.TableDataInfo;
+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 java.util.List;
+
+/**
+ * 权益金过度Controller
+ * 
+ * @author wuwenlong
+ * @date 2024-09-20
+ */
+@RestController
+@RequestMapping("/equityFundExcess")
+public class EquityFundExcessController extends BaseController
+{
+    @Autowired
+    private EquityFundExcessService equityFundExcessService;
+
+    /**
+     * 查询权益金过度列表
+     */
+    @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

+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.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;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 权益金记录Controller
+ * 
+ * @author wuwenlong
+ * @date 2024-09-10
+ */
+@RestController
+@RequestMapping("/equityFundLog")
+public class EquityFundLogController extends BaseController {
+    @Autowired
+    private EquityFundLogService equityFundLogService;
+
+    /**
+     * 查询本人权益金记录列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(EquityFundLogVo equityFundLog) {
+        SConsumer user = FrontTokenComponent.getWxSConsumerEntry();
+        equityFundLog.setUid(user.getId());
+        startPage();
+        List<EquityFundLog> list = equityFundLogService.selectEquityFundLogList(equityFundLog);
+        TableDataInfo dataTable = getDataTable(list);
+        return equityFundLogService.pageList(dataTable,equityFundLog);
+    }
+
+
+
+
+}

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

+package share.web.controller.system;
+
+import org.springframework.beans.factory.annotation.Autowired;
+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.R;
+import share.common.core.page.TableDataInfo;
+import share.system.domain.MonthlyCardConf;
+import share.system.service.MonthlyCardConfService;
+
+import java.util.List;
+
+/**
+ * 月卡配置Controller
+ *
+ * @author wuwenlong
+ * @date 2024-08-27
+ */
+@RestController
+@RequestMapping("/monthlyCardConf")
+public class MonthlyCardConfController extends BaseController {
+    @Autowired
+    private MonthlyCardConfService monthlyCardConfService;
+
+    /**
+     * 查询月卡配置列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(MonthlyCardConf monthlyCardConf) {
+        startPage();
+        List<MonthlyCardConf> list = monthlyCardConfService.selectMonthlyCardConfList(monthlyCardConf);
+        return getDataTable(list);
+    }
+
+
+    /**
+     * 查询月卡配置列表
+     */
+    @GetMapping("/query")
+    public R<List<MonthlyCardConf>> query() {
+        return R.ok(monthlyCardConfService.selectMonthlyCardConfList(null));
+    }
+
+}

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

+package share.web.controller.system;
+
+import org.springframework.beans.factory.annotation.Autowired;
+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.system.domain.SConsumer;
+import share.system.domain.vo.FrontTokenComponent;
+import share.system.domain.vo.MonthlyCardLogVo;
+import share.system.service.MonthlyCardLogService;
+
+import java.util.List;
+
+/**
+ * 月卡使用记录Controller
+ *
+ * @author wuwenlong
+ * @date 2024-08-27
+ */
+@RestController
+@RequestMapping("/monthlyCardLog")
+public class MonthlyCardLogController extends BaseController {
+    @Autowired
+    private MonthlyCardLogService monthlyCardLogService;
+
+    /**
+     * 查询月卡使用记录列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(MonthlyCardLogVo monthlyCardLog) {
+        startPage();
+        SConsumer user = FrontTokenComponent.getWxSConsumerEntry();
+        monthlyCardLog.setConsumerId(user.getId());
+        List<MonthlyCardLogVo> list = monthlyCardLogService.selectMonthlyCardLogList(monthlyCardLog);
+        return getDataTable(list);
+    }
+
+    @GetMapping("/query")
+    public AjaxResult query(MonthlyCardLogVo monthlyCardLog) {
+        SConsumer user = FrontTokenComponent.getWxSConsumerEntry();
+        monthlyCardLog.setConsumerId(user.getId());
+        return success(monthlyCardLogService.selectMonthlyCardLogList(monthlyCardLog));
+    }
+
+}

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

+package share.web.controller.system;
+
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import share.common.core.controller.BaseController;
+import share.common.core.domain.AjaxResult;
+import share.common.core.domain.R;
+import share.common.core.page.TableDataInfo;
+import share.common.core.redis.RedisUtil;
+import share.common.enums.YesNoEnum;
+import share.common.utils.JsonConvertUtil;
+import share.system.domain.SConsumer;
+import share.system.domain.vo.FrontTokenComponent;
+import share.system.domain.vo.MonthlyCardOrderVo;
+import share.system.request.CreateMonthlyCardRequest;
+import share.system.response.MonthlyyCardPayResultResponse;
+import share.system.service.MonthlyCardOrderService;
+
+import java.util.List;
+
+/**
+ * 月卡订单Controller
+ *
+ * @author wuwenlong
+ * @date 2024-08-27
+ */
+@Slf4j
+@RestController
+@RequestMapping("/monthlyCardOrder")
+public class MonthlyCardOrderController extends BaseController {
+    @Autowired
+    private MonthlyCardOrderService monthlyCardOrderService;
+    @Autowired
+    private RedisUtil redisUtil;
+
+    /**
+     * 查询月卡订单列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(MonthlyCardOrderVo monthlyCardOrder) {
+        startPage();
+        SConsumer user = FrontTokenComponent.getWxSConsumerEntry();
+        monthlyCardOrder.setConsumerId(user.getId());
+        monthlyCardOrder.setPayStatus(YesNoEnum.yes.getIndex());
+        List<MonthlyCardOrderVo> list = monthlyCardOrderService.selectMonthlyCardOrderList(monthlyCardOrder);
+        return getDataTable(list);
+    }
+
+    @GetMapping("/query")
+    public AjaxResult query(MonthlyCardOrderVo monthlyCardOrder) {
+        SConsumer user = FrontTokenComponent.getWxSConsumerEntry();
+        monthlyCardOrder.setConsumerId(user.getId());
+        monthlyCardOrder.setPayStatus(YesNoEnum.yes.getIndex());
+        List<MonthlyCardOrderVo> list = monthlyCardOrderService.selectMonthlyCardOrderList(monthlyCardOrder);
+        return success(list);
+    }
+
+    @PostMapping("/createMonthlyCard")
+    public R<MonthlyyCardPayResultResponse> createOrder(@RequestBody @Validated CreateMonthlyCardRequest request) {
+        if ("1".equals(redisUtil.frontInOutLogSwitch())) {
+            log.debug("MonthlyCardOrderController method preOrder 入参  {}", JsonConvertUtil.write2JsonStr(request));
+        }
+        MonthlyyCardPayResultResponse response = monthlyCardOrderService.createMonthlyCard(request);
+        if ("1".equals(redisUtil.frontInOutLogSwitch())) {
+            log.debug("MonthlyCardOrderController method preOrder 出参  {}", JsonConvertUtil.write2JsonStr(response));
+        }
+        return R.ok(response);
+    }
+
+    @ApiOperation(value = "通过订单编号查询订单")
+    @GetMapping(value = "/{monthlyCardNo}")
+    public R<MonthlyCardOrderVo> queryMonthlyCardInfoByNo(@PathVariable("monthlyCardNo") String monthlyCardNo) {
+        return R.ok(monthlyCardOrderService.queryMonthlyCardInfoByNo(monthlyCardNo));
+    }
+
+
+}

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

+package share.web.controller.system;
+
+import org.springframework.beans.factory.annotation.Autowired;
+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.page.TableDataInfo;
+import share.system.domain.vo.SecondaryCardConfVo;
+import share.system.service.SecondaryCardConfService;
+
+import java.util.List;
+
+/**
+ * 次卡配置Controller
+ *
+ * @author wuwenlong
+ * @date 2024-08-22
+ */
+@RestController
+@RequestMapping("/secondaryCardConf")
+public class SecondaryCardConfController extends BaseController {
+    @Autowired
+    private SecondaryCardConfService secondaryCardConfService;
+
+    /**
+     * 查询次卡配置列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(SecondaryCardConfVo secondaryCardConf) {
+        startPage();
+        List<SecondaryCardConfVo> list = secondaryCardConfService.selectSecondaryCardConfList(secondaryCardConf);
+        return getDataTable(list);
+    }
+
+}

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

+package share.web.controller.system;
+
+import org.springframework.beans.factory.annotation.Autowired;
+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.system.domain.SConsumer;
+import share.system.domain.vo.FrontTokenComponent;
+import share.system.domain.vo.SecondaryCardLogVo;
+import share.system.service.SecondaryCardLogService;
+
+import java.util.List;
+
+/**
+ * 次卡使用记录Controller
+ *
+ * @author wuwenlong
+ * @date 2024-08-22
+ */
+@RestController
+@RequestMapping("/secondaryCardLog")
+public class SecondaryCardLogController extends BaseController {
+    @Autowired
+    private SecondaryCardLogService secondaryCardLogService;
+
+    /**
+     * 查询次卡使用记录列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(SecondaryCardLogVo secondaryCardLog) {
+        startPage();
+        SConsumer user = FrontTokenComponent.getWxSConsumerEntry();
+        secondaryCardLog.setConsumerId(user.getId());
+        List<SecondaryCardLogVo> list = secondaryCardLogService.selectSecondaryCardLogList(secondaryCardLog);
+        return getDataTable(list);
+    }
+
+    @GetMapping("/query")
+    public AjaxResult query(SecondaryCardLogVo secondaryCardLog) {
+        SConsumer user = FrontTokenComponent.getWxSConsumerEntry();
+        secondaryCardLog.setConsumerId(user.getId());
+        return success(secondaryCardLogService.selectSecondaryCardLogList(secondaryCardLog));
+    }
+
+}

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

+package share.web.controller.system;
+
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import share.common.core.controller.BaseController;
+import share.common.core.domain.R;
+import share.common.core.page.TableDataInfo;
+import share.common.core.redis.RedisUtil;
+import share.common.enums.YesNoEnum;
+import share.common.utils.JsonConvertUtil;
+import share.system.domain.SConsumer;
+import share.system.domain.vo.FrontTokenComponent;
+import share.system.domain.vo.SecondaryCardOrderVo;
+import share.system.request.SecondaryCardOrderRequest;
+import share.system.response.SecondaryCardOrderPayResultResponse;
+import share.system.service.SecondaryCardOrderService;
+
+import java.util.List;
+
+/**
+ * 次卡购买记录Controller
+ *
+ * @author wuwenlong
+ * @date 2024-08-22
+ */
+@Slf4j
+@RestController
+@RequestMapping("/secondaryCardOrder")
+public class SecondaryCardOrderController extends BaseController {
+    @Autowired
+    private SecondaryCardOrderService secondaryCardOrderService;
+    @Autowired
+    private RedisUtil redisUtil;
+
+    /**
+     * 查询次卡购买记录列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(SecondaryCardOrderVo secondaryCardOrder) {
+        startPage();
+        SConsumer user = FrontTokenComponent.getWxSConsumerEntry();
+        secondaryCardOrder.setConsumerId(user.getId());
+        secondaryCardOrder.setPayStatus(YesNoEnum.yes.getIndex());
+        List<SecondaryCardOrderVo> list = secondaryCardOrderService.selectSecondaryCardOrderList(secondaryCardOrder);
+        return getDataTable(list);
+    }
+
+
+    @PostMapping("/createSecondaryCardOrder")
+    public R<SecondaryCardOrderPayResultResponse> createOrder(@RequestBody @Validated SecondaryCardOrderRequest request) {
+        if ("1".equals(redisUtil.frontInOutLogSwitch())) {
+            log.debug("SecondaryCardOrderController method preOrder 入参  {}", JsonConvertUtil.write2JsonStr(request));
+        }
+        SecondaryCardOrderPayResultResponse response = secondaryCardOrderService.createSecondaryCardOrder(request);
+        if ("1".equals(redisUtil.frontInOutLogSwitch())) {
+            log.debug("SecondaryCardOrderController method preOrder 出参  {}", JsonConvertUtil.write2JsonStr(response));
+        }
+        return R.ok(response);
+    }
+
+    @ApiOperation(value = "通过订单编号查询订单")
+    @GetMapping(value = "/{secondaryCardNo}")
+    public R<SecondaryCardOrderVo> querySecondaryCardInfoByNo(@PathVariable("secondaryCardNo") String secondaryCardNo) {
+        return R.ok(secondaryCardOrderService.querySecondaryCardInfoByNo(secondaryCardNo));
+    }
+}

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.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.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 java.util.List;
+
+/**
+ * 分享活动绑定关系Controller
+ *
+ * @author wuwenlong
+ * @date 2024-09-02
+ */
+@RestController
+@RequestMapping("/activities")
+public class SharingActivitiesController extends BaseController {
+    @Autowired
+    private SharingActivitiesService sharingActivitiesService;
+
+    /**
+     * 查询分享活动绑定关系列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(SharingActivitiesVo sharingActivities) {
+        SConsumer user = FrontTokenComponent.getWxSConsumerEntry();
+        sharingActivities.setUid(user.getId());
+        startPage();
+        List<SharingActivities> list = sharingActivitiesService.selectSharingActivitiesList(sharingActivities);
+        TableDataInfo dataTable = getDataTable(list);
+        return sharingActivitiesService.pageList(dataTable,sharingActivities);
+
+    }
+
+    @GetMapping("/query")
+    public TableDataInfo query(SharingActivitiesVo sharingActivities) {
+        SConsumer user = FrontTokenComponent.getWxSConsumerEntry();
+        sharingActivities.setNewUid(user.getId());
+        startPage();
+        List<SharingActivities> list = sharingActivitiesService.selectSharingActivitiesList(sharingActivities);
+        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-front/src/main/java/share/web/controller/system/WeChatController.java

@@ -12,10 +12,8 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import share.common.core.domain.R;
 import share.common.core.redis.RedisUtil;
-import share.common.enums.MessageReminderEnum;
 import share.common.utils.JsonConvertUtil;
 import share.system.domain.SConsumerToken;
-import share.system.domain.SOrder;
 import share.system.domain.TemplateMessage;
 import share.system.request.RegisterThirdSConsumerRequest;
 import share.system.request.WxBindingPhoneRequest;
@@ -199,13 +197,13 @@ public class WeChatController {
         logger.debug("更新完成的消费者令牌列表: {}", sConsumerTokenList);
     }
 
-    @GetMapping("/test1")
-    public void test(String orderNo) {
-        SOrder byOrderN = sOrderService.getByOrderNo(orderNo);
-        wechatNewService.sendPublicTemplateMessage(byOrderN, MessageReminderEnum.CLEANING, byOrderN.getConsumerId());
-        wechatNewService.sendPublicTemplateMessage(byOrderN, MessageReminderEnum.ORDER_RESERVE, byOrderN.getConsumerId());
-
-    }
+//    @GetMapping("/test1")
+//    public void test(String orderNo) {
+//        SOrder byOrderN = sOrderService.getByOrderNo(orderNo);
+//        wechatNewService.sendPublicTemplateMessage(byOrderN, MessageReminderEnum.CLEANING, byOrderN.getConsumerId());
+//        wechatNewService.sendPublicTemplateMessage(byOrderN, MessageReminderEnum.ORDER_RESERVE, byOrderN.getConsumerId());
+//
+//    }
 
 }
 

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

@@ -76,7 +76,7 @@ public class CouponRetryTask {
 
         List<SConsumerCoupon> sConsumerCoupons = sConsumerCouponService.list(consumerCouponWrapper);
         if (sConsumerCoupons.size() > 100) {
-            sConsumerCoupons.subList(0, 100);
+            sConsumerCoupons = sConsumerCoupons.subList(0, 100);
         }
         if (!CollectionUtils.isEmpty(sConsumerCoupons)) {
             List<SConsumerCoupon> updatedCoupons = new ArrayList<>();
@@ -90,11 +90,27 @@ public class CouponRetryTask {
                             .getOpenShopUuid();
                     TuangouReceiptGetConsumedReponseEntity getconsumed = qpService.getconsumed(item.getCouponCode(), openShopUuid);
                     if (!ObjectUtils.isEmpty(getconsumed)) {
-                        item.setCouponPayPrice(BigDecimal.valueOf(getconsumed.getDeal_price()));
+                        item.setCouponPayPrice(BigDecimal.valueOf(getconsumed.getDeal_price()).subtract(BigDecimal.valueOf(getconsumed.getOrder_shoppromo_amount())));
                         logger.debug("美团优惠卷购买金额为：" + item.getCouponPayPrice());
                     } else {
+                        finalList.stream().forEach(store -> {
+                            TuangouReceiptGetConsumedReponseEntity newGetconsumed = qpService.getconsumed(item.getCouponCode(), store.getOpenShopUuid());
+                            logger.debug("门店：" + store.getName() + "优惠券码：" + item.getCouponCode());
+                            if (!ObjectUtils.isEmpty(newGetconsumed)) {
+                                item.setStoreId(store.getId());
+                                item.setCouponPayPrice(BigDecimal.valueOf(newGetconsumed.getDeal_price()).subtract(BigDecimal.valueOf(newGetconsumed.getOrder_shoppromo_amount())));
+                                logger.debug("门店：" + store.getName() + "优惠券码：" + item.getCouponCode());
+                                logger.debug("美团优惠卷购买金额为：" + item.getCouponPayPrice());
+                                //跳出循环
+                                return;
+                            }
+                            logger.debug("门店：" + store.getName() + "优惠券码：" + item.getCouponCode() + "查询优惠券失败" + newGetconsumed);
+                        });
+                        if (item.getCouponPayPrice() == null) {
+                            item.setCouponPayPrice(BigDecimal.ZERO);
                             item.setUseStatus(UserStatusEnum.EXPIRED.getCode());
                         }
+                    }
                 } else if (PlatformTypeEnum.TIKTOK.getCode().equals(item.getPlatformType())) {
                     JSONObject data = tiktokService.certificateGet(item.getEncryptedCode());
                     JSONObject certificate = data.getJSONObject("certificate");

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

@@ -7,9 +7,11 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import share.system.domain.DeviceGateway;
+import share.system.domain.SStore;
 import share.system.service.DeviceGatewayService;
 import share.system.service.DeviceService;
 import share.system.service.DeviceStatusLogService;
+import share.system.service.ISStoreService;
 
 import java.util.List;
 
@@ -29,6 +31,8 @@ public class DeviceTask {
     private DeviceGatewayService deviceGatewayService;
     @Autowired
     private DeviceService deviceService;
+    @Autowired
+    private ISStoreService storeService;
 
     /**
      * 设备异常状态短信提醒任务
@@ -64,8 +68,20 @@ public class DeviceTask {
         if (validTime == null) {
             validTime = 15;
         }
+        SStore sStore = new SStore();
+        sStore.setStatus("1");
+        List<SStore> storeList = storeService.selectSStoreList(sStore);
+        for (SStore store : storeList) {
             // 更新所有门锁设备开锁密码
-        deviceService.updateDeviceDoorLockPassword(validTime);
+            deviceService.updateDeviceDoorLockPassword(validTime, store.getId());
+            // 延时执行操作
+            try {
+                Thread.sleep(15000);
+            } catch (InterruptedException e) {
+//                    e.printStackTrace();
+                log.error("定期修改门锁设备的开锁密码线程中断：{}", e.getMessage());
+            }
+        }
         log.debug("updateDeviceDoorLockPassword:每周一修改房间门锁密码结束");
     }
 

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/pom.xml

@@ -156,5 +156,10 @@
             <artifactId>cron-utils</artifactId>
             <version>9.1.3</version>
         </dependency>
+        <dependency>
+            <groupId>com.github.wechatpay-apiv3</groupId>
+            <artifactId>wechatpay-java</artifactId>
+            <version>0.2.14</version>
+        </dependency>
     </dependencies>
 </project>
\ No newline at end of file

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

@@ -38,17 +38,17 @@ public class ConsumerMember extends BaseEntity {
     @Excel(name = "会员等级")
     private Long membershipLevel;
 
-    /**
-     * 会员类型
-     */
-    @Excel(name = "会员类型")
-    private Long memberType;
+//    /**
+//     * 会员类型
+//     */
+//    @Excel(name = "会员类型")
+//    private Long memberType;
 
-    /**
-     * 会员配置id
-     */
-    @Excel(name = "会员配置id")
-    private Long memberConfigId;
+//    /**
+//     * 会员配置id
+//     */
+//    @Excel(name = "会员配置id")
+//    private Long memberConfigId;
 
     /**
      * 会员有效期

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

+package share.system.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+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 java.util.Date;
+
+/**
+ * 用户月卡对象 s_consumer_monthly_card
+ *
+ * @author wuwenlong
+ * @date 2024-08-27
+ */
+@Data
+@TableName(value = "s_consumer_monthly_card")
+public class ConsumerMonthlyCard extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 月卡配置表id
+     */
+    @Excel(name = "月卡配置表id")
+    private Long monthlyCardConfId;
+
+    /**
+     * 用户ID
+     */
+    @Excel(name = "用户ID")
+    private Long consumerId;
+
+    /**
+     * 用户手机号
+     */
+    @Excel(name = "用户手机号")
+    private String phone;
+
+    /**
+     * 免费时长
+     */
+    @Excel(name = "免费时长")
+    private Long freeDuration;
+
+    /**
+     * 月卡天数
+     */
+    @Excel(name = "月卡天数")
+    private Long monthlyCardDays;
+
+    /**
+     * 次卡有效期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "次卡有效期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date expirationDate;
+
+    /**
+     * 删除标记：1-删除，0-正常
+     */
+    private Long isDelete;
+
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("monthlyCardConfId", getMonthlyCardConfId())
+                .append("consumerId", getConsumerId())
+                .append("phone", getPhone())
+                .append("freeDuration", getFreeDuration())
+                .append("monthlyCardDays", getMonthlyCardDays())
+                .append("expirationDate", getExpirationDate())
+                .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/ConsumerSecondaryCard.java

+package share.system.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+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 java.util.Date;
+
+/**
+ * 用户次卡对象 s_consumer_secondary_card
+ *
+ * @author wuwenlong
+ * @date 2024-08-22
+ */
+@Data
+@TableName(value = "s_consumer_secondary_card")
+public class ConsumerSecondaryCard extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 次卡配置表id
+     */
+    @Excel(name = "次卡配置表id")
+    private Long secondaryCardConfId;
+
+    /**
+     * 用户ID
+     */
+    @Excel(name = "用户ID")
+    private Long consumerId;
+
+    /**
+     * 用户手机号
+     */
+    @Excel(name = "用户手机号")
+    private String phone;
+
+    /**
+     * 套餐id
+     */
+    @Excel(name = "套餐id")
+    private Long packId;
+
+//    /**
+//     * 次卡有效期
+//     */
+//    @Excel(name = "次卡有效期")
+//    private Long validityPeriod;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "次卡有效期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date expirationDate;
+
+    /**
+     * 次卡次数
+     */
+    @Excel(name = "次卡次数")
+    private Integer number;
+
+    /**
+     * 删除标记：1-删除，0-正常
+     */
+    //逻辑删除注解(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("secondaryCardConfId", getSecondaryCardConfId())
+                .append("consumerId", getConsumerId())
+                .append("phone", getPhone())
+                .append("packId", getPackId())
+                .append("expirationDate", getExpirationDate())
+                .append("number", getNumber())
+                .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/ConsumerWallet.java

@@ -58,6 +58,18 @@ public class ConsumerWallet extends BaseEntity {
     @TableField(select = false)
     private Long isDelete;
 
+    /**
+     * 权益金
+     */
+    @Excel(name = "权益金")
+    private BigDecimal equityFund;
+
+    /**
+     * 累计权益金
+     */
+    @Excel(name = "累计权益金")
+    private BigDecimal accumulateEquityFund;
+
 
     @Override
     public String toString() {

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

@@ -83,6 +83,9 @@ public class Device extends BaseEntity
     /** 门店房间ID */
     private Long roomId;
 
+    /** 设备新密码*/
+    private String newDevPsw;
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

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

@@ -67,6 +67,9 @@ public class DurationLog extends BaseEntity {
     @TableField(select = false)
     private Long isDelete;
 
+    @Excel(name = "时长类型0-充值赠送，1-订单消费，2-分享赠送，3-订单退款")
+    private Integer durationType;
+
 
     @Override
     public String toString() {

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

+package share.system.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+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 java.math.BigDecimal;
+import java.util.Date;
+/**
+ * 权益金过度对象 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 HH:mm:ss")
+    @Excel(name = "过期时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date expireTime;
+
+    //逻辑删除注解(0 未删除 1 已删除)
+    @TableLogic
+    @TableField(select = false)
+    private Integer isDelete;
+
+    @Excel(name = "返佣状态(0-未返佣，1-已返佣)")
+    private Integer rebateType;
+
+
+    @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

+package share.system.domain;
+
+import java.math.BigDecimal;
+
+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 lombok.Data;
+/**
+ * 权益金记录对象 s_equity_fund_log
+ *
+ * @author wuwenlong
+ * @date 2024-09-13
+ */
+@Data
+@TableName(value = "s_equity_fund_log")
+public class EquityFundLog extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    /** 权益金类型(0-充值，1-权益订单) */
+    @Excel(name = "权益金类型(0-充值，1-权益订单)")
+    private String equityFundType;
+
+    /** 权益金额 */
+    @Excel(name = "权益金额")
+    private BigDecimal equityFund;
+
+    /** 上级id */
+    @Excel(name = "上级id")
+    private Long uid;
+
+    /** 下级id */
+    @Excel(name = "下级id")
+    private Long newUid;
+
+    /** 终端流水号 */
+    @Excel(name = "终端流水号")
+    private String terminalTrace;
+
+    /** 订单号 */
+    @Excel(name = "订单号")
+    private String outTradeNo;
+
+    /** 删除标记：1-删除，0-正常 */
+    //逻辑删除注解(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("equityFundType", getEquityFundType())
+                .append("equityFund", getEquityFund())
+                .append("uid", getUid())
+                .append("newUid", getNewUid())
+                .append("terminalTrace", getTerminalTrace())
+                .append("outTradeNo", getOutTradeNo())
+                .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/EquityMembersOrderConfig.java

@@ -26,17 +26,20 @@ public class EquityMembersOrderConfig extends BaseEntity {
     @TableId(type = IdType.AUTO)
     private Long id;
 
+    @Excel(name = "配置名称")
+    private String name;
+
     /**
      * 默认会员等级
      */
     @Excel(name = "默认会员等级")
     private Long defaultLevel;
 
-    /**
-     * 会员配置id
-     */
-    @Excel(name = "会员配置id")
-    private Long memberConfigId;
+//    /**
+//     * 会员配置id
+//     */
+//    @Excel(name = "会员配置id")
+//    private Long memberConfigId;
 
     /**
      * 所需金额
@@ -50,6 +53,9 @@ public class EquityMembersOrderConfig extends BaseEntity {
     @Excel(name = "会员有效期")
     private Long validityPeriod;
 
+    @Excel(name = "赠送积分")
+    private BigDecimal giftPoints;
+
     /**
      * 是否删除
      */
@@ -64,7 +70,6 @@ public class EquityMembersOrderConfig extends BaseEntity {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
                 .append("id", getId())
                 .append("defaultLevel", getDefaultLevel())
-                .append("memberConfigId", getMemberConfigId())
                 .append("requiredAmount", getRequiredAmount())
                 .append("validityPeriod", getValidityPeriod())
                 .append("isDelete", getIsDelete())

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

@@ -32,11 +32,11 @@ public class MemberConfig extends BaseEntity {
     @Excel(name = "会员等级")
     private Long membershipLevel;
 
-    /**
-     * 会员类型
-     */
-    @Excel(name = "会员类型")
-    private Long memberType;
+//    /**
+//     * 会员类型
+//     */
+//    @Excel(name = "会员类型")
+//    private Long memberType;
 
     /**
      * 等级名称
@@ -56,17 +56,17 @@ public class MemberConfig extends BaseEntity {
     @Excel(name = "折扣比例")
     private BigDecimal discountRatio;
 
-    /**
-     * 会员有效期
-     */
-    @Excel(name = "会员有效期")
-    private Long validityPeriod;
+//    /**
+//     * 会员有效期
+//     */
+//    @Excel(name = "会员有效期")
+//    private Long validityPeriod;
 
-    /**
-     * 会员进度
-     */
-    @Excel(name = "会员进度")
-    private Long membershipProgress;
+//    /**
+//     * 会员进度
+//     */
+//    @Excel(name = "会员进度")
+//    private Long membershipProgress;
 
     /**
      * 是否删除
@@ -82,12 +82,11 @@ public class MemberConfig extends BaseEntity {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
                 .append("id", getId())
                 .append("membershipLevel", getMembershipLevel())
-                .append("memberType", getMemberType())
                 .append("levelName", getLevelName())
                 .append("limitRequirements", getLimitRequirements())
                 .append("discountRatio", getDiscountRatio())
-                .append("validityPeriod", getValidityPeriod())
-                .append("membershipProgress", getMembershipProgress())
+//                .append("validityPeriod", getValidityPeriod())
+//                .append("membershipProgress", getMembershipProgress())
                 .append("isDelete", getIsDelete())
                 .append("createBy", getCreateBy())
                 .append("createTime", getCreateTime())

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

+package share.system.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+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 java.math.BigDecimal;
+
+/**
+ * 月卡配置对象 s_monthly_card_conf
+ *
+ * @author wuwenlong
+ * @date 2024-08-27
+ */
+@Data
+@TableName(value = "s_monthly_card_conf")
+public class MonthlyCardConf extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 配置名称
+     */
+    @Excel(name = "配置名称")
+    private String name;
+
+    /**
+     * 月卡金额
+     */
+    @Excel(name = "月卡金额")
+    private BigDecimal monthlyCardAmount;
+
+    /**
+     * 免费时长
+     */
+    @Excel(name = "免费时长")
+    private Long freeDuration;
+
+    /**
+     * 月卡天数
+     */
+    @Excel(name = "月卡天数")
+    private Long monthlyCardDays;
+
+    /**
+     * 是否删除(0:否,1:是)
+     */
+    //逻辑删除注解(0 未删除 1 已删除)
+    @TableLogic
+    @TableField(select = false)
+    private Long isDelete;
+
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("name", getName())
+                .append("monthlyCardAmount", getMonthlyCardAmount())
+                .append("freeDuration", getFreeDuration())
+                .append("monthlyCardDays", getMonthlyCardDays())
+                .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/MonthlyCardLog.java

+package share.system.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+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;
+
+/**
+ * 月卡使用记录对象 s_monthly_card_log
+ *
+ * @author wuwenlong
+ * @date 2024-08-27
+ */
+@Data
+@TableName(value = "s_monthly_card_log")
+public class MonthlyCardLog extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 用户月卡id
+     */
+    @Excel(name = "用户月卡id")
+    private Long consumerMonthlyCardId;
+
+    /**
+     * 用户ID
+     */
+    @Excel(name = "用户ID")
+    private Long consumerId;
+
+    /**
+     * 用户手机号
+     */
+    @Excel(name = "用户手机号")
+    private String phone;
+
+    /**
+     * 使用时长
+     */
+    @Excel(name = "使用时长")
+    private Long useDuration;
+
+    /**
+     * 剩余时长
+     */
+    @Excel(name = "剩余时长")
+    private Long residueDuration;
+
+    /**
+     * 删除标记：1-删除，0-正常
+     */
+    //逻辑删除注解(0 未删除 1 已删除)
+    @TableLogic
+    @TableField(select = false)
+    private Long isDelete;
+
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("consumerMonthlyCardId", getConsumerMonthlyCardId())
+                .append("consumerId", getConsumerId())
+                .append("phone", getPhone())
+                .append("useDuration", getUseDuration())
+                .append("residueDuration", getResidueDuration())
+                .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/MonthlyCardOrder.java

+package share.system.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+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 java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 月卡订单对象 s_monthly_card_order
+ *
+ * @author wuwenlong
+ * @date 2024-08-27
+ */
+@Data
+@TableName(value = "s_monthly_card_order")
+public class MonthlyCardOrder extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 月卡购买记录编号
+     */
+    @Excel(name = "月卡购买记录编号")
+    private String monthlyCardNo;
+
+    /**
+     * 扫呗平台唯一订单号
+     */
+    @Excel(name = "扫呗平台唯一订单号")
+    private String outTradeNo;
+
+    /**
+     * 商户订单号
+     */
+    @Excel(name = "商户订单号")
+    private String terminalTrace;
+
+    /**
+     * 月卡购买金额
+     */
+    @Excel(name = "月卡购买金额")
+    private BigDecimal monthlyCardAmount;
+
+    /**
+     * 月卡配置id
+     */
+    @Excel(name = "月卡配置id")
+    private Long monthlyCardConfId;
+
+    /**
+     * 用户ID
+     */
+    @Excel(name = "用户ID")
+    private Long consumerId;
+
+    /**
+     * 用户手机号
+     */
+    @Excel(name = "用户手机号")
+    private String phone;
+
+    /**
+     * 支付方式
+     */
+    @Excel(name = "支付方式")
+    private Integer payType;
+
+    /**
+     * 状态：0-待支付，1-支付成功，2-退款中，3-退款完成
+     */
+    @Excel(name = "状态：0-待支付，1-支付成功，2-退款中，3-退款完成")
+    private Integer payStatus;
+
+    /**
+     * 支付时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "支付时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date payTime;
+
+    /**
+     * 是否删除(0:否,1:是)
+     */
+    //逻辑删除注解(0 未删除 1 已删除)
+    @TableLogic
+    @TableField(select = false)
+    private Long isDelete;
+
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("monthlyCardNo", getMonthlyCardNo())
+                .append("outTradeNo", getOutTradeNo())
+                .append("terminalTrace", getTerminalTrace())
+                .append("monthlyCardAmount", getMonthlyCardAmount())
+                .append("monthlyCardConfId", getMonthlyCardConfId())
+                .append("consumerId", getConsumerId())
+                .append("phone", getPhone())
+                .append("payType", getPayType())
+                .append("payStatus", getPayStatus())
+                .append("payTime", getPayTime())
+                .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/SConsumer.java

@@ -108,4 +108,10 @@ public class SConsumer implements Serializable
     @TableField(exist = false)
     private Integer position;
 
+    @TableField(exist = false)
+    private Integer textMessage;
+
+    @TableField(exist = false)
+    private Integer officialAccount;
+
 }

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

@@ -18,10 +18,14 @@ public class SStoreConsumer {
 
     private Integer position;
 
-    //电控  是否接收公众号
+    //电控
     private Integer controller;
 
-    //门控  是否接收短信
+    //门控
     private Integer gating;
+    //是否接收短信
+    private Integer textMessage;
+    //是否接收公众号
+    private Integer officialAccount;
 
 }

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

+package share.system.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+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 java.math.BigDecimal;
+
+/**
+ * 次卡配置对象 s_secondary_card_conf
+ *
+ * @author wuwenlong
+ * @date 2024-08-22
+ */
+@Data
+@TableName(value = "s_secondary_card_conf")
+public class SecondaryCardConf extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 配置名称
+     */
+    @Excel(name = "配置名称")
+    private String name;
+
+    /**
+     * 次卡金额
+     */
+    @Excel(name = "次卡金额")
+    private BigDecimal secondaryCardAmount;
+
+    /**
+     * 套餐id
+     */
+    @Excel(name = "套餐id")
+    private Long packId;
+
+    /**
+     * 次卡有效期
+     */
+    @Excel(name = "次卡有效期")
+    private Integer validityPeriod;
+
+    /**
+     * 次卡次数
+     */
+    @Excel(name = "次卡次数")
+    private Integer number;
+
+    /**
+     * 是否删除(0:否,1:是)
+     */
+    //逻辑删除注解(0 未删除 1 已删除)
+    @TableLogic
+    @TableField(select = false)
+    private Long isDelete;
+
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("name", getName())
+                .append("secondaryCardAmount", getSecondaryCardAmount())
+                .append("packId", getPackId())
+                .append("validityPeriod", getValidityPeriod())
+                .append("number", getNumber())
+                .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/SecondaryCardLog.java

+package share.system.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+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;
+
+/**
+ * 次卡使用记录对象 s_secondary_card_log
+ *
+ * @author wuwenlong
+ * @date 2024-08-22
+ */
+@Data
+@TableName("s_secondary_card_log")
+public class SecondaryCardLog extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 用户次卡id
+     */
+    @Excel(name = "用户次卡id")
+    private Long consumerSecondaryCardId;
+
+    /**
+     * 用户ID
+     */
+    @Excel(name = "用户ID")
+    private Long consumerId;
+
+    /**
+     * 用户手机号
+     */
+    @Excel(name = "用户手机号")
+    private String phone;
+
+    /**
+     * 套餐id
+     */
+    @Excel(name = "套餐id")
+    private Long packId;
+
+    /**
+     * 使用次数
+     */
+    @Excel(name = "使用次数")
+    private Long usageCount;
+
+    /**
+     * 剩余次数
+     */
+    @Excel(name = "剩余次数")
+    private Long residueCount;
+
+    /**
+     * 删除标记：1-删除，0-正常
+     */
+    //逻辑删除注解(0 未删除 1 已删除)
+    @TableLogic
+    @TableField(select = false)
+    private Long isDelete;
+
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("consumerSecondaryCardId", getConsumerSecondaryCardId())
+                .append("consumerId", getConsumerId())
+                .append("phone", getPhone())
+                .append("packId", getPackId())
+                .append("usageCount", getUsageCount())
+                .append("residueCount", getResidueCount())
+                .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/SecondaryCardOrder.java

+package share.system.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+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 java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 次卡购买记录对象 s_secondary_card_order
+ *
+ * @author wuwenlong
+ * @date 2024-08-22
+ */
+@Data
+@TableName("s_secondary_card_order")
+public class SecondaryCardOrder extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 次卡购买记录编号
+     */
+    @Excel(name = "次卡购买记录编号")
+    private String secondaryCardNo;
+
+    /**
+     * 扫呗平台唯一订单号
+     */
+    @Excel(name = "扫呗平台唯一订单号")
+    private String outTradeNo;
+
+    /**
+     * 商户订单号
+     */
+    @Excel(name = "商户订单号")
+    private String terminalTrace;
+
+    /**
+     * 次卡购买金额
+     */
+    @Excel(name = "次卡购买金额")
+    private BigDecimal secondaryCardAmount;
+
+    /**
+     * 次卡配置表id
+     */
+    @Excel(name = "次卡配置表id")
+    private Long secondaryCardConfId;
+
+    /**
+     * 次卡用户ID
+     */
+    @Excel(name = "次卡用户ID")
+    private Long consumerId;
+
+    /**
+     * 次卡用户手机号
+     */
+    @Excel(name = "次卡用户手机号")
+    private String phone;
+
+    /**
+     * 支付方式
+     */
+    @Excel(name = "支付方式")
+    private Integer payType;
+
+    /**
+     * 状态：0-待支付，1-支付成功，2-退款中，3-退款完成
+     */
+    @Excel(name = "状态：0-待支付，1-支付成功，2-退款中，3-退款完成")
+    private Integer payStatus;
+
+    /**
+     * 支付时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "支付时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date payTime;
+
+    /**
+     * 删除标记：1-删除，0-正常
+     */
+    //逻辑删除注解(0 未删除 1 已删除)
+    @TableLogic
+    @TableField(select = false)
+    private Long isDelete;
+
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("secondaryCardNo", getSecondaryCardNo())
+                .append("outTradeNo", getOutTradeNo())
+                .append("terminalTrace", getTerminalTrace())
+                .append("secondaryCardAmount", getSecondaryCardAmount())
+                .append("secondaryCardConfId", getSecondaryCardConfId())
+                .append("consumerId", getConsumerId())
+                .append("phone", getPhone())
+                .append("payType", getPayType())
+                .append("payStatus", getPayStatus())
+                .append("payTime", getPayTime())
+                .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/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 lombok.Data;
+/**
+ * 分享活动绑定关系对象 s_sharing_activities
+ *
+ * @author wuwenlong
+ * @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-权益金会员分享) */
+    @Excel(name = "活动类型(0-新用户注册，1-权益金会员分享)")
+    private String activityType;
+
+    /** 上级id */
+    @Excel(name = "上级id")
+    private Long uid;
+
+    /** 下级id */
+    @Excel(name = "下级id")
+    private Long newUid;
+
+    /** 删除标记：1-删除，0-正常 */
+    //逻辑删除注解(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("activityType", getActivityType())
+                .append("uid", getUid())
+                .append("newUid", getNewUid())
+                .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/WithdrawLog.java

+package share.system.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+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 java.math.BigDecimal;
+import java.util.Date;
+/**
+ * 提现记录对象 s_withdraw_log
+ * 
+ * @author lwj
+ * @date 2024-08-28
+ */
+@Data
+public class WithdrawLog extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 提现用户ID */
+    @Excel(name = "提现用户ID")
+    private Long consumerId;
+
+    /** 提现金额 */
+    @Excel(name = "提现金额")
+    private BigDecimal amount;
+
+    /** 状态：1-提现申请，2-审核通过，3-审核不通过，4-已撤销，5-交易成功，6-交易失败 */
+    @Excel(name = "状态")
+    private Integer status;
+
+    /** 提现订单号,系统自动生成的 */
+    @Excel(name = "提现订单号")
+    private String withdrawOrder;
+
+    /** 提现手续费 */
+    @Excel(name = "提现手续费")
+    private BigDecimal withdrawCharge;
+
+    /** 申请提现时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "申请提现时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date withdrawApplyTime;
+
+    /** 提现备注 */
+    @Excel(name = "提现备注")
+    private String withdrawRemark;
+
+    /** 提现方式：1-微信 */
+    @Excel(name = "提现方式：1-微信")
+    private Integer withdrawType;
+
+    /** 是否删除 */
+    //逻辑删除注解(0 未删除 1 已删除)
+    @TableLogic
+    @TableField(select = false)
+    private Long isDelete;
+
+    /** 微信转账场景 */
+    @Excel(name = "微信转账场景")
+    private String transferSceneId;
+
+    /** 用户的openid */
+    @Excel(name = "用户的openid")
+    private String openid;
+
+    /** 微信批次单号 */
+    @Excel(name = "微信批次单号")
+    private String batchId;
+
+    /** 微信批次状态 */
+    @Excel(name = "微信批次状态")
+    private String batchStatus;
+
+    /** 微信接口错误描述 */
+    @Excel(name = "微信接口错误描述")
+    private String errorDesc;
+
+    /** 错误码	 */
+    @Excel(name = "错误码")
+    private String errorCode;
+
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("consumerId", getConsumerId())
+            .append("amount", getAmount())
+            .append("status", getStatus())
+            .append("withdrawOrder", getWithdrawOrder())
+            .append("withdrawCharge", getWithdrawCharge())
+            .append("withdrawApplyTime", getWithdrawApplyTime())
+            .append("withdrawRemark", getWithdrawRemark())
+            .append("withdrawType", getWithdrawType())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("isDelete", getIsDelete())
+            .append("transferSceneId", getTransferSceneId())
+            .append("openid", getOpenid())
+            .append("batchId", getBatchId())
+            .append("batchStatus", getBatchStatus())
+            .append("errorDesc", getErrorDesc())
+            .append("errorCode", getErrorCode())
+            .toString();
+    }
+}

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

+package share.system.domain.vo;
+
+import lombok.Data;
+import share.system.domain.ConsumerMonthlyCard;
+
+import java.math.BigDecimal;
+
+@Data
+public class ConsumerMonthlyCardVo extends ConsumerMonthlyCard {
+    //用户昵称
+    private String nickName;
+    //用户头像
+    private String avatar;
+    //配置名称
+    private String confName;
+    //月卡金额
+    private BigDecimal confAmount;
+}

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

+package share.system.domain.vo;
+
+import lombok.Data;
+import share.system.domain.ConsumerSecondaryCard;
+
+import java.math.BigDecimal;
+
+@Data
+public class ConsumerSecondaryCardVo extends ConsumerSecondaryCard {
+    //用户昵称
+    private String nickName;
+    //用户头像
+    private String avatar;
+    //套餐名称
+    private String packName;
+    //套餐金额
+    private BigDecimal packPrice;
+    //配置名称
+    private String confName;
+    //次卡金额
+    private BigDecimal confAmount;
+}

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/EquityMembersOrderVo.java

 package share.system.domain.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import share.system.domain.EquityMembersOrder;
 
+import java.util.Date;
+
 @Data
 public class EquityMembersOrderVo extends EquityMembersOrder {
     private String nickName;
@@ -13,4 +16,16 @@ public class EquityMembersOrderVo extends EquityMembersOrder {
      * 用户手机号
      */
     private String phone;
+
+    /**
+     * 开始时间
+     */
+    @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/MonthlyCardLogVo.java

+package share.system.domain.vo;
+
+import lombok.Data;
+import share.system.domain.MonthlyCardLog;
+
+import java.math.BigDecimal;
+
+@Data
+public class MonthlyCardLogVo extends MonthlyCardLog {
+    //用户昵称
+    private String nickName;
+    //用户头像
+    private String avatar;
+    //配置名称
+    private String confName;
+    //次卡金额
+    private BigDecimal confAmount;
+}

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

+package share.system.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import share.system.domain.MonthlyCardOrder;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class MonthlyCardOrderVo extends MonthlyCardOrder {
+    //用户昵称
+    private String nickName;
+    //用户头像
+    private String avatar;
+    //配置名称
+    private String confName;
+    //次卡金额
+    private BigDecimal confAmount;
+
+    private BigDecimal freeDuration;
+
+    private Long monthlyCardDays;
+
+    /**
+     * 开始时间
+     */
+    @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/RechargeVo.java

 package share.system.domain.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import share.system.domain.Recharge;
 
+import java.util.Date;
+
 @Data
 public class RechargeVo extends Recharge {
     private String nickName;
 
     private String avatar;
+
+    /**
+     * 开始时间
+     */
+    @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/SConsumerVo.java

@@ -29,11 +29,24 @@ public class SConsumerVo extends SConsumer {
     private Integer controller;
 
     private Integer gating;
+    //是否接收短信
+    private Integer textMessage;
+    //是否接收公众号
+    private Integer officialAccount;
 
     private ConsumerMember consumerMember;
 
-    private ConsumerWallet consumerWallet;
+    private ConsumerWalletVo consumerWallet;
 
     private MemberConfigVo memberConfig;
 
+    private Integer pageNum;
+    private Integer pageSize;
+
+    private Long newId;
+
+
+
+
+
 }

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

@@ -14,11 +14,19 @@ public class SStoreConsumerVo {
      */
     private Long consumerId;
 
+    //电控  是否接收公众号
     private Integer controller;
 
+    //门控  是否接收短信
     private Integer gating;
 
     private Integer position;
 
+    //是否接收短信
+    private Integer textMessage;
+    //是否接收公众号
+    private Integer officialAccount;
+
+
     private Long[] consumerIds;
 }

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

+package share.system.domain.vo;
+
+import lombok.Data;
+import share.system.domain.SecondaryCardConf;
+
+import java.math.BigDecimal;
+
+@Data
+public class SecondaryCardConfVo extends SecondaryCardConf {
+    //套餐名称
+    private String packName;
+    //套餐金额
+    private BigDecimal packPrice;
+}

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

+package share.system.domain.vo;
+
+import lombok.Data;
+import share.system.domain.SecondaryCardLog;
+
+import java.math.BigDecimal;
+
+@Data
+public class SecondaryCardLogVo extends SecondaryCardLog {
+    //用户昵称
+    private String nickName;
+    //用户头像
+    private String avatar;
+    //套餐名称
+    private String packName;
+    //套餐金额
+    private BigDecimal packPrice;
+    //配置名称
+    private String confName;
+    //次卡金额
+    private BigDecimal confAmount;
+}

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

+package share.system.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import share.system.domain.SecondaryCardOrder;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class SecondaryCardOrderVo extends SecondaryCardOrder {
+    //用户昵称
+    private String nickName;
+    //用户头像
+    private String avatar;
+    //套餐名称
+    private String packName;
+    //套餐金额
+    private BigDecimal packPrice;
+    //配置名称
+    private String confName;
+    //次卡金额
+    private BigDecimal confAmount;
+    /**
+     * 开始时间
+     */
+    @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/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/ConsumerMonthlyCardMapper.java

+package share.system.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import share.system.domain.ConsumerMonthlyCard;
+import share.system.domain.vo.ConsumerMonthlyCardVo;
+
+import java.util.List;
+
+/**
+ * 用户月卡Mapper接口
+ *
+ * @author wuwenlong
+ * @date 2024-08-27
+ */
+public interface ConsumerMonthlyCardMapper extends BaseMapper<ConsumerMonthlyCard> {
+    /**
+     * 查询用户月卡
+     *
+     * @param id 用户月卡主键
+     * @return 用户月卡
+     */
+    public ConsumerMonthlyCard selectConsumerMonthlyCardById(Long id);
+
+    /**
+     * 查询用户月卡列表
+     *
+     * @param consumerMonthlyCard 用户月卡
+     * @return 用户月卡集合
+     */
+    public List<ConsumerMonthlyCardVo> selectConsumerMonthlyCardList(ConsumerMonthlyCardVo consumerMonthlyCard);
+
+    /**
+     * 新增用户月卡
+     *
+     * @param consumerMonthlyCard 用户月卡
+     * @return 结果
+     */
+    public int insertConsumerMonthlyCard(ConsumerMonthlyCard consumerMonthlyCard);
+
+    /**
+     * 修改用户月卡
+     *
+     * @param consumerMonthlyCard 用户月卡
+     * @return 结果
+     */
+    public int updateConsumerMonthlyCard(ConsumerMonthlyCard consumerMonthlyCard);
+
+    /**
+     * 删除用户月卡
+     *
+     * @param id 用户月卡主键
+     * @return 结果
+     */
+    public int deleteConsumerMonthlyCardById(Long id);
+
+    /**
+     * 批量删除用户月卡
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteConsumerMonthlyCardByIds(Long[] ids);
+
+    ConsumerMonthlyCardVo selectByConsumerId(ConsumerMonthlyCardVo consumerMemberVo);
+}

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

+package share.system.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import share.system.domain.ConsumerSecondaryCard;
+import share.system.domain.vo.ConsumerSecondaryCardVo;
+
+import java.util.List;
+
+/**
+ * 用户次卡Mapper接口
+ *
+ * @author wuwenlong
+ * @date 2024-08-22
+ */
+public interface ConsumerSecondaryCardMapper extends BaseMapper<ConsumerSecondaryCard> {
+    /**
+     * 查询用户次卡
+     *
+     * @param id 用户次卡主键
+     * @return 用户次卡
+     */
+    public ConsumerSecondaryCard selectConsumerSecondaryCardById(Long id);
+
+    /**
+     * 查询用户次卡列表
+     *
+     * @param consumerSecondaryCard 用户次卡
+     * @return 用户次卡集合
+     */
+    public List<ConsumerSecondaryCardVo> selectConsumerSecondaryCardList(ConsumerSecondaryCardVo consumerSecondaryCard);
+
+    /**
+     * 新增用户次卡
+     *
+     * @param consumerSecondaryCard 用户次卡
+     * @return 结果
+     */
+    public int insertConsumerSecondaryCard(ConsumerSecondaryCard consumerSecondaryCard);
+
+    /**
+     * 修改用户次卡
+     *
+     * @param consumerSecondaryCard 用户次卡
+     * @return 结果
+     */
+    public int updateConsumerSecondaryCard(ConsumerSecondaryCard consumerSecondaryCard);
+
+    /**
+     * 删除用户次卡
+     *
+     * @param id 用户次卡主键
+     * @return 结果
+     */
+    public int deleteConsumerSecondaryCardById(Long id);
+
+    /**
+     * 批量删除用户次卡
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteConsumerSecondaryCardByIds(Long[] ids);
+
+    List<ConsumerSecondaryCardVo> selectByConsumerId(ConsumerSecondaryCardVo vo);
+}

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/mapper/EquityFundLogMapper.java

+package share.system.mapper;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import share.system.domain.EquityFundLog;
+
+/**
+ * 权益金记录Mapper接口
+ * 
+ * @author wuwenlong
+ * @date 2024-09-10
+ */
+public interface EquityFundLogMapper extends BaseMapper<EquityFundLog>
+{
+    /**
+     * 查询权益金记录
+     * 
+     * @param id 权益金记录主键
+     * @return 权益金记录
+     */
+    public EquityFundLog selectEquityFundLogById(Long id);
+
+    /**
+     * 查询权益金记录列表
+     * 
+     * @param equityFundLog 权益金记录
+     * @return 权益金记录集合
+     */
+    public List<EquityFundLog> selectEquityFundLogList(EquityFundLog equityFundLog);
+
+    /**
+     * 新增权益金记录
+     * 
+     * @param equityFundLog 权益金记录
+     * @return 结果
+     */
+    public int insertEquityFundLog(EquityFundLog equityFundLog);
+
+    /**
+     * 修改权益金记录
+     * 
+     * @param equityFundLog 权益金记录
+     * @return 结果
+     */
+    public int updateEquityFundLog(EquityFundLog equityFundLog);
+
+    /**
+     * 删除权益金记录
+     * 
+     * @param id 权益金记录主键
+     * @return 结果
+     */
+    public int deleteEquityFundLogById(Long id);
+
+    /**
+     * 批量删除权益金记录
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteEquityFundLogByIds(Long[] ids);
+}

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

+package share.system.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import share.system.domain.MonthlyCardConf;
+
+import java.util.List;
+
+/**
+ * 月卡配置Mapper接口
+ *
+ * @author wuwenlong
+ * @date 2024-08-27
+ */
+public interface MonthlyCardConfMapper extends BaseMapper<MonthlyCardConf> {
+    /**
+     * 查询月卡配置
+     *
+     * @param id 月卡配置主键
+     * @return 月卡配置
+     */
+    public MonthlyCardConf selectMonthlyCardConfById(Long id);
+
+    /**
+     * 查询月卡配置列表
+     *
+     * @param monthlyCardConf 月卡配置
+     * @return 月卡配置集合
+     */
+    public List<MonthlyCardConf> selectMonthlyCardConfList(MonthlyCardConf monthlyCardConf);
+
+    /**
+     * 新增月卡配置
+     *
+     * @param monthlyCardConf 月卡配置
+     * @return 结果
+     */
+    public int insertMonthlyCardConf(MonthlyCardConf monthlyCardConf);
+
+    /**
+     * 修改月卡配置
+     *
+     * @param monthlyCardConf 月卡配置
+     * @return 结果
+     */
+    public int updateMonthlyCardConf(MonthlyCardConf monthlyCardConf);
+
+    /**
+     * 删除月卡配置
+     *
+     * @param id 月卡配置主键
+     * @return 结果
+     */
+    public int deleteMonthlyCardConfById(Long id);
+
+    /**
+     * 批量删除月卡配置
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteMonthlyCardConfByIds(Long[] ids);
+}

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

+package share.system.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import share.system.domain.MonthlyCardLog;
+import share.system.domain.vo.MonthlyCardLogVo;
+
+import java.util.List;
+
+/**
+ * 月卡使用记录Mapper接口
+ *
+ * @author wuwenlong
+ * @date 2024-08-27
+ */
+public interface MonthlyCardLogMapper extends BaseMapper<MonthlyCardLog> {
+    /**
+     * 查询月卡使用记录
+     *
+     * @param id 月卡使用记录主键
+     * @return 月卡使用记录
+     */
+    public MonthlyCardLog selectMonthlyCardLogById(Long id);
+
+    /**
+     * 查询月卡使用记录列表
+     *
+     * @param monthlyCardLog 月卡使用记录
+     * @return 月卡使用记录集合
+     */
+    public List<MonthlyCardLogVo> selectMonthlyCardLogList(MonthlyCardLogVo monthlyCardLog);
+
+    /**
+     * 新增月卡使用记录
+     *
+     * @param monthlyCardLog 月卡使用记录
+     * @return 结果
+     */
+    public int insertMonthlyCardLog(MonthlyCardLog monthlyCardLog);
+
+    /**
+     * 修改月卡使用记录
+     *
+     * @param monthlyCardLog 月卡使用记录
+     * @return 结果
+     */
+    public int updateMonthlyCardLog(MonthlyCardLog monthlyCardLog);
+
+    /**
+     * 删除月卡使用记录
+     *
+     * @param id 月卡使用记录主键
+     * @return 结果
+     */
+    public int deleteMonthlyCardLogById(Long id);
+
+    /**
+     * 批量删除月卡使用记录
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteMonthlyCardLogByIds(Long[] ids);
+}

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

+package share.system.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import share.system.domain.MonthlyCardOrder;
+import share.system.domain.vo.MonthlyCardOrderVo;
+
+import java.util.List;
+
+/**
+ * 月卡订单Mapper接口
+ *
+ * @author wuwenlong
+ * @date 2024-08-27
+ */
+public interface MonthlyCardOrderMapper extends BaseMapper<MonthlyCardOrder> {
+    /**
+     * 查询月卡订单
+     *
+     * @param id 月卡订单主键
+     * @return 月卡订单
+     */
+    public MonthlyCardOrder selectMonthlyCardOrderById(Long id);
+
+    /**
+     * 查询月卡订单列表
+     *
+     * @param monthlyCardOrder 月卡订单
+     * @return 月卡订单集合
+     */
+    public List<MonthlyCardOrderVo> selectMonthlyCardOrderList(MonthlyCardOrderVo monthlyCardOrder);
+
+    /**
+     * 新增月卡订单
+     *
+     * @param monthlyCardOrder 月卡订单
+     * @return 结果
+     */
+    public int insertMonthlyCardOrder(MonthlyCardOrder monthlyCardOrder);
+
+    /**
+     * 修改月卡订单
+     *
+     * @param monthlyCardOrder 月卡订单
+     * @return 结果
+     */
+    public int updateMonthlyCardOrder(MonthlyCardOrder monthlyCardOrder);
+
+    /**
+     * 删除月卡订单
+     *
+     * @param id 月卡订单主键
+     * @return 结果
+     */
+    public int deleteMonthlyCardOrderById(Long id);
+
+    /**
+     * 批量删除月卡订单
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteMonthlyCardOrderByIds(Long[] ids);
+
+    MonthlyCardOrder getInfoByEntity(MonthlyCardOrder monthlyCardOrder);
+}

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

+package share.system.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import share.system.domain.SecondaryCardConf;
+import share.system.domain.vo.SecondaryCardConfVo;
+
+import java.util.List;
+
+/**
+ * 次卡配置Mapper接口
+ *
+ * @author wuwenlong
+ * @date 2024-08-22
+ */
+public interface SecondaryCardConfMapper extends BaseMapper<SecondaryCardConf> {
+    /**
+     * 查询次卡配置
+     *
+     * @param id 次卡配置主键
+     * @return 次卡配置
+     */
+    public SecondaryCardConf selectSecondaryCardConfById(Long id);
+
+    /**
+     * 查询次卡配置列表
+     *
+     * @param secondaryCardConf 次卡配置
+     * @return 次卡配置集合
+     */
+    public List<SecondaryCardConfVo> selectSecondaryCardConfList(SecondaryCardConfVo secondaryCardConf);
+
+    /**
+     * 新增次卡配置
+     *
+     * @param secondaryCardConf 次卡配置
+     * @return 结果
+     */
+    public int insertSecondaryCardConf(SecondaryCardConf secondaryCardConf);
+
+    /**
+     * 修改次卡配置
+     *
+     * @param secondaryCardConf 次卡配置
+     * @return 结果
+     */
+    public int updateSecondaryCardConf(SecondaryCardConf secondaryCardConf);
+
+    /**
+     * 删除次卡配置
+     *
+     * @param id 次卡配置主键
+     * @return 结果
+     */
+    public int deleteSecondaryCardConfById(Long id);
+
+    /**
+     * 批量删除次卡配置
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSecondaryCardConfByIds(Long[] ids);
+}

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

+package share.system.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import share.system.domain.SecondaryCardLog;
+import share.system.domain.vo.SecondaryCardLogVo;
+
+import java.util.List;
+
+/**
+ * 次卡使用记录Mapper接口
+ *
+ * @author wuwenlong
+ * @date 2024-08-22
+ */
+public interface SecondaryCardLogMapper extends BaseMapper<SecondaryCardLog> {
+    /**
+     * 查询次卡使用记录
+     *
+     * @param id 次卡使用记录主键
+     * @return 次卡使用记录
+     */
+    public SecondaryCardLog selectSecondaryCardLogById(Long id);
+
+    /**
+     * 查询次卡使用记录列表
+     *
+     * @param secondaryCardLog 次卡使用记录
+     * @return 次卡使用记录集合
+     */
+    public List<SecondaryCardLogVo> selectSecondaryCardLogList(SecondaryCardLogVo secondaryCardLog);
+
+    /**
+     * 新增次卡使用记录
+     *
+     * @param secondaryCardLog 次卡使用记录
+     * @return 结果
+     */
+    public int insertSecondaryCardLog(SecondaryCardLog secondaryCardLog);
+
+    /**
+     * 修改次卡使用记录
+     *
+     * @param secondaryCardLog 次卡使用记录
+     * @return 结果
+     */
+    public int updateSecondaryCardLog(SecondaryCardLog secondaryCardLog);
+
+    /**
+     * 删除次卡使用记录
+     *
+     * @param id 次卡使用记录主键
+     * @return 结果
+     */
+    public int deleteSecondaryCardLogById(Long id);
+
+    /**
+     * 批量删除次卡使用记录
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSecondaryCardLogByIds(Long[] ids);
+}

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

+package share.system.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import share.system.domain.SecondaryCardOrder;
+import share.system.domain.vo.SecondaryCardOrderVo;
+
+import java.util.List;
+
+/**
+ * 次卡购买记录Mapper接口
+ *
+ * @author wuwenlong
+ * @date 2024-08-22
+ */
+public interface SecondaryCardOrderMapper extends BaseMapper<SecondaryCardOrder> {
+    /**
+     * 查询次卡购买记录
+     *
+     * @param id 次卡购买记录主键
+     * @return 次卡购买记录
+     */
+    public SecondaryCardOrder selectSecondaryCardOrderById(Long id);
+
+    /**
+     * 查询次卡购买记录列表
+     *
+     * @param secondaryCardOrder 次卡购买记录
+     * @return 次卡购买记录集合
+     */
+    public List<SecondaryCardOrderVo> selectSecondaryCardOrderList(SecondaryCardOrderVo secondaryCardOrder);
+
+    /**
+     * 新增次卡购买记录
+     *
+     * @param secondaryCardOrder 次卡购买记录
+     * @return 结果
+     */
+    public int insertSecondaryCardOrder(SecondaryCardOrder secondaryCardOrder);
+
+    /**
+     * 修改次卡购买记录
+     *
+     * @param secondaryCardOrder 次卡购买记录
+     * @return 结果
+     */
+    public int updateSecondaryCardOrder(SecondaryCardOrder secondaryCardOrder);
+
+    /**
+     * 删除次卡购买记录
+     *
+     * @param id 次卡购买记录主键
+     * @return 结果
+     */
+    public int deleteSecondaryCardOrderById(Long id);
+
+    /**
+     * 批量删除次卡购买记录
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSecondaryCardOrderByIds(Long[] ids);
+
+    SecondaryCardOrder getInfoByEntity(SecondaryCardOrder secondaryCardOrderParam);
+}

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

+package share.system.mapper;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import share.system.domain.SharingActivities;
+
+/**
+ * 分享活动绑定关系Mapper接口
+ * 
+ * @author wuwenlong
+ * @date 2024-09-02
+ */
+public interface SharingActivitiesMapper extends BaseMapper<SharingActivities>
+{
+    /**
+     * 查询分享活动绑定关系
+     * 
+     * @param id 分享活动绑定关系主键
+     * @return 分享活动绑定关系
+     */
+    public SharingActivities selectSharingActivitiesById(Long id);
+
+    /**
+     * 查询分享活动绑定关系列表
+     * 
+     * @param sharingActivities 分享活动绑定关系
+     * @return 分享活动绑定关系集合
+     */
+    public List<SharingActivities> selectSharingActivitiesList(SharingActivities sharingActivities);
+
+    /**
+     * 新增分享活动绑定关系
+     * 
+     * @param sharingActivities 分享活动绑定关系
+     * @return 结果
+     */
+    public int insertSharingActivities(SharingActivities sharingActivities);
+
+    /**
+     * 修改分享活动绑定关系
+     * 
+     * @param sharingActivities 分享活动绑定关系
+     * @return 结果
+     */
+    public int updateSharingActivities(SharingActivities sharingActivities);
+
+    /**
+     * 删除分享活动绑定关系
+     * 
+     * @param id 分享活动绑定关系主键
+     * @return 结果
+     */
+    public int deleteSharingActivitiesById(Long id);
+
+    /**
+     * 批量删除分享活动绑定关系
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSharingActivitiesByIds(Long[] ids);
+
+
+}

share-system/src/main/java/share/system/request/CreateMonthlyCardRequest.java

+package share.system.request;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "CreateMonthlyCardRequest对象", description = "下单请求对象")
+public class CreateMonthlyCardRequest {
+    @ApiModelProperty(value = "支付类型(1:微信,2:支付宝)", required = true)
+    @NotNull(message = "支付类型不能为空")
+    private Integer payType;
+
+    @ApiModelProperty(value = "充值配置表id")
+    @NotNull(message = "充值配置表id")
+    private Long monthlyCardConfId;
+}

share-system/src/main/java/share/system/request/SecondaryCardOrderRequest.java

+package share.system.request;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "SecondaryCardOrderRequest对象", description = "次卡下单请求对象")
+public class SecondaryCardOrderRequest {
+    @ApiModelProperty(value = "支付类型(1:微信,2:支付宝)", required = true)
+    @NotNull(message = "支付类型不能为空")
+    private Integer payType;
+
+    @ApiModelProperty(value = "次卡配置表id")
+    @NotNull(message = "次卡配置表id")
+    private Long secondaryCardConfId;
+}

share-system/src/main/java/share/system/request/WxRegisterPhoneRequest.java

@@ -46,4 +46,7 @@ public class WxRegisterPhoneRequest implements Serializable {
     @NotBlank(message = "手机号code不能为空")
     private String phoneCode;
 
+    @ApiModelProperty(value = "上级id")
+    private Long uid;
+
 }

share-system/src/main/java/share/system/response/EquityMembersResultResponse.java

@@ -27,7 +27,7 @@ public class EquityMembersResultResponse {
     private String payType;
 
     @ApiModelProperty(value = "订单编号")
-    private String rechargeNo;
+    private String equityOrderNo;
 
     @ApiModelProperty(value = "微信支付回调的url")
     private String notifyUrl;

share-system/src/main/java/share/system/response/MonthlyyCardPayResultResponse.java

+package share.system.response;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import share.system.domain.vo.WxPayJsResultVo;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "MonthlyyCardPayResultResponse对象", description = "订单支付结果响应对象")
+public class MonthlyyCardPayResultResponse {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "支付状态")
+    private Boolean status;
+
+    @ApiModelProperty(value = "微信调起支付参数对象")
+    private WxPayJsResultVo jsConfig;
+
+    @ApiModelProperty(value = "支付类型")
+    private String payType;
+
+    @ApiModelProperty(value = "订单编号")
+    private String monthlyCardNo;
+
+    @ApiModelProperty(value = "微信支付回调的url")
+    private String notifyUrl;
+}

share-system/src/main/java/share/system/response/SecondaryCardOrderPayResultResponse.java

+package share.system.response;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import share.system.domain.vo.WxPayJsResultVo;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "SecondaryCardOrderPayResultResponse对象", description = "订单支付结果响应对象")
+public class SecondaryCardOrderPayResultResponse {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "支付状态")
+    private Boolean status;
+
+    @ApiModelProperty(value = "微信调起支付参数对象")
+    private WxPayJsResultVo jsConfig;
+
+    @ApiModelProperty(value = "支付类型")
+    private String payType;
+
+    @ApiModelProperty(value = "订单编号")
+    private String secondaryCardNo;
+
+    @ApiModelProperty(value = "微信支付回调的url")
+    private String notifyUrl;
+}

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

@@ -3,7 +3,6 @@ package share.system.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import share.system.domain.Activity;
 import share.system.domain.vo.ActivityDto;
-import share.system.domain.vo.ActivityVo;
 
 import java.util.Date;
 import java.util.List;
@@ -64,5 +63,5 @@ public interface ActivityService extends IService<Activity> {
      */
     public int deleteActivityById(Long id);
 
-    Map<Date, List<ActivityVo>> queryList(ActivityDto dto);
+    Map<Date, List<Activity>> queryList(ActivityDto dto);
 }

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

+package share.system.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import share.system.domain.ConsumerMonthlyCard;
+import share.system.domain.vo.ConsumerMonthlyCardVo;
+
+import java.util.List;
+
+/**
+ * 用户月卡Service接口
+ *
+ * @author wuwenlong
+ * @date 2024-08-27
+ */
+public interface ConsumerMonthlyCardService extends IService<ConsumerMonthlyCard> {
+    /**
+     * 查询用户月卡
+     *
+     * @param id 用户月卡主键
+     * @return 用户月卡
+     */
+    public ConsumerMonthlyCard selectConsumerMonthlyCardById(Long id);
+
+    /**
+     * 查询用户月卡列表
+     *
+     * @param consumerMonthlyCard 用户月卡
+     * @return 用户月卡集合
+     */
+    public List<ConsumerMonthlyCardVo> selectConsumerMonthlyCardList(ConsumerMonthlyCardVo consumerMonthlyCard);
+
+    /**
+     * 新增用户月卡
+     *
+     * @param consumerMonthlyCard 用户月卡
+     * @return 结果
+     */
+    public int insertConsumerMonthlyCard(ConsumerMonthlyCard consumerMonthlyCard);
+
+    /**
+     * 修改用户月卡
+     *
+     * @param consumerMonthlyCard 用户月卡
+     * @return 结果
+     */
+    public int updateConsumerMonthlyCard(ConsumerMonthlyCard consumerMonthlyCard);
+
+    /**
+     * 批量删除用户月卡
+     *
+     * @param ids 需要删除的用户月卡主键集合
+     * @return 结果
+     */
+    public int deleteConsumerMonthlyCardByIds(Long[] ids);
+
+    /**
+     * 删除用户月卡信息
+     *
+     * @param id 用户月卡主键
+     * @return 结果
+     */
+    public int deleteConsumerMonthlyCardById(Long id);
+
+    ConsumerMonthlyCardVo selectByConsumerId();
+}

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

+package share.system.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import share.system.domain.ConsumerSecondaryCard;
+import share.system.domain.vo.ConsumerSecondaryCardVo;
+
+import java.util.List;
+
+/**
+ * 用户次卡Service接口
+ *
+ * @author wuwenlong
+ * @date 2024-08-22
+ */
+public interface ConsumerSecondaryCardService extends IService<ConsumerSecondaryCard> {
+    /**
+     * 查询用户次卡
+     *
+     * @param id 用户次卡主键
+     * @return 用户次卡
+     */
+    public ConsumerSecondaryCard selectConsumerSecondaryCardById(Long id);
+
+    /**
+     * 查询用户次卡列表
+     *
+     * @param consumerSecondaryCard 用户次卡
+     * @return 用户次卡集合
+     */
+    public List<ConsumerSecondaryCardVo> selectConsumerSecondaryCardList(ConsumerSecondaryCardVo consumerSecondaryCard);
+
+    /**
+     * 新增用户次卡
+     *
+     * @param consumerSecondaryCard 用户次卡
+     * @return 结果
+     */
+    public int insertConsumerSecondaryCard(ConsumerSecondaryCard consumerSecondaryCard);
+
+    /**
+     * 修改用户次卡
+     *
+     * @param consumerSecondaryCard 用户次卡
+     * @return 结果
+     */
+    public int updateConsumerSecondaryCard(ConsumerSecondaryCard consumerSecondaryCard);
+
+    /**
+     * 批量删除用户次卡
+     *
+     * @param ids 需要删除的用户次卡主键集合
+     * @return 结果
+     */
+    public int deleteConsumerSecondaryCardByIds(Long[] ids);
+
+    /**
+     * 删除用户次卡信息
+     *
+     * @param id 用户次卡主键
+     * @return 结果
+     */
+    public int deleteConsumerSecondaryCardById(Long id);
+
+    List<ConsumerSecondaryCardVo> selectByConsumerId();
+}

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

@@ -68,4 +68,6 @@ public interface ConsumerWalletService extends IService<ConsumerWallet> {
     boolean addConsumerWallet(ConsumerWallet consumerWallet);
 
     boolean editConsumerWallet(ConsumerWallet consumerWallet, Recharge recharge, ConsumerMember one);
+
+    void accumulatedConsumptionStatistics(Long consumerId);
 }

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

 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.Device;
 import share.system.domain.DeviceDto;
 
+import java.util.List;
+
 /**
  * 设备信息Service接口
  * 
@@ -85,5 +87,7 @@ public interface DeviceService extends IService<Device>
 
     TableDataInfo devicePage(DeviceDto device);
 
-    boolean updateDeviceDoorLockPassword(Integer validTime);
+    boolean updateDeviceDoorLockPassword(Integer validTime, Long storeId);
+
+    AjaxResult updateRoomPassword(Device device);
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import share.system.domain.DurationLog;
 import share.system.domain.vo.DurationLogVo;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -60,4 +61,8 @@ public interface DurationLogService extends IService<DurationLog> {
      * @return 结果
      */
     public int deleteDurationLogById(Long id);
+
+    List<DurationLogVo> selectDurationTypeList(DurationLogVo durationLog);
+
+    BigDecimal sumVariableDuration(DurationLogVo durationLog);
 }

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);
+}