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

add 新增后管页面查询引流抽成订单列表 接口

Browse Source
This commit is contained in:
Lemon
2025-07-29 16:56:15 +08:00
parent 96026f3422
commit 11ff85eeba
7 changed files with 1021 additions and 863 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,6 +7,7 @@ import com.jsowell.adapay.response.PaymentConfirmResponse;
import com.jsowell.common.core.page.PageResponse;
import com.jsowell.pile.domain.OrderSplitRecord;
import com.jsowell.pile.dto.QueryOrderSplitDTO;
import com.jsowell.pile.dto.QueryOrderSplitRecordDTO;
import com.jsowell.pile.dto.SplitConfigStationDTO;
import com.jsowell.pile.dto.SplitOrderDTO;
import com.jsowell.pile.vo.OrderInfoDetailVO;
@@ -99,5 +100,12 @@ public interface OrderSplitRecordService {
* @param paymentConfirmId
*/
String confirmReverseByPaymentConfirmId(String paymentConfirmId) throws BaseAdaPayException;
/**
* 后管配置引流抽成页面订单列表
* @param dto
* @return
*/
List<OrderSplitRecordVO> getStationCommissionList(QueryOrderSplitRecordDTO dto);
}

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

@@ -17,12 +17,14 @@ import com.jsowell.common.enums.adapay.AdapayStatusEnum;
import com.jsowell.common.enums.ykc.ReturnCodeEnum;
import com.jsowell.common.exception.BusinessException;
import com.jsowell.common.util.DateUtils;
import com.jsowell.common.util.PageUtils;
import com.jsowell.common.util.SecurityUtils;
import com.jsowell.common.util.StringUtils;
import com.jsowell.pile.domain.AdapayMemberAccount;
import com.jsowell.pile.domain.OrderSplitRecord;
import com.jsowell.pile.domain.PileMerchantInfo;
import com.jsowell.pile.dto.QueryOrderSplitDTO;
import com.jsowell.pile.dto.QueryOrderSplitRecordDTO;
import com.jsowell.pile.dto.SplitConfigStationDTO;
import com.jsowell.pile.dto.SplitOrderDTO;
import com.jsowell.pile.mapper.OrderSplitRecordMapper;
@@ -560,6 +562,29 @@ public class OrderSplitRecordServiceImpl implements OrderSplitRecordService {
return status;
}
/**
* 后管配置引流抽成页面查询订单列表
* @param dto
* @return
*/
@Override
public List<OrderSplitRecordVO> getStationCommissionList(QueryOrderSplitRecordDTO dto) {
int pageNo = dto.getPageNum() == null ? 1 : dto.getPageNum();
int pageSize = dto.getPageSize() == null ? 10 : dto.getPageSize();
// 分页
PageUtils.startPage(pageNo, pageSize);
List<OrderSplitRecordVO> stationCommissionList = orderSplitRecordMapper.getStationCommissionList(dto);
if (CollectionUtils.isEmpty(stationCommissionList)) {
return new ArrayList<>();
}
for (OrderSplitRecordVO orderSplitRecordVO : stationCommissionList) {
// 计算 抽成总金额 = 抽成电费 + 抽成服务费
BigDecimal commissionAmount = orderSplitRecordVO.getElectricitySplitAmount().add(orderSplitRecordVO.getServiceSplitAmount());
orderSplitRecordVO.setCommissionAmount(commissionAmount);
}
return stationCommissionList;
}
/**
* 根据汇付会员id查询分账汇总数据
* @param dto