|
|
@@ -107,19 +107,26 @@ public class OrderServiceBusinessImpl implements OrderServiceBusiness {
|
|
|
// collect = earningsByOrders.stream().filter(a -> !ObjectUtils.isEmpty(a)).collect(Collectors.toMap(EarningsDTO::getOrderNo, a -> a, (b, c) -> c));
|
|
|
//
|
|
|
// }
|
|
|
-
|
|
|
+ vo.setBrokerage(BigDecimal.ZERO);
|
|
|
if (CollectionUtils.isNotEmpty(earningsByOrders)) {
|
|
|
// 收益
|
|
|
- EarningsDTO brokerage = earningsByOrders.stream()
|
|
|
+ EarningsDTO brokerage02 = earningsByOrders.stream()
|
|
|
.filter(a -> a.getOrderNo().equals(storeOrder.getOrderId())
|
|
|
&& a.getBizType().equals(5002)
|
|
|
)
|
|
|
.findFirst()
|
|
|
.orElse(null);
|
|
|
- if (!ObjectUtils.isEmpty(brokerage)) {
|
|
|
- vo.setBrokerage(brokerage.getEarnings());
|
|
|
- }else{
|
|
|
- vo.setBrokerage(BigDecimal.ZERO);
|
|
|
+ if (!ObjectUtils.isEmpty(brokerage02)) {
|
|
|
+ vo.setBrokerage(vo.getBrokerage().add(brokerage02.getEarnings()));
|
|
|
+ }
|
|
|
+ EarningsDTO brokerage01 = earningsByOrders.stream()
|
|
|
+ .filter(a -> a.getOrderNo().equals(storeOrder.getOrderId())
|
|
|
+ && a.getBizType().equals(5001)
|
|
|
+ )
|
|
|
+ .findFirst()
|
|
|
+ .orElse(null);
|
|
|
+ if (!ObjectUtils.isEmpty(brokerage01)) {
|
|
|
+ vo.setBrokerage(vo.getBrokerage().add(brokerage01.getEarnings()));
|
|
|
}
|
|
|
// 回收
|
|
|
EarningsDTO recycle = earningsByOrders.stream()
|