init

2024-03-20 00:16:31 +08:00
parent d7fa5b4af5
commit 22d18c6b32
26 changed files with 1055 additions and 0 deletions
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/ConsumeLogController.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/ConsumeLogController.java
@@ -0,0 +1,95 @@
+package com.ruoyi.xq.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.xq.domain.ConsumeLog;
+import com.ruoyi.xq.service.ConsumeLogService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+
+/**
+ * 分销记录
+ *
+ * @author 77
+ * @date 2024-03-20
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/xq/consumeLog")
+public class ConsumeLogController extends BaseController {
+
+    private final ConsumeLogService consumeLogService;
+
+    /**
+     * 查询分销记录列表
+     */
+    @SaCheckPermission("xq:consumeLog:list")
+    @GetMapping("/list")
+    public TableDataInfo<ConsumeLog> list(ConsumeLog bo, PageQuery pageQuery) {
+        Page<ConsumeLog> page = consumeLogService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
+        return TableDataInfo.build(page);
+    }
+
+    /**
+     * 获取分销记录详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("xq:consumeLog:query")
+    @GetMapping("/{id}")
+    public R<ConsumeLog> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(consumeLogService.getById(id));
+    }
+
+    /**
+     * 新增分销记录
+     */
+    @SaCheckPermission("xq:consumeLog:add")
+    @Log(title = "分销记录", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody ConsumeLog bo) {
+        return toAjax(consumeLogService.save(bo));
+    }
+
+    /**
+     * 修改分销记录
+     */
+    @SaCheckPermission("xq:consumeLog:edit")
+    @Log(title = "分销记录", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ConsumeLog bo) {
+        return toAjax(consumeLogService.updateById(bo));
+    }
+
+    /**
+     * 删除分销记录
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("xq:consumeLog:remove")
+    @Log(title = "分销记录", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(consumeLogService.removeBatchByIds(Arrays.asList(ids)));
+    }
+}
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/SysPushController.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/SysPushController.java
@@ -0,0 +1,95 @@
+package com.ruoyi.xq.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.xq.domain.SysPush;
+import com.ruoyi.xq.service.SysPushService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+
+/**
+ * 推送系统消息
+ *
+ * @author 77
+ * @date 2024-03-20
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/xq/sysPush")
+public class SysPushController extends BaseController {
+
+    private final SysPushService sysPushService;
+
+    /**
+     * 查询推送系统消息列表
+     */
+    @SaCheckPermission("xq:sysPush:list")
+    @GetMapping("/list")
+    public TableDataInfo<SysPush> list(SysPush bo, PageQuery pageQuery) {
+        Page<SysPush> page = sysPushService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
+        return TableDataInfo.build(page);
+    }
+
+    /**
+     * 获取推送系统消息详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("xq:sysPush:query")
+    @GetMapping("/{id}")
+    public R<SysPush> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(sysPushService.getById(id));
+    }
+
+    /**
+     * 新增推送系统消息
+     */
+    @SaCheckPermission("xq:sysPush:add")
+    @Log(title = "推送系统消息", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody SysPush bo) {
+        return toAjax(sysPushService.save(bo));
+    }
+
+    /**
+     * 修改推送系统消息
+     */
+    @SaCheckPermission("xq:sysPush:edit")
+    @Log(title = "推送系统消息", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysPush bo) {
+        return toAjax(sysPushService.updateById(bo));
+    }
+
+    /**
+     * 删除推送系统消息
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("xq:sysPush:remove")
+    @Log(title = "推送系统消息", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(sysPushService.removeBatchByIds(Arrays.asList(ids)));
+    }
+}
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/SysPushLogController.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/SysPushLogController.java
@@ -0,0 +1,95 @@
+package com.ruoyi.xq.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.xq.domain.SysPushLog;
+import com.ruoyi.xq.service.SysPushLogService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+
+/**
+ * 推送系统消息记录
+ *
+ * @author 77
+ * @date 2024-03-20
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/xq/sysPushLog")
+public class SysPushLogController extends BaseController {
+
+    private final SysPushLogService sysPushLogService;
+
+    /**
+     * 查询推送系统消息记录列表
+     */
+    @SaCheckPermission("xq:sysPushLog:list")
+    @GetMapping("/list")
+    public TableDataInfo<SysPushLog> list(SysPushLog bo, PageQuery pageQuery) {
+        Page<SysPushLog> page = sysPushLogService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
+        return TableDataInfo.build(page);
+    }
+
+    /**
+     * 获取推送系统消息记录详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("xq:sysPushLog:query")
+    @GetMapping("/{id}")
+    public R<SysPushLog> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(sysPushLogService.getById(id));
+    }
+
+    /**
+     * 新增推送系统消息记录
+     */
+    @SaCheckPermission("xq:sysPushLog:add")
+    @Log(title = "推送系统消息记录", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody SysPushLog bo) {
+        return toAjax(sysPushLogService.save(bo));
+    }
+
+    /**
+     * 修改推送系统消息记录
+     */
+    @SaCheckPermission("xq:sysPushLog:edit")
+    @Log(title = "推送系统消息记录", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysPushLog bo) {
+        return toAjax(sysPushLogService.updateById(bo));
+    }
+
+    /**
+     * 删除推送系统消息记录
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("xq:sysPushLog:remove")
+    @Log(title = "推送系统消息记录", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(sysPushLogService.removeBatchByIds(Arrays.asList(ids)));
+    }
+}
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/WxTransOrderController.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/WxTransOrderController.java
@@ -0,0 +1,95 @@
+package com.ruoyi.xq.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.xq.domain.WxTransOrder;
+import com.ruoyi.xq.service.WxTransOrderService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+
+/**
+ * 微信交换订单
+ *
+ * @author 77
+ * @date 2024-03-20
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/xq/wxTransOrder")
+public class WxTransOrderController extends BaseController {
+
+    private final WxTransOrderService wxTransOrderService;
+
+    /**
+     * 查询微信交换订单列表
+     */
+    @SaCheckPermission("xq:wxTransOrder:list")
+    @GetMapping("/list")
+    public TableDataInfo<WxTransOrder> list(WxTransOrder bo, PageQuery pageQuery) {
+        Page<WxTransOrder> page = wxTransOrderService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
+        return TableDataInfo.build(page);
+    }
+
+    /**
+     * 获取微信交换订单详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("xq:wxTransOrder:query")
+    @GetMapping("/{id}")
+    public R<WxTransOrder> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(wxTransOrderService.getById(id));
+    }
+
+    /**
+     * 新增微信交换订单
+     */
+    @SaCheckPermission("xq:wxTransOrder:add")
+    @Log(title = "微信交换订单", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody WxTransOrder bo) {
+        return toAjax(wxTransOrderService.save(bo));
+    }
+
+    /**
+     * 修改微信交换订单
+     */
+    @SaCheckPermission("xq:wxTransOrder:edit")
+    @Log(title = "微信交换订单", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody WxTransOrder bo) {
+        return toAjax(wxTransOrderService.updateById(bo));
+    }
+
+    /**
+     * 删除微信交换订单
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("xq:wxTransOrder:remove")
+    @Log(title = "微信交换订单", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(wxTransOrderService.removeBatchByIds(Arrays.asList(ids)));
+    }
+}
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/domain/ConsumeLog.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/domain/ConsumeLog.java
@@ -0,0 +1,122 @@
+package com.ruoyi.xq.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 分销记录对象 xq_consume_log
+ *
+ * @author 77
+ * @date 2024-03-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("xq_consume_log")
+public class ConsumeLog extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 
+     */
+    @TableId(value = "id")
+    private Long id;
+    /**
+     * 类型 1-VIP
+     */
+    private Integer type;
+    /**
+     * 业务参数
+     */
+    private String businessParam;
+    /**
+     * 跟踪ID
+     */
+    private String traceId;
+    /**
+     * 发生金额
+     */
+    private BigDecimal amount;
+    /**
+     * 一级金额
+     */
+    private Long oneAmount;
+    /**
+     * 消费方用户
+     */
+    private Long sourceUserId;
+    /**
+     * 消费方用户编码
+     */
+    private String sourceUsercode;
+    /**
+     * 消费方用户手机
+     */
+    private String sourcePhone;
+    /**
+     * 一级分销方
+     */
+    private Long oneUserId;
+    /**
+     * 一级分销方
+     */
+    private String oneUsercode;
+    /**
+     * 一级分销方
+     */
+    private String onePhone;
+    /**
+     * 一级分销方抽成比例
+     */
+    private BigDecimal oneRate;
+    /**
+     * 是否参与分销
+     */
+    private String oneJoin;
+    /**
+     * 状态  0-待计算分销 1-已计算分销
+     */
+    private String calculateStatus;
+    /**
+     * 状态  -1-无须分销 0-待分销 1-已分销
+     */
+    private Integer status;
+    /**
+     * 状态  0-否 1-是
+     */
+    private String admin;
+    /**
+     * 管理员ID
+     */
+    private Long adminId;
+    /**
+     * 名称
+     */
+    private String adminName;
+    /**
+     * 分销人ID
+     */
+    private Long opId;
+    /**
+     * 分销人名称
+     */
+    private String opName;
+    /**
+     * 分销时间
+     */
+    private Date opCreate;
+    /**
+     * 备注
+     */
+    private String remark;
+
+}
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/domain/SysPush.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/domain/SysPush.java
@@ -0,0 +1,85 @@
+package com.ruoyi.xq.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 推送系统消息对象 xq_sys_push
+ *
+ * @author 77
+ * @date 2024-03-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("xq_sys_push")
+public class SysPush extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 
+     */
+    @TableId(value = "id")
+    private Long id;
+    /**
+     * 群体类型: 0=单个用户,1=全部用户,2=男用户,3=女用户, 4 =认证女神
+     */
+    private Integer groupId;
+    /**
+     * 消息类型:0=纯文字消息,1=文本消息,2=单图文消息,3=多图文消息
+     */
+    private Integer type;
+    /**
+     * 用户id,仅在group_id=单个用户时生效
+     */
+    private Long userId;
+    /**
+     * 蜜瓜号
+     */
+    private String usercode;
+    /**
+     * 标题
+     */
+    private String title;
+    /**
+     * 内容
+     */
+    private String content;
+    /**
+     * 前端参数
+     */
+    private String params;
+    /**
+     * 备注说明
+     */
+    private String remark;
+    /**
+     * 发送类型:0=手动发送,1=定时发送
+     */
+    private Integer sendTimeType;
+    /**
+     * 发送时间
+     */
+    private Date sendTime;
+    /**
+     * 已推送人数
+     */
+    private Integer num;
+    /**
+     * 状态:0=未执行,1=执行中,2队列执行中,3=已完成
+     */
+    private Integer status;
+    /**
+     * 完成时间
+     */
+    private Date endTime;
+
+}
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/domain/SysPushLog.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/domain/SysPushLog.java
@@ -0,0 +1,65 @@
+package com.ruoyi.xq.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 推送系统消息记录对象 xq_sys_push_log
+ *
+ * @author 77
+ * @date 2024-03-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("xq_sys_push_log")
+public class SysPushLog extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 
+     */
+    @TableId(value = "id")
+    private Long id;
+    /**
+     * 系统推送id
+     */
+    private Long sysPushId;
+    /**
+     * 推送到的用户id
+     */
+    private String userJson;
+    /**
+     * 推送人数
+     */
+    private Integer num;
+    /**
+     * 推送状态:0=未推送,1=推送中,2=推送失败,3=推送成功
+     */
+    private Integer status;
+    /**
+     * 推送返回的结果
+     */
+    private String result;
+    /**
+     * 重试次数
+     */
+    private Integer retry;
+    /**
+     * 开始发送时间
+     */
+    private Date beginTime;
+    /**
+     * 完成时间
+     */
+    private Date endTime;
+
+}
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/domain/UserExtend.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/domain/UserExtend.java
@@ -37,6 +37,10 @@ public class UserExtend implements Serializable {
     * 收益的余额
     */
    private BigDecimal incomeCoin;
+    /**
+     * 交换微信次数
+     */
+    private Integer wxTransNum;
    /**
     * 消费统计
     */
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/domain/WxTransOrder.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/domain/WxTransOrder.java
@@ -0,0 +1,98 @@
+package com.ruoyi.xq.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 微信交换订单对象 xq_wx_trans_order
+ *
+ * @author 77
+ * @date 2024-03-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("xq_wx_trans_order")
+public class WxTransOrder extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 
+     */
+    @TableId(value = "id")
+    private Long id;
+    /**
+     * 用户ID
+     */
+    private Long userId;
+    /**
+     * 用户号
+     */
+    private String usercode;
+    /**
+     * 跟踪ID
+     */
+    private String traceId;
+    /**
+     * WX-ID
+     */
+    private Long wxId;
+    /**
+     * 开通微信交换次数
+     */
+    private Integer wxNum;
+    /**
+     * 会员价格
+     */
+    private BigDecimal wxPrice;
+    /**
+     * 订单说明
+     */
+    private String orderName;
+    /**
+     * 订单号
+     */
+    private String orderNo;
+    /**
+     * 平台
+     */
+    private String platformType;
+    /**
+     * 状态 0-待支付 1-已支付 5-已退款 10-无需支付
+     */
+    private Integer payStatus;
+    /**
+     * 支付时间
+     */
+    private Date payTime;
+    /**
+     * appId
+     */
+    private String appid;
+    /**
+     * 
+     */
+    private String returnContent;
+    /**
+     * 
+     */
+    private String operateIp;
+    /**
+     * 来源 1-订单 2-vip赠送 3-后台管理新增
+     */
+    private Integer source;
+    /**
+     * 后台操作管理员ID
+     */
+    private Long adminId;
+
+}
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/enums/common/TraceIdEnum.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/enums/common/TraceIdEnum.java
@@ -5,6 +5,8 @@ import lombok.Getter;
@Getter
 public enum TraceIdEnum {
    WITHDRAW("WT","提现"),
+    VIP("VT","VIP"),
+    WX_TRANS("XT","微信"),
        ;
    private final String code;
    private final String text;
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/ConsumeLogMapper.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/ConsumeLogMapper.java
@@ -0,0 +1,14 @@
+package com.ruoyi.xq.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.xq.domain.ConsumeLog;
+
+/**
+ * 分销记录Mapper接口
+ *
+ * @author 77
+ * @date 2024-03-20
+ */
+public interface ConsumeLogMapper extends BaseMapper<ConsumeLog> {
+
+}
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/SysPushLogMapper.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/SysPushLogMapper.java
@@ -0,0 +1,14 @@
+package com.ruoyi.xq.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.xq.domain.SysPushLog;
+
+/**
+ * 推送系统消息记录Mapper接口
+ *
+ * @author 77
+ * @date 2024-03-20
+ */
+public interface SysPushLogMapper extends BaseMapper<SysPushLog> {
+
+}
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/SysPushMapper.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/SysPushMapper.java
@@ -0,0 +1,14 @@
+package com.ruoyi.xq.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.xq.domain.SysPush;
+
+/**
+ * 推送系统消息Mapper接口
+ *
+ * @author 77
+ * @date 2024-03-20
+ */
+public interface SysPushMapper extends BaseMapper<SysPush> {
+
+}
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/WxTransOrderMapper.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/WxTransOrderMapper.java
@@ -0,0 +1,14 @@
+package com.ruoyi.xq.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.xq.domain.WxTransOrder;
+
+/**
+ * 微信交换订单Mapper接口
+ *
+ * @author 77
+ * @date 2024-03-20
+ */
+public interface WxTransOrderMapper extends BaseMapper<WxTransOrder> {
+
+}
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/ConsumeLogService.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/ConsumeLogService.java
@@ -0,0 +1,14 @@
+package com.ruoyi.xq.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.xq.domain.ConsumeLog;
+
+/**
+ * 分销记录Service接口
+ *
+ * @author 77
+ * @date 2024-03-20
+ */
+public interface ConsumeLogService extends IService<ConsumeLog> {
+
+}
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/SysPushLogService.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/SysPushLogService.java
@@ -0,0 +1,14 @@
+package com.ruoyi.xq.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.xq.domain.SysPushLog;
+
+/**
+ * 推送系统消息记录Service接口
+ *
+ * @author 77
+ * @date 2024-03-20
+ */
+public interface SysPushLogService extends IService<SysPushLog> {
+
+}
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/SysPushService.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/SysPushService.java
@@ -0,0 +1,14 @@
+package com.ruoyi.xq.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.xq.domain.SysPush;
+
+/**
+ * 推送系统消息Service接口
+ *
+ * @author 77
+ * @date 2024-03-20
+ */
+public interface SysPushService extends IService<SysPush> {
+
+}
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/WxTransOrderService.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/WxTransOrderService.java
@@ -0,0 +1,14 @@
+package com.ruoyi.xq.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.xq.domain.WxTransOrder;
+
+/**
+ * 微信交换订单Service接口
+ *
+ * @author 77
+ * @date 2024-03-20
+ */
+public interface WxTransOrderService extends IService<WxTransOrder> {
+
+}
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/ConsumeLogServiceImpl.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/ConsumeLogServiceImpl.java
@@ -0,0 +1,18 @@
+package com.ruoyi.xq.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.xq.domain.ConsumeLog;
+import com.ruoyi.xq.mapper.ConsumeLogMapper;
+import com.ruoyi.xq.service.ConsumeLogService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 分销记录Service业务层处理
+ *
+ * @author 77
+ * @date 2024-03-20
+ */
+@Service
+public class ConsumeLogServiceImpl extends ServiceImpl<ConsumeLogMapper,ConsumeLog> implements ConsumeLogService {
+
+}
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/SysPushLogServiceImpl.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/SysPushLogServiceImpl.java
@@ -0,0 +1,18 @@
+package com.ruoyi.xq.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.xq.domain.SysPushLog;
+import com.ruoyi.xq.mapper.SysPushLogMapper;
+import com.ruoyi.xq.service.SysPushLogService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 推送系统消息记录Service业务层处理
+ *
+ * @author 77
+ * @date 2024-03-20
+ */
+@Service
+public class SysPushLogServiceImpl extends ServiceImpl<SysPushLogMapper,SysPushLog> implements SysPushLogService {
+
+}
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/SysPushServiceImpl.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/SysPushServiceImpl.java
@@ -0,0 +1,18 @@
+package com.ruoyi.xq.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.xq.domain.SysPush;
+import com.ruoyi.xq.mapper.SysPushMapper;
+import com.ruoyi.xq.service.SysPushService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 推送系统消息Service业务层处理
+ *
+ * @author 77
+ * @date 2024-03-20
+ */
+@Service
+public class SysPushServiceImpl extends ServiceImpl<SysPushMapper,SysPush> implements SysPushService {
+
+}
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/WxTransOrderServiceImpl.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/WxTransOrderServiceImpl.java
@@ -0,0 +1,18 @@
+package com.ruoyi.xq.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.xq.domain.WxTransOrder;
+import com.ruoyi.xq.mapper.WxTransOrderMapper;
+import com.ruoyi.xq.service.WxTransOrderService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 微信交换订单Service业务层处理
+ *
+ * @author 77
+ * @date 2024-03-20
+ */
+@Service
+public class WxTransOrderServiceImpl extends ServiceImpl<WxTransOrderMapper,WxTransOrder> implements WxTransOrderService {
+
+}
--- a/ruoyi-xq/src/main/resources/mapper/xq/ConsumeLogMapper.xml
+++ b/ruoyi-xq/src/main/resources/mapper/xq/ConsumeLogMapper.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.xq.mapper.ConsumeLogMapper">
+
+    <resultMap type="com.ruoyi.xq.domain.ConsumeLog" id="ConsumeLogResult">
+        <result property="id" column="id"/>
+        <result property="type" column="type"/>
+        <result property="businessParam" column="business_param"/>
+        <result property="traceId" column="trace_id"/>
+        <result property="amount" column="amount"/>
+        <result property="oneAmount" column="one_amount"/>
+        <result property="sourceUserId" column="source_user_id"/>
+        <result property="sourceUsercode" column="source_usercode"/>
+        <result property="sourcePhone" column="source_phone"/>
+        <result property="oneUserId" column="one_user_id"/>
+        <result property="oneUsercode" column="one_usercode"/>
+        <result property="onePhone" column="one_phone"/>
+        <result property="oneRate" column="one_rate"/>
+        <result property="oneJoin" column="one_join"/>
+        <result property="calculateStatus" column="calculate_status"/>
+        <result property="status" column="status"/>
+        <result property="admin" column="admin"/>
+        <result property="adminId" column="admin_id"/>
+        <result property="adminName" column="admin_name"/>
+        <result property="opId" column="op_id"/>
+        <result property="opName" column="op_name"/>
+        <result property="opCreate" column="op_create"/>
+        <result property="remark" column="remark"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+
+</mapper>
--- a/ruoyi-xq/src/main/resources/mapper/xq/SysPushLogMapper.xml
+++ b/ruoyi-xq/src/main/resources/mapper/xq/SysPushLogMapper.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.xq.mapper.SysPushLogMapper">
+
+    <resultMap type="com.ruoyi.xq.domain.SysPushLog" id="SysPushLogResult">
+        <result property="id" column="id"/>
+        <result property="sysPushId" column="sys_push_id"/>
+        <result property="userJson" column="user_json"/>
+        <result property="num" column="num"/>
+        <result property="status" column="status"/>
+        <result property="result" column="result"/>
+        <result property="retry" column="retry"/>
+        <result property="beginTime" column="begin_time"/>
+        <result property="endTime" column="end_time"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+
+</mapper>
--- a/ruoyi-xq/src/main/resources/mapper/xq/SysPushMapper.xml
+++ b/ruoyi-xq/src/main/resources/mapper/xq/SysPushMapper.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.xq.mapper.SysPushMapper">
+
+    <resultMap type="com.ruoyi.xq.domain.SysPush" id="SysPushResult">
+        <result property="id" column="id"/>
+        <result property="groupId" column="group_id"/>
+        <result property="type" column="type"/>
+        <result property="userId" column="user_id"/>
+        <result property="usercode" column="usercode"/>
+        <result property="title" column="title"/>
+        <result property="content" column="content"/>
+        <result property="params" column="params"/>
+        <result property="remark" column="remark"/>
+        <result property="sendTimeType" column="send_time_type"/>
+        <result property="sendTime" column="send_time"/>
+        <result property="num" column="num"/>
+        <result property="status" column="status"/>
+        <result property="endTime" column="end_time"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+
+</mapper>
--- a/ruoyi-xq/src/main/resources/mapper/xq/WxTransOrderMapper.xml
+++ b/ruoyi-xq/src/main/resources/mapper/xq/WxTransOrderMapper.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.xq.mapper.WxTransOrderMapper">
+
+    <resultMap type="com.ruoyi.xq.domain.WxTransOrder" id="WxTransOrderResult">
+        <result property="id" column="id"/>
+        <result property="userId" column="user_id"/>
+        <result property="usercode" column="usercode"/>
+        <result property="traceId" column="trace_id"/>
+        <result property="wxId" column="wx_id"/>
+        <result property="wxNum" column="wx_num"/>
+        <result property="wxPrice" column="wx_price"/>
+        <result property="orderName" column="order_name"/>
+        <result property="orderNo" column="order_no"/>
+        <result property="platformType" column="platform_type"/>
+        <result property="payStatus" column="pay_status"/>
+        <result property="payTime" column="pay_time"/>
+        <result property="appid" column="appid"/>
+        <result property="returnContent" column="return_content"/>
+        <result property="operateIp" column="operate_ip"/>
+        <result property="source" column="source"/>
+        <result property="adminId" column="admin_id"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+
+</mapper>