|
@@ -513,19 +513,33 @@ public class KwpSettlementWalletService {
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- public BigDecimal getConfirmLogisticsPayment(Long id) {
|
|
|
|
|
- SettlementLogisticsDto byId = kwpSettlementLogisticsService.detail(id, LogisticsUnitType.CARRIER, LogisticsUnitType.SHIPPER);
|
|
|
|
|
- if (Objects.isNull(byId)) {
|
|
|
|
|
- throw new BusinessException("结算单不存在");
|
|
|
|
|
- }
|
|
|
|
|
- if (StringUtils.isNotBlank(byId.getTrading()) && !byId.getTrading().startsWith(TradingEnum.RECEIVE_PAY.getValue())) {
|
|
|
|
|
- throw new BusinessException("只支持货货到付款方式订单进行当前操作");
|
|
|
|
|
- }
|
|
|
|
|
- List<LedgerUnitDto> listById = kwpSettlementLogisticsService.getListById(id);
|
|
|
|
|
- if (CollectionUtils.isEmpty(listById) || listById.size() != NumberConstant.TWO) {
|
|
|
|
|
- throw new BusinessException("对账单交易企业双方不存在或缺少");
|
|
|
|
|
- }
|
|
|
|
|
- return getWalletBalance(listById, byId.getTrading());
|
|
|
|
|
|
|
+ public WalletDto getConfirmLogisticsPayment(Long id) {
|
|
|
|
|
+ //todo
|
|
|
|
|
+ WalletDto walletDto = new WalletDto();
|
|
|
|
|
+ walletDto.setName("测试钱宝");
|
|
|
|
|
+ walletDto.setMemberName("");
|
|
|
|
|
+ walletDto.setUid("kll_0001");
|
|
|
|
|
+ walletDto.setChannel("1");
|
|
|
|
|
+ walletDto.setCreateTime(LocalDateTime.now());
|
|
|
|
|
+ walletDto.setFilter("kll_0002");
|
|
|
|
|
+ walletDto.setFreeze(0L);
|
|
|
|
|
+ walletDto.setApMoney(0L);
|
|
|
|
|
+ walletDto.setTotalMoney(12000L);
|
|
|
|
|
+ walletDto.setMoney(1L);
|
|
|
|
|
+
|
|
|
|
|
+ return walletDto;
|
|
|
|
|
+// SettlementLogisticsDto byId = kwpSettlementLogisticsService.detail(id, LogisticsUnitType.CARRIER, LogisticsUnitType.SHIPPER);
|
|
|
|
|
+// if (Objects.isNull(byId)) {
|
|
|
|
|
+// throw new BusinessException("结算单不存在");
|
|
|
|
|
+// }
|
|
|
|
|
+// if (StringUtils.isNotBlank(byId.getTrading()) && !byId.getTrading().startsWith(TradingEnum.RECEIVE_PAY.getValue())) {
|
|
|
|
|
+// throw new BusinessException("只支持货货到付款方式订单进行当前操作");
|
|
|
|
|
+// }
|
|
|
|
|
+// List<LedgerUnitDto> listById = kwpSettlementLogisticsService.getListById(id);
|
|
|
|
|
+// if (CollectionUtils.isEmpty(listById) || listById.size() != NumberConstant.TWO) {
|
|
|
|
|
+// throw new BusinessException("对账单交易企业双方不存在或缺少");
|
|
|
|
|
+// }
|
|
|
|
|
+// return getWalletBalance(listById, byId.getTrading());
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|