sku返回打样费

sd-business/src/main/java/com/sd/business/service/statement/impl/StatementOfAccountServiceImpl.java

@@ -982,7 +982,6 @@ public class StatementOfAccountServiceImpl extends ServiceImpl<StatementOfAccoun
                             v1.setDeliveryMaterialsFeeSummary(v1.getDeliveryMaterialsFeeSummary().add(v2.getDeliveryMaterialsFeeSummary()));
                             v1.setPackingLaborSummary(v1.getPackingLaborSummary().add(v2.getPackingLaborSummary()));
                             v1.setManagementFeeSummary(v1.getManagementFeeSummary().add(v2.getManagementFeeSummary()));
-                            v1.setProofingFeeSummary(v1.getProofingFeeSummary().add(v2.getProofingFeeSummary()));
                             v1.setSubtotal(v1.getSubtotal().add(v2.getSubtotal()));
                             v1.setTotal(v1.getSubtotal());
                             return v1;

sd-wln/src/main/java/com/sd/wln/service/impl/WlnOrderServiceImpl.java

@@ -246,7 +246,8 @@ public class WlnOrderServiceImpl implements WlnOrderService {
                 || Objects.equals(orderInfo.getStatus(), OrderStatusEnum.COMPLETION_PRODUCTION.getKey())
                 || Objects.equals(orderInfo.getStatus(), OrderStatusEnum.HAVE_BEEN_SHIPPED.getKey())) {
             // 万里牛状态异常：订单关闭的订单类型修改为无理由并生成对账单
-            if (Objects.equals(orderInfo.getStatus(), OrderStatusEnum.IN_PRODUCTION.getKey())
+            if (Objects.equals(orderInfo.getDelFlag(), StatusConstant.NOT_DELETED)
+                    && Objects.equals(orderInfo.getStatus(), OrderStatusEnum.IN_PRODUCTION.getKey())
                     && wlnOrder.getInteger("process_status") == 10
                     && ObjectUtil.notEqual(orderInfo.getClassify(), OrderClassifyEnum.NO_REASON_ORDER.getKey())) {
                 List<OrderInfo> updateOrderList = context.getUpdateOrderList();
@@ -858,7 +859,7 @@ public class WlnOrderServiceImpl implements WlnOrderService {
         Map<Long, List<OrderSku>> orderSkuMap = Stream.concat(
                         saveOrderSkuList.stream(),
                         updateOrderList.stream()
-                                .map(item -> existOrderSkuMap.get(item.getId()))
+                                .map(item -> existOrderSkuMap.getOrDefault(item.getId(), Collections.emptyList()))
                                 .flatMap(Collection::stream)
                 )
                 .filter(item -> orderMap.get(item.getOrderId()).getExceptionType().equals(OrderExceptionTypeEnum.NORMAL.getKey().toString()))