autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-26 22:15:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

新增 后管根据汇付会员id查询分账汇总数据 接口

Browse Source
This commit is contained in:
Lemon
2025-04-15 09:53:36 +08:00
parent cba009bcf2
commit dfb46e0fe0
6 changed files with 136 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
jsowell-pile/src/main/java/com/jsowell/pile/service/OrderSplitRecordService.java
View File

@@ -8,10 +8,7 @@ import com.jsowell.pile.domain.OrderSplitRecord;
import com.jsowell.pile.dto.QueryOrderSplitDTO;
import com.jsowell.pile.dto.SplitOrderDTO;
import com.jsowell.pile.vo.OrderInfoDetailVO;
import com.jsowell.pile.vo.web.OrderSplitDailySummaryData;
import com.jsowell.pile.vo.web.OrderSplitRecordVO;
import com.jsowell.pile.vo.web.SplitOrdersInfoVO;
import com.jsowell.pile.vo.web.SplitRecordInfoVO;
import com.jsowell.pile.vo.web.*;
import java.util.List;
import java.util.Map;
@@ -78,5 +75,12 @@ public interface OrderSplitRecordService {
* 根据汇付会员id查询时间段内订单分账记录
*/
List<OrderSplitRecord> queryOrderSplitRecordByMemberId(String adapayMemberId, String startTime, String endTime);
/**
* 根据汇付会员id查询分账汇总数据
* @param dto
* @return
*/
List<SplitAggregateDataVO> queryStationAggregateData(QueryOrderSplitDTO dto);
}

24
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderSplitRecordServiceImpl.java
View File

@@ -350,6 +350,30 @@ public class OrderSplitRecordServiceImpl implements OrderSplitRecordService {
return orderSplitRecordMapper.queryOrderSplitRecordByMemberId(adapayMemberId, startTime, endTime);
}
/**
* 根据汇付会员id查询分账汇总数据
* @param dto
* @return
*/
@Override
public List<SplitAggregateDataVO> queryStationAggregateData(QueryOrderSplitDTO dto) {
// 根据adapyMemberId、开始时间、结束时间查询出信息列表
List<SplitAggregateDataVO> list = orderSplitRecordMapper.getSplitListByAdapyMemberId(dto);
if (CollectionUtils.isEmpty(list)) {
return new ArrayList<>();
}
for (SplitAggregateDataVO splitAggregateDataVO : list) {
splitAggregateDataVO.setTimeRange(dto.getStartTime() + "至" + dto.getEndTime());
BigDecimal totalRevenueAmount = new BigDecimal(splitAggregateDataVO.getTotalElectricitySplitAmount())
.add(new BigDecimal(splitAggregateDataVO.getTotalServiceSplitAmount()))
.subtract(new BigDecimal(splitAggregateDataVO.getTotalFeeAmount()));
splitAggregateDataVO.setTotalRevenueAmount(String.valueOf(totalRevenueAmount));
}
return list;
}
/**
* 根据merchantId, 查询从他人分账的金额
* extra income