Merge remote-tracking branch 'origin/master'

phpcjl

2024-12-16 cb490e56ee7bccbc3b56d6964e9b68e5aa8ec475

Merge remote-tracking branch 'origin/master'

 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/BalanceChangeRecord.java

@@ -54,6 +54,10 @@
    private String userName;

    @TableField(exist = false)
    @ApiModelProperty("消费用户手机号")
    private String userPhone;

    @TableField(exist = false)
    @ApiModelProperty("消费金额")
    private BigDecimal amount;


 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/UserClickLog.java

@@ -49,5 +49,10 @@
    @TableField("vip_id")
    private Integer vipId;

    @TableField(exist = false)
    private String userName;
    @TableField(exist = false)
    private String userPhone;


}

 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/WithdrawalRequests.java

@@ -62,6 +62,10 @@
    @ApiModelProperty(value = "审核状态 1'待审核',2'审核通过',3'审核拒绝' ")
    @TableField("audit_status")
    private Integer auditStatus;
    @TableField(exist = false)
    private String userName;
    @TableField(exist = false)
    private String userPhone;


}

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/BalanceChangeRecordController.java

@@ -1,8 +1,13 @@
package com.ruoyi.account.controller;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ruoyi.account.api.model.BalanceChangeRecord;
import com.ruoyi.account.api.model.UserClickLog;
import com.ruoyi.account.dto.BalanceQuery;
import com.ruoyi.account.dto.UserCancelQuery;
import com.ruoyi.account.service.BalanceChangeRecordService;
import com.ruoyi.common.core.domain.R;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -32,6 +37,14 @@
        balanceChangeRecordService.save(balanceChangeRecord);
        return R.ok();
    }

    @PostMapping("/page")
    @ApiOperation(value = "余额变更明细", tags = {"后台"})
    public R<IPage<BalanceChangeRecord>> page(@RequestBody BalanceQuery agentQuery) {

        return R.ok(balanceChangeRecordService.pageList(agentQuery));
    }

    
    
}

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserClickLogController.java

@@ -1,8 +1,19 @@
package com.ruoyi.account.controller;


import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ruoyi.account.api.model.UserCancellationLog;
import com.ruoyi.account.api.model.UserClickLog;
import com.ruoyi.account.dto.UserCancelQuery;
import com.ruoyi.account.service.UserClickLogService;
import com.ruoyi.common.core.domain.R;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;

/**
 * <p>
@@ -15,6 +26,15 @@
@RestController
@RequestMapping("/user-click-log")
public class UserClickLogController {
    @Resource
    private UserClickLogService userClickLogService;
    @PostMapping("/page")
    @ApiOperation(value = "申请点击列表", tags = {"后台"})
    public R<IPage<UserClickLog>> page(@RequestBody UserCancelQuery agentQuery) {

        return R.ok(userClickLogService.pageList(agentQuery));
    }


}


 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WithdrawalRequestsController.java

@@ -1,8 +1,13 @@
package com.ruoyi.account.controller;


import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ruoyi.account.api.model.BalanceChangeRecord;
import com.ruoyi.account.api.model.WithdrawalRequests;
import com.ruoyi.account.dto.WithQuery;
import com.ruoyi.account.dto.WithdrawalRequestsDTO;
import com.ruoyi.account.service.WithdrawalRequestsService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.domain.AjaxResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -39,6 +44,13 @@
        return AjaxResult.success();
    }

    @PostMapping("/page")
    @ApiOperation(value = "提现申请", tags = {"后台"})
    public R<IPage<WithdrawalRequests>> page(@RequestBody WithQuery withQuery){
            return R.ok(withdrawalRequestsService.pageList(withQuery));

    }


}


 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/dto/BalanceQuery.java

New file
@@ -0,0 +1,23 @@
package com.ruoyi.account.dto;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.time.LocalDate;

@Data
public class BalanceQuery {
    @ApiModelProperty("用户名称")
    private String name;

    @ApiModelProperty("电话")
    private String phone;
    @ApiModelProperty("类型：1充值2提现3红包4分佣5商城购物")
    private Integer changeType;

    private LocalDate localDate1;
    private LocalDate localDate2;
    private Integer pageNum;
    private Integer pageSize;

}

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/dto/WithQuery.java

New file
@@ -0,0 +1,18 @@
package com.ruoyi.account.dto;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.time.LocalDate;

@Data
public class WithQuery {
    @ApiModelProperty("用户名称")
    private String name;

    @ApiModelProperty("电话")
    private String phone;
    private Integer pageNum;
    private Integer pageSize;

}

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/BalanceChangeRecordMapper.java

@@ -1,7 +1,12 @@
package com.ruoyi.account.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.account.api.model.BalanceChangeRecord;
import com.ruoyi.account.dto.BalanceQuery;
import org.apache.ibatis.annotations.Param;

public interface BalanceChangeRecordMapper extends BaseMapper<BalanceChangeRecord> {
    IPage<BalanceChangeRecord> pageList(@Param("page") Page<BalanceChangeRecord> page,@Param("agentQuery") BalanceQuery agentQuery);
}

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/UserClickLogMapper.java

@@ -1,7 +1,11 @@
package com.ruoyi.account.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.account.api.model.UserClickLog;
import com.ruoyi.account.dto.UserCancelQuery;
import org.apache.ibatis.annotations.Param;

/**
 * <p>
@@ -13,4 +17,5 @@
 */
public interface UserClickLogMapper extends BaseMapper<UserClickLog> {

    IPage<UserClickLog> pageList(@Param("page") Page<UserClickLog> page,@Param("agentQuery") UserCancelQuery agentQuery);
}

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/WithdrawalRequestsMapper.java

@@ -1,7 +1,12 @@
package com.ruoyi.account.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.account.api.model.UserClickLog;
import com.ruoyi.account.api.model.WithdrawalRequests;
import com.ruoyi.account.dto.WithQuery;
import org.apache.ibatis.annotations.Param;

/**
 * <p>
@@ -13,4 +18,5 @@
 */
public interface WithdrawalRequestsMapper extends BaseMapper<WithdrawalRequests> {

    IPage<WithdrawalRequests> pageList(@Param("page") Page<UserClickLog> page, @Param("withQuery")WithQuery withQuery);
}

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/BalanceChangeRecordService.java

@@ -1,7 +1,10 @@
package com.ruoyi.account.service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.account.api.model.BalanceChangeRecord;
import com.ruoyi.account.dto.BalanceQuery;

public interface BalanceChangeRecordService extends IService<BalanceChangeRecord> {
    IPage<BalanceChangeRecord> pageList(BalanceQuery agentQuery);
}

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/UserClickLogService.java

@@ -1,7 +1,9 @@
package com.ruoyi.account.service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.account.api.model.UserClickLog;
import com.ruoyi.account.dto.UserCancelQuery;

/**
 * <p>
@@ -13,4 +15,5 @@
 */
public interface UserClickLogService extends IService<UserClickLog> {

    IPage<UserClickLog> pageList(UserCancelQuery agentQuery);
}

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/WithdrawalRequestsService.java

@@ -1,7 +1,9 @@
package com.ruoyi.account.service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.account.api.model.WithdrawalRequests;
import com.ruoyi.account.dto.WithQuery;
import com.ruoyi.account.dto.WithdrawalRequestsDTO;

/**
@@ -18,4 +20,6 @@
     * 提现申请
     */
    void withdrawalApply(WithdrawalRequestsDTO params);

    IPage<WithdrawalRequests> pageList(WithQuery withQuery);
}

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/BalanceChangeRecordServiceImpl.java

@@ -1,11 +1,23 @@
package com.ruoyi.account.service.impl;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.account.api.model.BalanceChangeRecord;
import com.ruoyi.account.api.model.UserClickLog;
import com.ruoyi.account.dto.BalanceQuery;
import com.ruoyi.account.mapper.BalanceChangeRecordMapper;
import com.ruoyi.account.service.BalanceChangeRecordService;
import org.springframework.stereotype.Service;

@Service
public class BalanceChangeRecordServiceImpl extends ServiceImpl<BalanceChangeRecordMapper, BalanceChangeRecord> implements BalanceChangeRecordService {
    @Override
    public IPage<BalanceChangeRecord> pageList(BalanceQuery agentQuery) {
        Page<BalanceChangeRecord> page = new Page<>();
        page.setCurrent(agentQuery.getPageNum());
        page.setSize(agentQuery.getPageSize());
        IPage<BalanceChangeRecord> shopIPage = this.baseMapper.pageList(page, agentQuery);
        return shopIPage;
    }
}

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserClickLogServiceImpl.java

@@ -1,9 +1,14 @@
package com.ruoyi.account.service.impl;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.account.api.model.AgentApplication;
import com.ruoyi.account.dto.UserCancelQuery;
import com.ruoyi.account.mapper.UserClickLogMapper;
import com.ruoyi.account.api.model.UserClickLog;
import com.ruoyi.account.service.UserClickLogService;
import com.ruoyi.other.api.domain.Shop;
import org.springframework.stereotype.Service;

/**
@@ -17,4 +22,12 @@
@Service
public class UserClickLogServiceImpl extends ServiceImpl<UserClickLogMapper, UserClickLog> implements UserClickLogService {

    @Override
    public IPage<UserClickLog> pageList(UserCancelQuery agentQuery) {
        Page<UserClickLog> page = new Page<>();
        page.setCurrent(agentQuery.getPageNum());
        page.setSize(agentQuery.getPageSize());
        IPage<UserClickLog> shopIPage = this.baseMapper.pageList(page, agentQuery);
        return shopIPage;
    }
}

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/WithdrawalRequestsServiceImpl.java

@@ -1,9 +1,13 @@
package com.ruoyi.account.service.impl;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.account.api.feignClient.AppUserClient;
import com.ruoyi.account.api.model.AppUser;
import com.ruoyi.account.api.model.UserClickLog;
import com.ruoyi.account.api.model.WithdrawalRequests;
import com.ruoyi.account.dto.WithQuery;
import com.ruoyi.account.dto.WithdrawalRequestsDTO;
import com.ruoyi.account.mapper.WithdrawalRequestsMapper;
import com.ruoyi.account.service.VipSettingService;
@@ -77,4 +81,13 @@
        save(withdrawalRequests);
    }

    @Override
    public IPage<WithdrawalRequests> pageList(WithQuery withQuery) {
        Page<UserClickLog> page = new Page<>();
        page.setCurrent(withQuery.getPageNum());
        page.setSize(withQuery.getPageSize());
        IPage<WithdrawalRequests> shopIPage = this.baseMapper.pageList(page, withQuery);
        return shopIPage;
    }

}

 ruoyi-service/ruoyi-account/src/main/resources/mapper/account/BalanceChangeRecordMapper.xml

@@ -2,4 +2,23 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.account.mapper.BalanceChangeRecordMapper">

    <select id="pageList" resultType="com.ruoyi.account.api.model.BalanceChangeRecord">
                select t1.*,t2.name as userName,t2.phone as userPhone
                from t_balance_change_record t1
                left join  t_app_user t2 on t1.app_user_id = t2.id
                <where>
                    <if test="agentQuery.name != null and agentQuery.name != ''">
                        and t2.name like concat('%',#{agentQuery.name},'%')
                    </if>
                    <if test="agentQuery.phone != null and agentQuery.phone != ''">
                        and t2.phone like concat('%',#{agentQuery.phone},'%')
                    </if>
                    <if test="agentQuery.changeType != null">
                        and t1.change_type = #{agentQuery.changeType}
                    </if>
                    <if test="agentQuery.localDate1 != null">
                        and DATE(t1.create_time) between  #{agentQuery.localDate1} and #{agentQuery.localDate2}
                    </if>
                </where>
    </select>
</mapper>

 ruoyi-service/ruoyi-account/src/main/resources/mapper/account/UserClickLogMapper.xml

@@ -15,5 +15,24 @@
    <sql id="Base_Column_List">
        id, del_flag, create_time, app_user_id, vip_id
    </sql>
    <select id="pageList" resultType="com.ruoyi.account.api.model.UserClickLog">
            select  t1.* ,t2.phone as userPhone,t2.name as userName
            from t_user_click_log t1
            left join t_app_user t2 on t1.app_user_id = t2.id
            <where>
                <if test="agentQuery.phone != null and agentQuery.phone != ''">
                    and t2.phone like concat('%',#{agentQuery.phone},'%')
                </if>
                <if test="agentQuery.name != null and agentQuery.name != ''">
                    and t2.name like concat('%',#{agentQuery.name},'%')
                </if>
                <if test="agentQuery.vipId != null">
                    and t1.vip_id = #{agentQuery.vipId}
                </if>
                <if test="agentQuery.localDate1 != null">
                    and DATE(t1.create_time) between #{agentQuery.localDate1} and #{agentQuery.localDate2}
                </if>
            </where>
    </select>

</mapper>

 ruoyi-service/ruoyi-account/src/main/resources/mapper/account/WithdrawalRequestsMapper.xml

@@ -19,5 +19,11 @@
    <sql id="Base_Column_List">
        id, del_flag, create_time, app_user_id, withdrawal_amount, withdrawal_method, account_holder, bank_card_number, audit_status
    </sql>
    <select id="pageList" resultType="com.ruoyi.account.api.model.WithdrawalRequests">
        select t1.*,t2.name as userName,t2.phone as userPhone
        from t_withdrawal_requests t1
        left join t_app_user t2 on t1.app_user_id = t2.id

    </select>

</mapper>

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RechargeSetController.java

@@ -1,8 +1,17 @@
package com.ruoyi.other.controller;


import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.account.api.model.UserClickLog;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.other.api.domain.RechargeSet;
import com.ruoyi.other.service.RechargeSetService;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.List;

/**
 * <p>
@@ -15,6 +24,21 @@
@RestController
@RequestMapping("/recharge-set")
public class RechargeSetController {
    @Resource
    private RechargeSetService rechargeSetService;

    @GetMapping("/list")
    @ApiOperation(value = "充值设置查询", tags = {"后台"})
    public R<List<RechargeSet>> list() {
        return R.ok(rechargeSetService.list());
    }
    @PostMapping("/set")
    @ApiOperation(value = "充值设置", tags = {"后台"})
    public R<List<RechargeSet>> detail(@RequestBody List<RechargeSet> rechargeSets) {
        boolean remove = rechargeSetService.remove(Wrappers.lambdaQuery());
        rechargeSetService.saveBatch(rechargeSets);
        return R.ok();
    }

}