This commit is contained in:
GYJ
2025-01-02 19:49:10 +08:00
parent f5626621f0
commit 96aebfdd8b
14 changed files with 269 additions and 258 deletions

View File

@@ -29,13 +29,13 @@ public interface PayDetailsDao extends BaseMapper<PayDetails> {
int updateState(@Param("id") Long id, @Param("state") Integer state, @Param("time") String time, @Param("tradeNo") String tradeNo,@Param("thirdOrderNo") String thirdOrderNo);
IPage<Map<String, Object>> selectPayDetails(@Param("page") Page<Map<String, Object>> page, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("userId") Long userId, @Param("state") Integer state, @Param("userName") String userName, String orderId);
List<Map<String, Object>> selectPayDetails(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("userId") Long userId, @Param("state") Integer state, @Param("userName") String userName, String orderId);
Double selectSumPay(@Param("createTime") String createTime, @Param("endTime") String endTime, @Param("userId") Long userId);
Double selectSumMember(@Param("time") String time, @Param("flag") Integer flag);
IPage<Map<String, Object>> payMemberAnalysis(Page<Map<String, Object>> page, @Param("time") String time, @Param("flag") Integer flag);
List<Map<String, Object>> payMemberAnalysis(@Param("time") String time, @Param("flag") Integer flag);
Double selectSumPayByState(@Param("time") String time, @Param("flag") Integer flag, @Param("state") Integer state);

View File

@@ -4,19 +4,15 @@ import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.map.MapProxy;
import cn.hutool.core.thread.ThreadUtil;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.sqx.common.exception.SqxException;
import com.sqx.common.utils.Constant;
import com.sqx.common.utils.PageUtils;
import com.sqx.common.utils.Result;
import com.sqx.modules.app.dao.MsgDao;
@@ -44,6 +40,7 @@ import com.sqx.modules.sys.entity.SysUserEntity;
import com.sqx.modules.sys.service.SysUserService;
import com.sqx.modules.utils.AliPayOrderUtil;
import com.sqx.modules.utils.AmountCalUtils;
import com.sqx.modules.utils.ParamPageUtils;
import com.sqx.modules.utils.excel.ExcelData;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
@@ -58,7 +55,6 @@ import weixin.popular.support.TokenManager;
import javax.websocket.SendResult;
import java.math.BigDecimal;
import java.sql.Time;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.TimeUnit;
@@ -537,13 +533,11 @@ public class CashOutServiceImpl extends ServiceImpl<CashOutDao, CashOut> impleme
@Override
public PageUtils auditPage(Map<String, Object> params) {
MapProxy proxy = MapProxy.create(params);
PageHelper.startPage(ParamPageUtils.getPageNum(params), ParamPageUtils.getPageSize(params));
CashOut cashOut = BeanUtil.toBean(params, CashOut.class);
//cashOut.setState(3);
long pageNum = proxy.getLong(Constant.PAGE, 1L);
long pageSize = proxy.getLong(Constant.LIMIT, 10L);
PageHelper.startPage((int) pageNum, (int) pageSize);
return PageUtils.page(new PageInfo<>(baseMapper.selectCashOutPage(cashOut)));
List<CashOut> page = baseMapper.selectCashOutPage(cashOut);
PageInfo<CashOut> pageInfo = new PageInfo<>(page);
return PageUtils.page(pageInfo);
}
@Override
@@ -619,7 +613,7 @@ public class CashOutServiceImpl extends ServiceImpl<CashOutDao, CashOut> impleme
baseMapper.updateById(entity);
UserMoneyDetails userMoneyDetails = new UserMoneyDetails(
entity.getUserId(), entity.getSysUserId(), null, "[提现退款]", 4, 1, 2,
new BigDecimal(entity.getMoney()), "提现失败,自动退款" + entity.getMoney() + "", 1,entity.getId());
new BigDecimal(entity.getMoney()), "提现失败,自动退款" + entity.getMoney() + "", 1, entity.getId());
userMoneyDetailsService.save(userMoneyDetails);
//归还余额 钱
userMoneyService.updateAmount(1, entity.getUserId(), Convert.toDouble(entity.getMoney()));
@@ -664,7 +658,7 @@ public class CashOutServiceImpl extends ServiceImpl<CashOutDao, CashOut> impleme
@Override
public Map<String, Object> alipayTransferSummaryQuery(String alipayAccountName) {
if(StrUtil.isBlank(alipayAccountName)){
if (StrUtil.isBlank(alipayAccountName)) {
throw new SqxException("支付宝账号不能为空!");
}
BigDecimal sum = BigDecimal.ZERO;

View File

@@ -2,6 +2,8 @@ package com.sqx.modules.pay.service.impl;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.sqx.common.utils.PageUtils;
import com.sqx.modules.pay.dao.PayDetailsDao;
import com.sqx.modules.pay.entity.PayDetails;
@@ -10,6 +12,7 @@ import com.sqx.modules.utils.TimeCompleteUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
/**
@@ -27,11 +30,13 @@ public class PayDetailsServiceImpl extends ServiceImpl<PayDetailsDao, PayDetails
@Override
public PageUtils selectPayDetails(int page, int limit, String startTime, String endTime, Long userId, Integer state, String userName, String orderId) {
Page<Map<String, Object>> pages = new Page<>(page, limit);
PageHelper.startPage(page, limit);
if (state != null && state == -1) {
state = null;
}
return new PageUtils(payDetailsDao.selectPayDetails(pages, TimeCompleteUtils.completeStartTime(startTime), TimeCompleteUtils.completeEndTime(endTime), userId, state,userName,orderId));
List<Map<String, Object>> payDetails = payDetailsDao.selectPayDetails(TimeCompleteUtils.completeStartTime(startTime), TimeCompleteUtils.completeEndTime(endTime), userId, state, userName, orderId);
PageInfo<Map<String, Object>> pageInfo = new PageInfo<>(payDetails);
return PageUtils.page(pageInfo);
}
@Override
@@ -44,8 +49,10 @@ public class PayDetailsServiceImpl extends ServiceImpl<PayDetailsDao, PayDetails
@Override
public PageUtils payMemberAnalysis(int page, int limit, String time, Integer flag) {
Page<Map<String, Object>> pages = new Page<>(page, limit);
return new PageUtils(payDetailsDao.payMemberAnalysis(pages, time, flag));
PageHelper.startPage(page, limit);
List<Map<String, Object>> list = payDetailsDao.payMemberAnalysis(time, flag);
PageInfo<Map<String, Object>> pageInfo = new PageInfo<>(list);
return PageUtils.page(pageInfo);
}
@Override
@@ -65,8 +72,8 @@ public class PayDetailsServiceImpl extends ServiceImpl<PayDetailsDao, PayDetails
}
@Override
public Double selectSumPayByClassify(String time, Integer flag, Integer classify,Integer payClassify) {
return payDetailsDao.selectSumPayByClassify(time, flag, classify,payClassify);
public Double selectSumPayByClassify(String time, Integer flag, Integer classify, Integer payClassify) {
return payDetailsDao.selectSumPayByClassify(time, flag, classify, payClassify);
}
@Override