提现配置

renren-admin/src/main/java/io/renren/modules/qmgj/service/impl/MemberInfoServiceImpl.java

@@ -121,6 +121,8 @@ public class MemberInfoServiceImpl extends ServiceImpl<MemberInfoDao, MemberInfo
     private OrderService orderService;
     @Autowired
     private WxConsumeInfoService wxConsumeInfoService;
+    @Autowired
+    private MemberWalletService memberWalletService;
 
     @Resource
     private WorkStuService workStuService;
@@ -1389,6 +1391,9 @@ public class MemberInfoServiceImpl extends ServiceImpl<MemberInfoDao, MemberInfo
                 wxConsumeInfoEntity.setBusinessId(memberInfoEntity.getId());
                 wxConsumeInfoService.save(wxConsumeInfoEntity);
 
+                // 处理会员充值返佣
+                memberWalletService.handleRechargeCommission(orderEntity.getMemberId(), orderEntity.getId(), orderEntity.getActuallyPaid());
+
                 returnData.put("return_code", "SUCCESS");
                 returnData.put("return_msg", "OK");
             }

renren-admin/src/main/java/io/renren/modules/qyh/api/ApiCommissionRecordController.java

@@ -0,0 +1,43 @@
+package io.renren.modules.qyh.api;
+
+import io.renren.common.enums.CommissionRecordTypeEnum;
+import io.renren.common.utils.Constant;
+import io.renren.common.utils.PageUtils;
+import io.renren.common.utils.R;
+import io.renren.modules.qyh.service.CommissionRecordService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+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.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+ * 青雲慧-用户佣金记录
+ *
+ */
+@RestController
+@RequestMapping("api/commissionRecord")
+@Api(tags = "小程序-青雲慧-用户佣金记录")
+public class ApiCommissionRecordController {
+    @Autowired
+    private CommissionRecordService commissionRecordService;
+
+    @GetMapping("/page")
+    @ApiOperation("分页")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType = "int"),
+            @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query", required = true, dataType = "int"),
+    })
+    public R page(@RequestParam Map<String, Object> params) {
+        params.put("type", CommissionRecordTypeEnum.COMMISSION.value());
+        PageUtils page = commissionRecordService.queryPage(params);
+        return R.ok().put("page", page);
+    }
+
+}

renren-admin/src/main/java/io/renren/modules/qyh/controller/CommissionRecordController.java

@@ -0,0 +1,38 @@
+package io.renren.modules.qyh.controller;
+
+import io.renren.common.utils.PageUtils;
+import io.renren.common.utils.R;
+import io.renren.modules.qyh.service.CommissionRecordService;
+import io.renren.modules.sys.controller.AbstractController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+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.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+
+/**
+ * 青雲慧-用户佣金记录
+ *
+ */
+@RestController
+@RequestMapping("qyh/commissionRecord")
+@Api(tags = "青雲慧-用户佣金记录")
+public class CommissionRecordController extends AbstractController {
+    @Autowired
+    private CommissionRecordService commissionRecordService;
+
+    @GetMapping("/page")
+    @ApiOperation("分页")
+    @RequiresPermissions("qyh:commissionRecord:list")
+    public R page(@RequestParam Map<String, Object> params) {
+        PageUtils page = commissionRecordService.queryPage(params);
+        return R.ok().put("page", page);
+    }
+
+}

renren-admin/src/main/java/io/renren/modules/qyh/entity/CommissionRecordEntity.java

@@ -0,0 +1,69 @@
+package io.renren.modules.qyh.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * 用户佣金记录
+ *
+ * @author qingyunhui
+ * @date 2026-04-24
+ */
+@Data
+@TableName("qyh_commission_record")
+public class CommissionRecordEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId
+    private Long id;
+
+    /**
+     * 用户id(获得佣金的用户)
+     */
+    private Long memberId;
+
+    /**
+     * 类型 1-返佣收入 2-提现支出
+     */
+    private Integer type;
+
+    /**
+     * 金额(正数收入,负数支出)
+     */
+    private BigDecimal amount;
+
+    /**
+     * 返佣比例(%)
+     */
+    private Integer commissionRate;
+
+    /**
+     * 返佣订单id
+     */
+    private Long commissionOrderId;
+
+    /**
+     * 返佣订单金额
+     */
+    private BigDecimal orderAmount;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createTime;
+}

renren-admin/src/main/java/io/renren/modules/qyh/entity/MemberWalletEntity.java

@@ -0,0 +1,60 @@
+package io.renren.modules.qyh.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * 会员钱包余额
+ *
+ * @author qingyunhui
+ * @date 2026-04-24
+ */
+@Data
+@TableName("qyh_member_wallet")
+public class MemberWalletEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId
+    private Long id;
+
+    /**
+     * 用户id
+     */
+    private Long memberId;
+
+    /**
+     * 累计收益
+     */
+    private BigDecimal totalAmount;
+
+    /**
+     * 余额(可提现)
+     */
+    private BigDecimal balance;
+
+    /**
+     * 待结算金额
+     */
+    private BigDecimal pendingAmount;
+
+    /**
+     * 创建时间
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createTime;
+
+    /**
+     * 修改时间
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime updateTime;
+}

renren-admin/src/main/java/io/renren/modules/qyh/mapper/CommissionRecordMapper.java

@@ -0,0 +1,19 @@
+package io.renren.modules.qyh.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.renren.modules.qyh.entity.CommissionRecordEntity;
+import io.renren.modules.qyh.model.vo.CommissionRecordVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
+
+/**
+ * 青雲慧-用户佣金记录
+ */
+@Mapper
+public interface CommissionRecordMapper extends BaseMapper<CommissionRecordEntity> {
+
+    IPage<CommissionRecordVO> queryPage(IPage<CommissionRecordEntity> iPage, @Param("params") Map<String, Object> params);
+}

renren-admin/src/main/java/io/renren/modules/qyh/mapper/MemberWalletMapper.java

@@ -0,0 +1,13 @@
+package io.renren.modules.qyh.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import io.renren.modules.qyh.entity.MemberWalletEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 青雲慧-会员钱包余额
+ */
+@Mapper
+public interface MemberWalletMapper extends BaseMapper<MemberWalletEntity> {
+
+}

renren-admin/src/main/java/io/renren/modules/qyh/model/vo/CommissionRecordVO.java

@@ -0,0 +1,53 @@
+package io.renren.modules.qyh.model.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * 佣金记录VO
+ *
+ * @author qingyunhui
+ * @date 2026-04-24
+ */
+@Data
+@ApiModel("佣金记录VO")
+public class CommissionRecordVO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键ID")
+    private Long id;
+
+    @ApiModelProperty("会员ID")
+    private Long memberId;
+
+    @ApiModelProperty("用户名称")
+    private String userName;
+
+    @ApiModelProperty("手机号")
+    private String phone;
+
+    @ApiModelProperty("类型 1-返佣 2-提现")
+    private Integer type;
+
+    @ApiModelProperty("金额")
+    private BigDecimal amount;
+
+    @ApiModelProperty("返佣比例(%)")
+    private Integer commissionRate;
+
+    @ApiModelProperty("订单金额")
+    private BigDecimal orderAmount;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createTime;
+}

renren-admin/src/main/java/io/renren/modules/qyh/service/CommissionRecordService.java

@@ -0,0 +1,17 @@
+package io.renren.modules.qyh.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import io.renren.common.utils.PageUtils;
+import io.renren.modules.qyh.entity.CommissionRecordEntity;
+
+import java.util.Map;
+
+/**
+ * 青雲慧-用户佣金记录
+ *
+ */
+public interface CommissionRecordService extends IService<CommissionRecordEntity> {
+
+    PageUtils queryPage(Map<String, Object> params);
+
+}

renren-admin/src/main/java/io/renren/modules/qyh/service/MemberWalletService.java

@@ -0,0 +1,26 @@
+package io.renren.modules.qyh.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import io.renren.modules.qyh.entity.MemberWalletEntity;
+
+import java.math.BigDecimal;
+
+/**
+ * 青雲慧-会员钱包余额
+ *
+ */
+public interface MemberWalletService extends IService<MemberWalletEntity> {
+
+    /**
+     * 根据会员ID获取或创建钱包
+     */
+    MemberWalletEntity getOrCreateWallet(Long memberId);
+
+    /**
+     * 处理会员充值返佣(一级分销)
+     * @param orderMemberId 充值会员ID
+     * @param orderId 订单ID
+     * @param orderAmount 订单金额
+     */
+    void handleRechargeCommission(Long orderMemberId, Long orderId, BigDecimal orderAmount);
+}

renren-admin/src/main/java/io/renren/modules/qyh/service/impl/CommissionRecordServiceImpl.java

@@ -0,0 +1,31 @@
+package io.renren.modules.qyh.service.impl;
+
+import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import io.renren.common.utils.Constant;
+import io.renren.common.utils.PageUtils;
+import io.renren.modules.qyh.entity.CommissionRecordEntity;
+import io.renren.modules.qyh.mapper.CommissionRecordMapper;
+import io.renren.modules.qyh.model.vo.CommissionRecordVO;
+import io.renren.modules.qyh.service.CommissionRecordService;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+@Service("commissionRecordService")
+public class CommissionRecordServiceImpl extends ServiceImpl<CommissionRecordMapper, CommissionRecordEntity> implements CommissionRecordService {
+
+    @Override
+    public PageUtils queryPage(Map<String, Object> params) {
+        Integer page = MapUtil.getInt(params, Constant.PAGE);
+        Integer limit = MapUtil.getInt(params, Constant.LIMIT);
+        IPage<CommissionRecordEntity> iPage = new Page<>(page, limit);
+        IPage<CommissionRecordVO> commissionRecordEntityIPage = baseMapper.queryPage(iPage, params);
+        return new PageUtils(commissionRecordEntityIPage);
+    }
+
+}

renren-admin/src/main/java/io/renren/modules/qyh/service/impl/MemberWalletServiceImpl.java

@@ -0,0 +1,95 @@
+package io.renren.modules.qyh.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import io.renren.common.enums.CommissionRecordTypeEnum;
+import io.renren.common.exception.RRException;
+import io.renren.modules.qmgj.entity.MemberInfoEntity;
+import io.renren.modules.qmgj.service.MemberInfoService;
+import io.renren.modules.qyh.entity.CommissionRecordEntity;
+import io.renren.modules.qyh.entity.MemberWalletEntity;
+import io.renren.modules.qyh.entity.WithdrawConfigEntity;
+import io.renren.modules.qyh.mapper.MemberWalletMapper;
+import io.renren.modules.qyh.service.CommissionRecordService;
+import io.renren.modules.qyh.service.MemberWalletService;
+import io.renren.modules.qyh.service.WithdrawConfigService;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Service("memberWalletService")
+public class MemberWalletServiceImpl extends ServiceImpl<MemberWalletMapper, MemberWalletEntity>
+        implements MemberWalletService {
+    @Autowired
+    private MemberInfoService memberInfoService;
+    @Autowired
+    private WithdrawConfigService withdrawConfigService;
+    @Autowired
+    private CommissionRecordService commissionRecordService;
+
+    @Override
+    public MemberWalletEntity getOrCreateWallet(Long memberId) {
+        MemberWalletEntity wallet = baseMapper.selectOne(new LambdaQueryWrapper<MemberWalletEntity>().eq(MemberWalletEntity::getMemberId, memberId));
+        if (wallet == null) {
+            wallet = new MemberWalletEntity();
+            wallet.setMemberId(memberId);
+            wallet.setTotalAmount(BigDecimal.ZERO);
+            wallet.setBalance(BigDecimal.ZERO);
+            wallet.setPendingAmount(BigDecimal.ZERO);
+            wallet.setCreateTime(LocalDateTime.now());
+            wallet.setUpdateTime(LocalDateTime.now());
+            baseMapper.insert(wallet);
+        }
+        return wallet;
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void handleRechargeCommission(Long orderMemberId, Long orderId, BigDecimal orderAmount) {
+        // 1. 获取充值的会员信息
+        MemberInfoEntity memberInfoEntity = memberInfoService.memberById(orderMemberId);
+        if (memberInfoEntity == null) {
+            return;
+        }
+        // 2. 获取上级邀请码
+        String pInviteCode = memberInfoEntity.getPInviteCode();
+        if (StringUtils.isEmpty(pInviteCode)) {
+            // 没有上级,不返佣
+            return;
+        }
+        // 3. 根据上级邀请码查找上级会员
+        MemberInfoEntity parentMember = memberInfoService.loadByInviteCode(pInviteCode, false);
+        if (parentMember == null) {
+            return;
+        }
+        // 4. 获取返佣配置
+        WithdrawConfigEntity config = withdrawConfigService.getOne();
+        Integer commissionRate = config.getCommissionRate(); // 返佣比例
+        // 5. 计算返佣金额
+        BigDecimal commissionAmount = orderAmount.multiply(BigDecimal.valueOf(commissionRate))
+                .divide(BigDecimal.valueOf(100), 2, BigDecimal.ROUND_HALF_UP);
+        // 6. 给上级会员钱包增加余额
+        MemberWalletEntity wallet = this.getOrCreateWallet(parentMember.getId());
+        wallet.setBalance(wallet.getBalance().add(commissionAmount));
+        wallet.setTotalAmount(wallet.getTotalAmount().add(commissionAmount));
+        wallet.setUpdateTime(LocalDateTime.now());
+        baseMapper.updateById(wallet);
+        // 记录佣金流水
+        CommissionRecordEntity record = new CommissionRecordEntity();
+        record.setMemberId(wallet.getMemberId());
+        record.setType(CommissionRecordTypeEnum.COMMISSION.value()); // 1-返佣收入
+        record.setAmount(commissionAmount);
+        record.setCommissionRate(commissionRate);
+        record.setCommissionOrderId(orderId);
+        record.setOrderAmount(orderAmount);
+        record.setRemark(String.format("[%s]开通会员-返佣%d%%",
+                memberInfoEntity.getVipname(),
+                commissionRate));
+        record.setCreateTime(LocalDateTime.now());
+        commissionRecordService.save(record);
+    }
+}

renren-admin/src/main/resources/mapper/qyh/CommissionRecordDao.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="io.renren.modules.qyh.mapper.CommissionRecordMapper">
+
+    <select id="queryPage" resultType="io.renren.modules.qyh.model.vo.CommissionRecordVO">
+        SELECT
+        cr.*,
+        mi.VIPNAME AS userName,
+        mi.PHONE AS phone
+        FROM qyh_commission_record cr
+        LEFT JOIN member_info mi ON cr.member_id = mi.id
+        <where>
+            <if test="params.memberId != null and params.memberId != ''">
+                AND cr.member_id = #{params.memberId}
+            </if>
+            <if test="params.userName != null and params.userName != ''">
+                AND mi.VIPNAME LIKE CONCAT('%', #{params.userName}, '%')
+            </if>
+            <if test="params.phone != null and params.phone != ''">
+                AND mi.PHONE LIKE CONCAT('%', #{params.phone}, '%')
+            </if>
+            <if test="params.minAmount != null and params.minAmount != ''">
+                AND cr.amount &gt;= #{params.minAmount}
+            </if>
+            <if test="params.maxAmount != null and params.maxAmount != ''">
+                AND cr.amount &lt;= #{params.maxAmount}
+            </if>
+            <if test="params.type != null and params.type != ''">
+                AND cr.type = #{params.type}
+            </if>
+        </where>
+        ORDER BY cr.create_time DESC
+    </select>
+
+</mapper>

renren-admin/src/main/resources/statics/js/modules/qyh/commissionDetails.js

@@ -1,21 +1,27 @@
-var i = getUrlParam("id");
 $(function () {
     $("#jqGrid").jqGrid({
-        // url: baseURL + 'qmjz/scoreStu/page',
-        postData: { id: i },
+        url: baseURL + 'qyh/commissionRecord/page',
         datatype: "json",
         colModel: [
             { label: 'id', name: 'id', index: 'id', width: 50, key: true, hidden: true },
-            { label: '用户', name: 'stuId', index: 'stuId', sortable: false },
+            { label: '用户', name: 'userName', index: 'userName', sortable: false },
             { label: '手机号', name: 'phone', index: 'phone', sortable: false},
-            { label: '金额', name: 'commission', index: 'commission', sortable: false },
+            { label: '金额', name: 'amount', index: 'amount', sortable: false,
+                formatter: function (cellvalue, options, rowdata) {
+                    var amount = parseFloat(cellvalue) || 0;
+                    if (amount > 0) {
+                        return '<span style="color:#52c41a">+¥' + amount.toFixed(2) + '</span>';
+                    } else {
+                        return '<span style="color:#ff4d4f">-¥' + Math.abs(amount).toFixed(2) + '</span>';
+                    }
+                }},
             {
-                label: '类型', name: 'scoreType', index: 'scoreType', formatter: function (cellvalue, options, rowdata) {
-                    // for (const item of vm.transferType) {
-                    //     if (cellvalue == item.value) {
-                    //         return item.code
-                    //     }
-                    // }
+                label: '类型', name: 'type', index: 'type', formatter: function (cellvalue, options, rowdata) {
+                    if (cellvalue === 1) {
+                        return '返佣';
+                    } else if (cellvalue === 2) {
+                        return '佣金提现';
+                    }
                     return ''
                 }
             },
@@ -56,25 +62,24 @@ $(function () {
 var vm = new Vue({
     el: '#rrapp',
     data: {
-        workTagConnect: {},
-        dict: null,
         showList: true,
         q: {
-            scoreType: '',
+            userName: '',
             phone: '',
-            scoreEvent: '',
-            stuId: '',
+            minAmount: '',
+            maxAmount: '',
+            type: ''
         },
         jpgrid: {},
     },
 
     methods: {
         init: function () {
-            vm.q.scoreType = '';
+            vm.q.userName = '';
             vm.q.phone = '';
-            vm.q.scoreEvent = '';
-            vm.q.stuId = '';
-
+            vm.q.minAmount = '';
+            vm.q.maxAmount = '';
+            vm.q.type = '';
         },
         query: function () {
             vm.reload(1);
@@ -91,7 +96,7 @@ var vm = new Vue({
                 page = $("#jqGrid").jqGrid('getGridParam', 'page');
             }
             $("#jqGrid").jqGrid('setGridParam', {
-                postData: { 'pid': i, 'stuId': vm.q.stuId, 'phone': vm.q.phone, 'scoreEvent': vm.q.scoreEvent, 'scoreType': vm.q.scoreType },
+                postData: { 'userName': vm.q.userName, 'phone': vm.q.phone, 'minAmount': vm.q.minAmount, 'maxAmount': vm.q.maxAmount, 'type': vm.q.type},
                 page: page
             }).trigger("reloadGrid");
         },

renren-admin/src/main/resources/templates/modules/qyh/commissionDetails.html

@@ -9,14 +9,16 @@
         <div class="grid-btn">
             <div>
                 <div class="form-group col-sm-12 div-Gay">
-                    <input type="text" class="form-control" v-model.number="q.stuId" @keyup.enter="query" placeholder="用户" onkeyup="this.value=this.value.replace(/\D/g,'')" onafterpaste="this.value=this.value.replace(/\D/g,'')">
+                    <input type="text" class="form-control" v-model.number="q.userName" @keyup.enter="query" placeholder="用户" onkeyup="this.value=this.value.replace(/\D/g,'')" onafterpaste="this.value=this.value.replace(/\D/g,'')">
                     <input type="text" class="form-control" v-model="q.phone" @keyup.enter="query" placeholder="手机号" onkeyup="this.value=this.value.replace(/\D/g,'')" onafterpaste="this.value=this.value.replace(/\D/g,'')">
-                    <select id="qsex" class="form-control" v-model="q.scoreType"    @keyup.enter="query">
+                    <input type="text" class="form-control" v-model="q.minAmount" @keyup.enter="query" placeholder="最小金额" style="width: 120px; display: inline-block;" onkeyup="this.value=this.value.replace(/[^\d.]/g,'')" onafterpaste="this.value=this.value.replace(/[^\d.]/g,'')">
+                    <label style="padding: 0 5px;">—</label>
+                    <input type="text" class="form-control" v-model="q.maxAmount" @keyup.enter="query" placeholder="最大金额" style="width: 120px; display: inline-block;" onkeyup="this.value=this.value.replace(/[^\d.]/g,'')" onafterpaste="this.value=this.value.replace(/[^\d.]/g,'')">
+                    <select id="qsex" class="form-control" v-model="q.type"    @keyup.enter="query">
                         <option  value="" hidden disabled>--转换类型--</option>
-                        <option name="type" :value="1">佣金提现</option>
-                        <option name="type" :value="2">返佣</option>
+                        <option name="type" :value="1">返佣</option>
+                        <option name="type" :value="2">佣金提现</option>
                     </select>
-
                     <a class="btn btn-query" @click="query"><i class="fa fa-search"></i>&nbsp;查询</a>
                     <a class="btn btn-success" @click="refresh"><i class="fa fa-refresh"></i>&nbsp;刷新</a>
 

renren-common/src/main/java/io/renren/common/enums/CommissionRecordTypeEnum.java

@@ -0,0 +1,41 @@
+package io.renren.common.enums;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.fasterxml.jackson.annotation.JsonCreator;
+
+/**
+ * 1-返佣 2-返佣提现
+ *
+ * @author lijiahe
+ */
+public enum CommissionRecordTypeEnum {
+
+    COMMISSION(1, "返佣"),
+    COMMISSION_WITHDRAW(2, "返佣提现");
+
+    private Integer value;
+    private String desc;
+
+    CommissionRecordTypeEnum(Integer value, String desc) {
+        this.value = value;
+        this.desc = desc;
+    }
+
+    public Integer value() {
+        return this.value;
+    }
+
+    public String desc() {
+        return this.desc;
+    }
+
+    @JsonCreator
+    public static CommissionRecordTypeEnum getByCode(Integer value) {
+        for (CommissionRecordTypeEnum ynEnum : CommissionRecordTypeEnum.values()) {
+            if (ObjectUtil.equal(value, ynEnum.value())) {
+                return ynEnum;
+            }
+        }
+        return null;
+    }
+}