Merge remote-tracking branch 'origin/master'

sd-business/src/main/java/com/sd/business/entity/order/po/OrderInfo.java

@@ -194,6 +194,12 @@ public class OrderInfo extends BasePo {
     private BigDecimal packagingMaterialCost;
 
     /**
+     * 外箱包装费
+     */
+    @NotNull(message = "外箱包装费不能为空")
+    private BigDecimal outerBoxPackingFee;
+
+    /**
      * 税率
      */
     private BigDecimal taxRate;

sd-business/src/main/java/com/sd/business/entity/statement/bo/ExportDocumentByOrderBo.java

@@ -112,4 +112,9 @@ public class ExportDocumentByOrderBo {
      */
     private BigDecimal managementFeeSummary;
 
+    /**
+     * 外箱包装费
+     */
+    private BigDecimal outerBoxPackingFee;
+
 }

sd-business/src/main/java/com/sd/business/entity/statement/vo/DocumentByOrderVo.java

@@ -43,6 +43,11 @@ public class DocumentByOrderVo {
      */
     private List<SkuSpec> skuSpecList;
 
+    /**
+     * 外箱包装费
+     */
+    private BigDecimal outerBoxPackingFee;
+
     @Getter
     @Setter
     @Builder

sd-business/src/main/java/com/sd/business/entity/statement/vo/ReconciliationDetailVo.java

@@ -71,4 +71,9 @@ public class ReconciliationDetailVo {
      */
     private BigDecimal managementFee;
 
+    /**
+     * 外箱包装费
+     */
+    private BigDecimal outerBoxPackingFee;
+
 }

sd-business/src/main/java/com/sd/business/service/order/impl/OrderServiceImpl.java

@@ -199,11 +199,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
         List<OrderSku> tempOrderSkuList = orderSkuService.list(q -> q.eq(OrderSku::getOrderId, id));
         List<OrderSkuVo> orderSkuList = BeanUtil.copyToList(tempOrderSkuList, OrderSkuVo.class);
 
-        // 当订单为委外订单时，数量设置为0
-        if (Objects.equals(orderInfo.getType(), 2)) {
-            orderSkuList.forEach(item -> item.setQuantity(BigDecimal.ZERO));
-        }
-
         skuSpecService.attributeAssign(orderSkuList, OrderSkuVo::getSkuSpecId, (item, skuSpec) -> {
             item.setName(skuSpec.getName());
             item.setCode(skuSpec.getCode());

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

@@ -97,6 +97,7 @@ public class StatementOfAccountExportServiceImpl implements StatementOfAccountEx
                             .deliveryMaterialsFeeSummary(bomSpec.getDeliveryMaterialsFeeSummary())
                             .packingLaborSummary(bomSpec.getPackingLaborSummary())
                             .managementFeeSummary(bomSpec.getManagementFeeSummary())
+                            .outerBoxPackingFee(documentByOrderVo.getOuterBoxPackingFee())
                             .build();
                     exportDocumentByOrderBos.add(exportDocumentByOrderBo);
                 }

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

@@ -157,6 +157,7 @@ public class StatementOfAccountServiceImpl extends ServiceImpl<StatementOfAccoun
                 .packingLabor(item.getPackingLabor())
                 .packagingMaterialCost(item.getPackagingMaterialCost())
                 .managementFee(item.getManagementFee())
+                .outerBoxPackingFee(item.getOuterBoxPackingFee())
                 .build()
         ).collect(Collectors.toList());
 
@@ -417,6 +418,7 @@ public class StatementOfAccountServiceImpl extends ServiceImpl<StatementOfAccoun
                         .wlnCreateTime(ObjectUtil.defaultIfNull(item.getWlnCreateTime(), item.getCreateTime()))
                         .code(item.getCode())
                         .wlnCode(item.getWlnCode())
+                        .outerBoxPackingFee(item.getOuterBoxPackingFee())
                         .build()
         ).collect(Collectors.toList());
 

sd-business/src/main/resources/mapper/order/OrderMapper.xml

@@ -31,6 +31,7 @@
                o.packing_labor,
                o.management_fee,
                o.packaging_material_cost,
+               o.outer_box_packing_fee,
                o.tax_rate,
                o.shipping_time,
                o.consignee,