qzz/electripper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

首页增加押金统计

Browse Source
This commit is contained in:
邱贞招 2025-03-11 09:31:28 +08:00
parent e07bd5bfc7
commit 2612620b50
6 changed files with 37 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
electripper-system/src/main/java/com/ruoyi/system/mapper/AsUserMapper.java
View File

@ -204,5 +204,5 @@ public interface AsUserMapper
/**
* 获取押金余额
*/
BigDecimal getDepositBalance(String formattedDate);
BigDecimal getDepositBalance();
}

2
electripper-system/src/main/java/com/ruoyi/system/service/IAsUserService.java
View File

@ -266,5 +266,5 @@ public interface IAsUserService
/**
* 根据日期查询用户余额
*/
BigDecimal getDepositBalance(String formattedDate);
BigDecimal getDepositBalance();
}

4
electripper-system/src/main/java/com/ruoyi/system/service/impl/AsUserServiceImpl.java
View File

@ -665,8 +665,8 @@ public class AsUserServiceImpl implements IAsUserService
* 根据日期查询用户余额
*/
@Override
public BigDecimal getDepositBalance(String formattedDate) {
return asUserMapper.getDepositBalance(formattedDate);
public BigDecimal getDepositBalance() {
return asUserMapper.getDepositBalance();
}
}

11
electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOrderServiceImpl.java
View File

@ -1156,7 +1156,6 @@ public class EtOrderServiceImpl implements IEtOrderService
getTodayData(today, incomeVos, incomeCosts, depositVos);
calendar.add(Calendar.DAY_OF_MONTH, -1);
for (int i = 0; i < 13; i++) {
String day = dateFormat.format(calendar.getTime());
getDataByDate(day, incomeVos, incomeCosts, depositVos);
@ -1299,7 +1298,6 @@ public class EtOrderServiceImpl implements IEtOrderService
calendar.add(Calendar.DATE, -1);
String previousDay = dateFormat.format(calendar.getTime());
// 初始化统计变量
BigDecimal serviceFeeTotal = BigDecimal.ZERO;
BigDecimal handlingFeeTotal = BigDecimal.ZERO;
@ -1313,6 +1311,7 @@ public class EtOrderServiceImpl implements IEtOrderService
BigDecimal depositRefund = BigDecimal.ZERO;
BigDecimal depositDeduction = BigDecimal.ZERO;
BigDecimal depositSurplus = BigDecimal.ZERO;
BigDecimal todayBalance = BigDecimal.ZERO;
List<ChannelVO> channelVOS = etChannelService.selectSmChannelList(new ChannelQuery());
for (ChannelVO channel:channelVOS) {
@ -1346,9 +1345,13 @@ public class EtOrderServiceImpl implements IEtOrderService
depositDeduction = depositDeduction.add(selfReconciliationVO.getDeductionAmount());
}
// 押金盈余
if (selfReconciliationVO.getDepositChange() != null) {
if (selfReconciliationVO.getDepositChange() != null && channel.getChannelId() == 2) {
depositSurplus = depositSurplus.add(selfReconciliationVO.getDepositChange());
}
if (selfReconciliationVO.getDepositBalance() != null && channel.getChannelId() == 2) {
todayBalance = reconciliationMapper.getDepositBalance(previousDay).add(depositSurplus);
}
}
// 设置 IncomeCostVo 的值
@ -1365,7 +1368,7 @@ public class EtOrderServiceImpl implements IEtOrderService
depositVo.setRefund(depositRefund);
depositVo.setDeduction(depositDeduction);
depositVo.setSurplus(depositSurplus);
depositVo.setBalance(reconciliationMapper.getDepositBalance(previousDay).add(depositSurplus));
depositVo.setBalance(todayBalance);
incomeVo.setDay(today);
incomeVo.setOrderNum(etOrderMapper.getOrderNum(startDateStr, endDateStr, null,null));

30
electripper-system/src/main/java/com/ruoyi/system/task/EtTask.java
View File

@ -886,14 +886,32 @@ public class EtTask {
/** 总收入*/
SelfReconciliationVO selfReconciliationVO = buildSelfReconciliation(startDateStr,endDateStr, formattedDate,aLong,channel.getChannelId());
calendar.add(Calendar.DATE, -1);
String previousDay = dateFormat.format(calendar.getTime());
setBalance(previousDay,selfReconciliationVO);
// 保存
saveRecon(formattedDate, selfReconciliationVO,channel.getChannelId());
}
}
}
// /**
// * 统计用户押金余额
// * */
// public void statisticsUserBalance() {
//
// SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
// Calendar calendar = Calendar.getInstance();
// String formattedDate = dateFormat.format(calendar.getTime());
// EtReconciliation etReconciliation = new EtReconciliation();
// etReconciliation.setDay(formattedDate);
// etReconciliation.setBalance(depositBalance);
// etReconciliation.setPayChannel(2L);
// int i1 = etReconciliationMapper.updateDepositBalance(etReconciliation);
// if (i1 > 0) {
// log.info("【定时任务】更新用户押金余额成功");
// } else {
// log.info("【定时任务】更新用户押金余额失败");
// }
// }
private void setBalance(String previousDay, SelfReconciliationVO selfReconciliationVO) {
BigDecimal depositBalance = defaultIfNull(etReconciliationMapper.getDepositBalance(previousDay),BigDecimal.ZERO);
selfReconciliationVO.setDepositBalance(depositBalance.add(selfReconciliationVO.getDepositChange()));
@ -919,9 +937,6 @@ public class EtTask {
selfReconciliationVO.setDepositPaid(depositAmount);
selfReconciliationVO.setHandlingCharge(handlingFee);
selfReconciliationVO.setPlatformServiceFee(platformServiceFee);
if(channelId == 2){
selfReconciliationVO.setChannelCost(cost);
}
selfReconciliationVO.setWithdrawServiceFee(withdrawServiceFee);
/** 总支出*/
@ -934,8 +949,11 @@ public class EtTask {
selfReconciliationVO.setOrderRefund(orderRefund);
selfReconciliationVO.setDepositRefund(depositRefundFee);
BigDecimal depositBalance = depositAmount.subtract(depositRefundFee).subtract(deductionAmount);
if(channelId == 2){
selfReconciliationVO.setChannelCost(cost);
BigDecimal depositBalance = asUserMapper.getDepositBalance();
selfReconciliationVO.setDepositBalance(depositBalance);
}
selfReconciliationVO.setUserReceipts(userReceipts);
// 结算金额等于totalFlowAmount减去orderRefund减去depositRefundFee
selfReconciliationVO.setSettlementAmount(totalFlowAmount.subtract(orderRefund).subtract(depositRefundFee));

4
electripper-system/src/main/resources/mapper/system/AsUserMapper.xml
View File

@ -192,9 +192,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
COALESCE(SUM(balance), 0) AS total_balance
FROM
et_user
WHERE
update_time &lt;= #{formattedDate}
AND appid = 'wx3428c498d5061192'
WHERE appid = 'wx3428c498d5061192'
</select>
<insert id="insertUser" parameterType="AsUser" useGeneratedKeys="true" keyProperty="userId">