|
@@ -254,7 +254,6 @@ public class NatOrderService {
|
|
|
customExcelItemList.add(new ExcelCollectPojo(startColumn + 3, startRows, new String[]{"退款总额", FormatUtil.intShrink100ToStr(refundTotal)}));
|
|
|
customExcelItemList.add(new ExcelCollectPojo(startColumn + 5, startRows, new String[]{"实际支付总额", FormatUtil.intShrink100ToStr(payTotal - refundTotal)}));
|
|
|
|
|
|
-
|
|
|
if (!Checker.isNone(itemList)) {
|
|
|
|
|
|
List<Integer> integerList = itemList.stream().map(NatOrder::getPaymentChannel).collect(Collectors.toList());
|
|
@@ -263,12 +262,9 @@ public class NatOrderService {
|
|
|
|
|
|
List<NatOrder> paymentList = itemList;
|
|
|
List<NatOrder> refundList = itemList;
|
|
|
-
|
|
|
-
|
|
|
paymentList = paymentList.stream().filter(p -> Checker.getIntegerValue(p.getPaymentStatus()) == PaymentStatusEnum.Success.getValue()).collect(Collectors.toList());
|
|
|
refundList = refundList.stream().filter(p -> Checker.getIntegerValue(p.getRefundStatus()) == RefundStatusEnum.SUCCESS.getValue()).collect(Collectors.toList());
|
|
|
|
|
|
-
|
|
|
if (!Checker.isNone(integerList)) {
|
|
|
List<Integer> paymentChannelList = new ArrayList<Integer>(new TreeSet<Integer>(integerList));
|
|
|
if (!Checker.isNone(paymentChannelList)) {
|