首页增加押金统计
This commit is contained in:
parent
dbdddbec65
commit
e07bd5bfc7
|
|
@ -7,7 +7,7 @@ spring:
|
|||
# 主库数据源
|
||||
master:
|
||||
# url: jdbc:mysql://47.120.68.19:3306/electripper?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
||||
url: jdbc:mysql://localhost:3306/ele2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
||||
url: jdbc:mysql://localhost:3306/electripper?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
||||
username: root
|
||||
password: 123456
|
||||
# url: jdbc:mysql://117.26.179.22:61110/electripper?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
||||
|
|
|
|||
|
|
@ -85,5 +85,8 @@ public class EtReconciliation extends BaseEntity
|
|||
@Excel(name = "渠道成本")
|
||||
private BigDecimal channelCost;
|
||||
|
||||
@Excel(name = "余额")
|
||||
private BigDecimal balance;
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,9 @@
|
|||
package com.ruoyi.system.mapper;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.List;
|
||||
import com.ruoyi.system.domain.EtReconciliation;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
/**
|
||||
* 平台对账Mapper接口
|
||||
|
|
@ -58,4 +60,9 @@ public interface EtReconciliationMapper
|
|||
* @return 结果
|
||||
*/
|
||||
public int deleteEtReconciliationByReconciliationIds(Long[] reconciliationIds);
|
||||
|
||||
/**
|
||||
* 日报查询
|
||||
*/
|
||||
BigDecimal getDepositBalance(@Param("day") String previousDay);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -50,6 +50,7 @@ import java.math.RoundingMode;
|
|||
import java.text.ParseException;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.time.LocalDate;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import java.util.*;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import java.util.regex.Matcher;
|
||||
|
|
@ -1151,22 +1152,57 @@ public class EtOrderServiceImpl implements IEtOrderService
|
|||
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
|
||||
Calendar calendar = Calendar.getInstance();
|
||||
calendar.setTime(DateUtils.getNowDate());
|
||||
String today = dateFormat.format(calendar.getTime());
|
||||
getTodayData(today, incomeVos, incomeCosts, depositVos);
|
||||
calendar.add(Calendar.DAY_OF_MONTH, -1);
|
||||
|
||||
|
||||
for (int i = 0; i < 13; i++) {
|
||||
String formattedDate = dateFormat.format(calendar.getTime());
|
||||
String day = dateFormat.format(calendar.getTime());
|
||||
getDataByDate(day, incomeVos, incomeCosts, depositVos);
|
||||
calendar.add(Calendar.DATE, -1);
|
||||
}
|
||||
calendar.setTime(DateUtils.getNowDate());
|
||||
String todayStartDateStr = today + " " + Constants.DATE_FORMAT_START_PEREND;
|
||||
String todayEndDateStr = today + " " + Constants.DATE_FORMAT_END_PEREND;
|
||||
|
||||
indexAdminVo.setIncomeVoList(incomeVos);
|
||||
indexAdminVo.setIncomeCostList(incomeCosts);
|
||||
indexAdminVo.setDepositList(depositVos);
|
||||
|
||||
/** 车辆统计*/
|
||||
IndexAdminVo.VehicleVo vehicleVo = new IndexAdminVo.VehicleVo();
|
||||
DeviceNumVo deviceNumVo = asDeviceService.allVehicleNum("0","100",null);
|
||||
com.ruoyi.common.utils.bean.BeanUtils.copyBeanProp(vehicleVo,deviceNumVo);
|
||||
indexAdminVo.setVehicleVo(vehicleVo);
|
||||
|
||||
/** 运维统计*/
|
||||
IndexAdminVo.OperationVo operationVo = new IndexAdminVo.OperationVo();
|
||||
operationVo.setReplacementOrderCount(etAdminOrderMapper.getOrderCount(ServiceConstants.ADMIN_ORDER_TYPE_REPLACEMENT,ServiceConstants.REPLACEMENT_ELECTRICITY_STATUS_UNDER_WAY,null));//待换电
|
||||
operationVo.setRepairCount(etAdminOrderMapper.getOrderCount(ServiceConstants.ADMIN_ORDER_TYPE_REPAIR,ServiceConstants.REPLACEMENT_ELECTRICITY_STATUS_REPAIR,null));//待维修
|
||||
operationVo.setFailedUnlockCount(operLogService.getUnlockCount(todayStartDateStr, todayEndDateStr,BusinessStatus.FAIL.name()));// 4g解锁失败
|
||||
operationVo.setUnlockCount(operLogService.getUnlockCount(todayStartDateStr, todayEndDateStr,BusinessStatus.SUCCESS.name()));//4g解锁次数
|
||||
operationVo.setDeviceOfflineRate(new BigDecimal(deviceNumVo.getOfflineNum()).divide(new BigDecimal(deviceNumVo.getInOperation()), 2, RoundingMode.HALF_UP));//设备离线率
|
||||
operationVo.setBluetoothUnlockCount(operLogService.getBluetoothUnlockCount(todayStartDateStr, todayEndDateStr,BusinessStatus.SUCCESS.name()));//蓝牙解锁数
|
||||
indexAdminVo.setOperationVo(operationVo);
|
||||
log.info("【首页统计-总管理】indexAdminVo==={}",JSON.toJSON(indexAdminVo));
|
||||
return indexAdminVo;
|
||||
}
|
||||
|
||||
private void getDataByDate(String formattedDate, ArrayList<IndexAdminVo.IncomeVo> incomeVos, ArrayList<IndexAdminVo.IncomeCostVo> incomeCosts, ArrayList<IndexAdminVo.DepositVo> depositVos) {
|
||||
String startDateStr = formattedDate + " " + Constants.DATE_FORMAT_START_PEREND;
|
||||
String endDateStr = formattedDate + " " + Constants.DATE_FORMAT_END_PEREND;
|
||||
int orderCount = etOrderMapper.getOrderNum(startDateStr, endDateStr, null,null);
|
||||
IndexAdminVo.IncomeVo incomeVo = new IndexAdminVo.IncomeVo();
|
||||
IndexAdminVo.IncomeCostVo incomeCostVo = new IndexAdminVo.IncomeCostVo();
|
||||
IndexAdminVo.DepositVo depositVo = new IndexAdminVo.DepositVo();
|
||||
|
||||
int orderCount = etOrderMapper.getOrderNum(startDateStr, endDateStr, null,null);
|
||||
EtReconciliation reconciliation = new EtReconciliation();
|
||||
// 准备额外的查询参数
|
||||
reconciliation.setDay(formattedDate);
|
||||
List<EtReconciliation> etReconciliations = reconciliationMapper.selectEtReconciliationList(reconciliation);
|
||||
Collections.reverse(etReconciliations);
|
||||
IndexAdminVo.IncomeCostVo incomeCostVo = new IndexAdminVo.IncomeCostVo();
|
||||
IndexAdminVo.DepositVo depositVo = new IndexAdminVo.DepositVo();
|
||||
|
||||
// 初始化统计变量
|
||||
BigDecimal serviceFeeTotal = BigDecimal.ZERO;
|
||||
BigDecimal handlingFeeTotal = BigDecimal.ZERO;
|
||||
|
|
@ -1214,6 +1250,10 @@ public class EtOrderServiceImpl implements IEtOrderService
|
|||
if (item.getDepositSurplus() != null) {
|
||||
depositSurplus = depositSurplus.add(item.getDepositSurplus());
|
||||
}
|
||||
// 押金余额
|
||||
if (item.getBalance() != null) {
|
||||
depositBalance = depositBalance.add(item.getBalance());
|
||||
}
|
||||
}
|
||||
|
||||
// 计算平台盈利（这里只是一个示例，具体公式根据实际情况调整）
|
||||
|
|
@ -1233,8 +1273,7 @@ public class EtOrderServiceImpl implements IEtOrderService
|
|||
depositVo.setRefund(depositRefund);
|
||||
depositVo.setDeduction(depositDeduction);
|
||||
depositVo.setSurplus(depositSurplus);
|
||||
depositVo.setBalance(asUserService.getDepositBalance
|
||||
(formattedDate));
|
||||
depositVo.setBalance(depositBalance);
|
||||
|
||||
incomeVo.setDay(formattedDate);
|
||||
incomeVo.setOrderNum(orderCount);
|
||||
|
|
@ -1244,34 +1283,135 @@ public class EtOrderServiceImpl implements IEtOrderService
|
|||
incomeVos.add(incomeVo);
|
||||
incomeCosts.add(incomeCostVo);
|
||||
depositVos.add(depositVo);
|
||||
}
|
||||
|
||||
private void getTodayData(String today, ArrayList<IndexAdminVo.IncomeVo> incomeVos, ArrayList<IndexAdminVo.IncomeCostVo> incomeCosts, ArrayList<IndexAdminVo.DepositVo> depositVos) {
|
||||
String startDateStr = today + " " + Constants.DATE_FORMAT_START_PEREND;
|
||||
String endDateStr = today + " " + Constants.DATE_FORMAT_END_PEREND;
|
||||
IndexAdminVo.IncomeVo incomeVo = new IndexAdminVo.IncomeVo();
|
||||
IndexAdminVo.IncomeCostVo incomeCostVo = new IndexAdminVo.IncomeCostVo();
|
||||
IndexAdminVo.DepositVo depositVo = new IndexAdminVo.DepositVo();
|
||||
|
||||
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
|
||||
Calendar calendar = Calendar.getInstance();
|
||||
calendar.setTime(DateUtils.getNowDate());
|
||||
// 将日期减去一天以获取前一天
|
||||
calendar.add(Calendar.DATE, -1);
|
||||
String previousDay = dateFormat.format(calendar.getTime());
|
||||
|
||||
|
||||
// 初始化统计变量
|
||||
BigDecimal serviceFeeTotal = BigDecimal.ZERO;
|
||||
BigDecimal handlingFeeTotal = BigDecimal.ZERO;
|
||||
BigDecimal channelCostTotal = BigDecimal.ZERO;
|
||||
BigDecimal withdrawServiceFeeFirst = BigDecimal.ZERO;
|
||||
// 计算平台盈利（这里只是一个示例，具体公式根据实际情况调整）
|
||||
BigDecimal platformProfit = serviceFeeTotal.subtract(handlingFeeTotal).subtract(channelCostTotal);
|
||||
|
||||
// 押金统计
|
||||
BigDecimal depositPay = BigDecimal.ZERO;
|
||||
BigDecimal depositRefund = BigDecimal.ZERO;
|
||||
BigDecimal depositDeduction = BigDecimal.ZERO;
|
||||
BigDecimal depositSurplus = BigDecimal.ZERO;
|
||||
|
||||
List<ChannelVO> channelVOS = etChannelService.selectSmChannelList(new ChannelQuery());
|
||||
for (ChannelVO channel:channelVOS) {
|
||||
SelfReconciliationVO selfReconciliationVO = buildSelfReconciliation(startDateStr,endDateStr, today,channel.getChannelId());
|
||||
// 累加服务费
|
||||
if (selfReconciliationVO.getPlatformServiceFee() != null) {
|
||||
serviceFeeTotal = serviceFeeTotal.add(selfReconciliationVO.getPlatformServiceFee());
|
||||
}
|
||||
indexAdminVo.setIncomeVoList(incomeVos);
|
||||
indexAdminVo.setIncomeCostList(incomeCosts);
|
||||
indexAdminVo.setDepositList(depositVos);
|
||||
|
||||
/** 车辆统计*/
|
||||
IndexAdminVo.VehicleVo vehicleVo = new IndexAdminVo.VehicleVo();
|
||||
DeviceNumVo deviceNumVo = asDeviceService.allVehicleNum("0","100",null);
|
||||
com.ruoyi.common.utils.bean.BeanUtils.copyBeanProp(vehicleVo,deviceNumVo);
|
||||
indexAdminVo.setVehicleVo(vehicleVo);
|
||||
|
||||
/** 运维统计*/
|
||||
String formattedDate = dateFormat.format(calendar.getTime());
|
||||
String todayStartDateStr = formattedDate + " " + Constants.DATE_FORMAT_START_PEREND;
|
||||
String todayEndDateStr = formattedDate + " " + Constants.DATE_FORMAT_END_PEREND;
|
||||
|
||||
IndexAdminVo.OperationVo operationVo = new IndexAdminVo.OperationVo();
|
||||
operationVo.setReplacementOrderCount(etAdminOrderMapper.getOrderCount(ServiceConstants.ADMIN_ORDER_TYPE_REPLACEMENT,ServiceConstants.REPLACEMENT_ELECTRICITY_STATUS_UNDER_WAY,null));//待换电
|
||||
operationVo.setRepairCount(etAdminOrderMapper.getOrderCount(ServiceConstants.ADMIN_ORDER_TYPE_REPAIR,ServiceConstants.REPLACEMENT_ELECTRICITY_STATUS_REPAIR,null));//待维修
|
||||
operationVo.setFailedUnlockCount(operLogService.getUnlockCount(todayStartDateStr, todayEndDateStr,BusinessStatus.FAIL.name()));// 4g解锁失败
|
||||
operationVo.setUnlockCount(operLogService.getUnlockCount(todayStartDateStr, todayEndDateStr,BusinessStatus.SUCCESS.name()));//4g解锁次数
|
||||
operationVo.setDeviceOfflineRate(new BigDecimal(deviceNumVo.getOfflineNum()).divide(new BigDecimal(deviceNumVo.getInOperation()), 2, RoundingMode.HALF_UP));//设备离线率
|
||||
operationVo.setBluetoothUnlockCount(operLogService.getBluetoothUnlockCount(todayStartDateStr, todayEndDateStr,BusinessStatus.SUCCESS.name()));//蓝牙解锁数
|
||||
indexAdminVo.setOperationVo(operationVo);
|
||||
log.info("【首页统计-总管理】indexAdminVo==={}",JSON.toJSON(indexAdminVo));
|
||||
return indexAdminVo;
|
||||
// 累加手续费（假设 handlingCharge 是 EtReconciliation 的一个属性）
|
||||
if (selfReconciliationVO.getHandlingCharge() != null) {
|
||||
handlingFeeTotal = handlingFeeTotal.add(selfReconciliationVO.getHandlingCharge());
|
||||
}
|
||||
// 累加渠道成本
|
||||
if (selfReconciliationVO.getChannelCost() != null) {
|
||||
channelCostTotal = channelCostTotal.add(selfReconciliationVO.getChannelCost());
|
||||
}
|
||||
// 提现服务费只拿第一个值
|
||||
if (selfReconciliationVO.getWithdrawServiceFee() != null) {
|
||||
withdrawServiceFeeFirst = selfReconciliationVO.getWithdrawServiceFee();
|
||||
}
|
||||
// 押金支付
|
||||
if (selfReconciliationVO.getDepositPaid() != null) {
|
||||
depositPay = depositPay.add(selfReconciliationVO.getDepositPaid());
|
||||
}
|
||||
// 押金退款
|
||||
if (selfReconciliationVO.getDepositRefund() != null) {
|
||||
depositRefund = depositRefund.add(selfReconciliationVO.getDepositRefund());
|
||||
}
|
||||
// 押金抵扣
|
||||
if (selfReconciliationVO.getDeductionAmount() != null) {
|
||||
depositDeduction = depositDeduction.add(selfReconciliationVO.getDeductionAmount());
|
||||
}
|
||||
// 押金盈余
|
||||
if (selfReconciliationVO.getDepositChange() != null) {
|
||||
depositSurplus = depositSurplus.add(selfReconciliationVO.getDepositChange());
|
||||
}
|
||||
}
|
||||
|
||||
// 设置 IncomeCostVo 的值
|
||||
incomeCostVo.setDay(today);
|
||||
incomeCostVo.setServiceFee(serviceFeeTotal);
|
||||
incomeCostVo.setHandlingFee(handlingFeeTotal);
|
||||
incomeCostVo.setWithdrawalFee(withdrawServiceFeeFirst); // 设置提现手续费
|
||||
incomeCostVo.setChannelCost(channelCostTotal);
|
||||
incomeCostVo.setPlatformProfit(platformProfit);
|
||||
|
||||
// 押金统计
|
||||
depositVo.setDay(today);
|
||||
depositVo.setPay(depositPay);
|
||||
depositVo.setRefund(depositRefund);
|
||||
depositVo.setDeduction(depositDeduction);
|
||||
depositVo.setSurplus(depositSurplus);
|
||||
depositVo.setBalance(reconciliationMapper.getDepositBalance(previousDay).add(depositSurplus));
|
||||
|
||||
incomeVo.setDay(today);
|
||||
incomeVo.setOrderNum(etOrderMapper.getOrderNum(startDateStr, endDateStr, null,null));
|
||||
incomeVo.setOrderFee(etOrderMapper.getOrderFee(startDateStr, endDateStr, null));
|
||||
incomeVo.setRefundFee(etOrderMapper.getRefundFee(startDateStr, endDateStr, null,null,null));
|
||||
|
||||
incomeVos.add(incomeVo);
|
||||
incomeCosts.add(incomeCostVo);
|
||||
depositVos.add(depositVo);
|
||||
}
|
||||
|
||||
private SelfReconciliationVO buildSelfReconciliation(String startDateStr, String endDateStr, String formattedDate, Long channelId) {
|
||||
SelfReconciliationVO selfReconciliationVO = new SelfReconciliationVO();
|
||||
selfReconciliationVO.setDay(formattedDate);
|
||||
BigDecimal deductionAmount = defaultIfNull(etOrderMapper.getDepositDeductionAmount(startDateStr, endDateStr, null,channelId),BigDecimal.ZERO);// 押金抵扣金额 538
|
||||
BigDecimal depositAmount = defaultIfNull(etOrderMapper.getDepositAmount(startDateStr, endDateStr, null,channelId),BigDecimal.ZERO);// 押金收入 25123
|
||||
BigDecimal handlingFee = etCapitalFlowMapper.getHandlingFee2(startDateStr, endDateStr, null, null,channelId);//手续费,扣除掉退款部分的
|
||||
BigDecimal platformServiceFee = etCapitalFlowMapper.getServiceFee2(startDateStr, endDateStr, null,null,channelId);//平台服务费 ,扣除掉退款部分的
|
||||
BigDecimal withdrawServiceFee = etCapitalFlowMapper.getWithdrawServiceFee(startDateStr, endDateStr,null);//提现服务费 ,扣除掉提现失败部分的
|
||||
BigDecimal cost = defaultIfNull(etOrderMapper.getCost(startDateStr, endDateStr, null,channelId),BigDecimal.ZERO);// 押金收入 25123
|
||||
|
||||
selfReconciliationVO.setDeductionAmount(deductionAmount);
|
||||
selfReconciliationVO.setDepositPaid(depositAmount);
|
||||
selfReconciliationVO.setHandlingCharge(handlingFee);
|
||||
selfReconciliationVO.setPlatformServiceFee(platformServiceFee);
|
||||
if(channelId == 2){
|
||||
selfReconciliationVO.setChannelCost(cost);
|
||||
}
|
||||
selfReconciliationVO.setWithdrawServiceFee(withdrawServiceFee);
|
||||
|
||||
/** 总支出*/
|
||||
BigDecimal orderRefund = defaultIfNull(etOrderMapper.getRefundFee2(startDateStr, endDateStr, null, null,channelId), BigDecimal.ZERO);//订单退款
|
||||
BigDecimal depositRefundFee = defaultIfNull(etOrderMapper.getDepositRefundFee(startDateStr, endDateStr, null, null,channelId), BigDecimal.ZERO);//押金退款 24795 25386
|
||||
// depositChange 等于depositAmount减去deductionAmount减去depositRefundFee
|
||||
selfReconciliationVO.setDepositChange(depositAmount.subtract(deductionAmount).subtract(depositRefundFee));
|
||||
// 统计所有用户今日账变 进账
|
||||
BigDecimal userReceipts = defaultIfNull(etCapitalFlowMapper.getAllUserReceipts(startDateStr, endDateStr, null,channelId),BigDecimal.ZERO);
|
||||
|
||||
selfReconciliationVO.setOrderRefund(orderRefund);
|
||||
selfReconciliationVO.setDepositRefund(depositRefundFee);
|
||||
BigDecimal depositBalance = depositAmount.subtract(depositRefundFee).subtract(deductionAmount);
|
||||
selfReconciliationVO.setDepositBalance(depositBalance);
|
||||
selfReconciliationVO.setUserReceipts(userReceipts);
|
||||
return selfReconciliationVO;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 首页统计-总管理
|
||||
|
|
|
|||
|
|
@ -885,13 +885,20 @@ public class EtTask {
|
|||
String endDateStr = formattedDate + " " + Constants.DATE_FORMAT_END_PEREND;
|
||||
/** 总收入*/
|
||||
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());
|
||||
calendar.add(Calendar.DATE, -1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void setBalance(String previousDay, SelfReconciliationVO selfReconciliationVO) {
|
||||
BigDecimal depositBalance = defaultIfNull(etReconciliationMapper.getDepositBalance(previousDay),BigDecimal.ZERO);
|
||||
selfReconciliationVO.setDepositBalance(depositBalance.add(selfReconciliationVO.getDepositChange()));
|
||||
}
|
||||
|
||||
private SelfReconciliationVO buildSelfReconciliation(String startDateStr, String endDateStr, String formattedDate, Long aLong, Long channelId) {
|
||||
SelfReconciliationVO selfReconciliationVO = new SelfReconciliationVO();
|
||||
selfReconciliationVO.setDay(formattedDate);
|
||||
|
|
@ -955,6 +962,7 @@ public class EtTask {
|
|||
etReconciliation.setOrderCount(selfReconciliationVO.getOrderCount());
|
||||
etReconciliation.setChannelCost(selfReconciliationVO.getChannelCost());
|
||||
etReconciliation.setWithdrawServiceFee(selfReconciliationVO.getWithdrawServiceFee());
|
||||
etReconciliation.setBalance(selfReconciliationVO.getDepositBalance());
|
||||
int i1 = etReconciliationMapper.insertEtReconciliation(etReconciliation);
|
||||
log.info("【平台对账】保存对账数据结果:【{}】",i1);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,7 +29,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
</resultMap>
|
||||
|
||||
<sql id="selectEtCapitalFlowVo">
|
||||
select flow_id, area_id, owner, owner_id, owner_phone, owner_type, order_no, out_trade_no, type, bus_type, status, amount, handling_charge, platform_service_fee, operator_dividend, operator_balance, partner_dividend, pay_type, create_time, model_id from et_capital_flow
|
||||
select flow_id, area_id, owner, owner_id, owner_phone, owner_type, order_no, out_trade_no, type, bus_type, status, amount,
|
||||
handling_charge, platform_service_fee, operator_dividend, operator_balance,
|
||||
partner_dividend, pay_type, create_time, model_id from et_capital_flow
|
||||
</sql>
|
||||
|
||||
<sql id="searchCondition">
|
||||
|
|
|
|||
|
|
@ -24,12 +24,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<result property="orderCount" column="order_count" />
|
||||
<result property="withdrawServiceFee" column="withdraw_service_fee" />
|
||||
<result property="channelCost" column="channel_cost" />
|
||||
<result property="balance" column="balance" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectEtReconciliationVo">
|
||||
select reconciliation_id, order_paid, total_amount, deposit_paid, pay_channel, create_time, day, deposit_refund, deduction_amount,
|
||||
handling_charge, user_receipts, settlement_amount, platform_service_fee, order_refund, order_surplus, deposit_surplus,
|
||||
order_count, withdraw_service_fee, channel_cost from et_reconciliation
|
||||
order_count, withdraw_service_fee, channel_cost, balance from et_reconciliation
|
||||
</sql>
|
||||
|
||||
<select id="selectEtReconciliationList" parameterType="EtReconciliation" resultMap="EtReconciliationResult">
|
||||
|
|
@ -61,6 +62,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
where reconciliation_id = #{reconciliationId}
|
||||
</select>
|
||||
|
||||
<select id="getDepositBalance" resultType="java.math.BigDecimal">
|
||||
select COALESCE(sum(balance),0) from et_reconciliation where day = #{day} and pay_channel = 2
|
||||
</select>
|
||||
|
||||
<insert id="insertEtReconciliation" parameterType="EtReconciliation" useGeneratedKeys="true" keyProperty="reconciliationId">
|
||||
insert into et_reconciliation
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
|
|
@ -82,6 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="orderCount != null">order_count,</if>
|
||||
<if test="withdrawServiceFee != null">withdraw_service_fee,</if>
|
||||
<if test="channelCost != null">channel_cost,</if>
|
||||
<if test="balance != null">balance,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="orderPaid != null">#{orderPaid},</if>
|
||||
|
|
@ -102,6 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="orderCount != null">#{orderCount},</if>
|
||||
<if test="withdrawServiceFee != null">#{withdrawServiceFee},</if>
|
||||
<if test="channelCost != null">#{channelCost},</if>
|
||||
<if test="balance != null">#{balance},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
|
|
@ -126,6 +133,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="orderCount != null">order_count = #{orderCount},</if>
|
||||
<if test="withdrawServiceFee != null">withdraw_service</if>
|
||||
<if test="channelCost != null">channel_cost = #{channelCost},</if>
|
||||
<if test="balance != null">balance = #{balance},</if>
|
||||
</trim>
|
||||
where reconciliation_id = #{reconciliationId}
|
||||
</update>
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user