|
|
@ -57,7 +57,7 @@ public class CustomServiceImpl implements CustomService {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
CustomReport customReport = new CustomReport(addCustomVO.getOrder_id(), addCustomVO.getMch_custom_id(), addCustomVO.getMch_custom_name(),
|
|
|
|
CustomReport customReport = new CustomReport(addCustomVO.getOrder_id(), addCustomVO.getMch_custom_id(), addCustomVO.getMch_custom_name(),
|
|
|
|
addCustomVO.getCustom());
|
|
|
|
addCustomVO.getCustom());
|
|
|
|
customReport.addExtMchCustom(addCustomVO.getMch_custom_id(), addCustomVO.getMch_custom_name());
|
|
|
|
customReport.addExtMchCustom(addCustomVO.getMch_ext_custom_id(), addCustomVO.getMch_ext_custom_name());
|
|
|
|
if (!CollectionUtils.isEmpty(addCustomVO.getSubOrders())) {
|
|
|
|
if (!CollectionUtils.isEmpty(addCustomVO.getSubOrders())) {
|
|
|
|
addCustomVO.getSubOrders().forEach(p -> {
|
|
|
|
addCustomVO.getSubOrders().forEach(p -> {
|
|
|
|
customReport.addSubOrder(p.getBigDecimal("order_fee"), p.getBigDecimal("order_fee").subtract(p.getBigDecimal("transport_fee")));
|
|
|
|
customReport.addSubOrder(p.getBigDecimal("order_fee"), p.getBigDecimal("order_fee").subtract(p.getBigDecimal("transport_fee")));
|
|
|
|