|
|
@@ -509,7 +509,7 @@ public class KwpLedgerTradeService extends AbsLedger {
|
|
|
kwpSettlementTrade.setTLedgerId(kwpLedgerTrade.getId());
|
|
|
kwpSettlementTrade.setStOrderNo(OrderGenerateUtils.generateOrderNo("BP"));
|
|
|
kwpSettlementTrade.setName(kwpLedgerTrade.getName());
|
|
|
- kwpSettlementTrade.setTotalPrice(kwpLedgerTrade.getTotalPrice());
|
|
|
+ kwpSettlementTrade.setTotalPrice(kwpLedgerTrade.getSettlePrice());
|
|
|
kwpSettlementTrade.setActualPrice(kwpLedgerTrade.getActualPrice());
|
|
|
kwpSettlementTrade.setRemark(Global.EMPTY_STRING);
|
|
|
kwpSettlementTrade.setAuditUser(kwpLedgerTrade.getAuditUser());
|
|
|
@@ -718,6 +718,7 @@ public class KwpLedgerTradeService extends AbsLedger {
|
|
|
List<OrderDto> detailRes = new ArrayList<>();
|
|
|
for (KwpLedgerTradeOrder kwpLedgerLogisticsOrder : kwpLedgerLogisticsOrders) {
|
|
|
OrderDetailRes orderDetailById = tradeOrderInfoService.getOrderDetailById(kwpLedgerLogisticsOrder.getTOrderId());
|
|
|
+ log.info("销售订单:{}", JSONObject.toJSONString(orderDetailById));
|
|
|
detailRes.add(changeOrder(orderDetailById));
|
|
|
}
|
|
|
return PageRes.build(pageInfo, detailRes);
|