Pārlūkot izejas kodu

去除外箱包装费

fgd 1 gadu atpakaļ
vecāks
revīzija
7177b9d809

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

@@ -199,11 +199,6 @@ public class OrderInfo extends BasePo {
     private BigDecimal packagingMaterialCost;
 
     /**
-     * 外箱包装费
-     */
-    private BigDecimal outerBoxPackingFee;
-
-    /**
      * 税率
      */
     private BigDecimal taxRate;

+ 0 - 6
sd-business/src/main/java/com/sd/business/entity/order/vo/OrderSkuVo.java

@@ -97,10 +97,4 @@ public class OrderSkuVo extends OrderSku {
      * 事业部名称
      */
     private String departmentName;
-
-    /**
-     * 订单外箱包装费
-     */
-    private BigDecimal outerBoxPackingFee;
-
 }

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

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

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

@@ -37,11 +37,6 @@ public class DocumentByOrderVo {
     private Integer placeholder;
 
     /**
-     * 外箱包装费
-     */
-    private BigDecimal outerBoxPackingFee;
-
-    /**
      * 合计
      */
     private BigDecimal total;

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

@@ -70,10 +70,4 @@ public class ReconciliationDetailVo {
      * 管理费
      */
     private BigDecimal managementFee;
-
-    /**
-     * 外箱包装费
-     */
-    private BigDecimal outerBoxPackingFee;
-
 }

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

@@ -167,7 +167,6 @@ public class StatementOfAccountServiceImpl extends ServiceImpl<StatementOfAccoun
                 .packingLabor(item.getPackingLabor())
                 .packagingMaterialCost(item.getPackagingMaterialCost())
                 .managementFee(item.getManagementFee())
-                .outerBoxPackingFee(item.getOuterBoxPackingFee())
                 .build()
         ).collect(Collectors.toList());
 
@@ -442,7 +441,6 @@ public class StatementOfAccountServiceImpl extends ServiceImpl<StatementOfAccoun
             documentByOrderVo.setWlnCreateTime(ObjectUtil.defaultIfNull(item.getWlnCreateTime(), item.getCreateTime()));
             documentByOrderVo.setCode(item.getCode());
             documentByOrderVo.setWlnCode(item.getWlnCode());
-            documentByOrderVo.setOuterBoxPackingFee(item.getOuterBoxPackingFee());
             documentByOrderVo.setTotal(item.getTotalAmount());
 
             documentByOrderVo.setSourcePlatform(item.getSourcePlatform());

+ 0 - 1
sd-business/src/main/java/com/sd/business/strategy/impl/DocumentByOrderExcelExportStrategy.java

@@ -74,7 +74,6 @@ public class DocumentByOrderExcelExportStrategy implements ExcelExportStrategy<M
                             .wlnCreateTime(documentByOrderVo.getWlnCreateTime())
                             .code(documentByOrderVo.getCode())
                             .wlnCode(documentByOrderVo.getWlnCode())
-                            .outerBoxPackingFee(documentByOrderVo.getOuterBoxPackingFee())
                             .total(documentByOrderVo.getTotal())
                             .bomSpecCode(bomSpec.getBomSpecCode())
                             .bomSpecName(bomSpec.getBomSpecName())

+ 0 - 1
sd-business/src/main/java/com/sd/business/strategy/impl/SalesOutWarehouseDetailsExportStrategy.java

@@ -66,7 +66,6 @@ public class SalesOutWarehouseDetailsExportStrategy implements ExcelExportStrate
                             .subtotal(skuSpec.getSubtotal())
                             .wlnCreateTime(documentByOrderVo.getWlnCreateTime())
                             .wlnCode(documentByOrderVo.getWlnCode())
-                            .outerBoxPackingFee(documentByOrderVo.getOuterBoxPackingFee())
                             .total(documentByOrderVo.getTotal())
                             .bomSpecCode(bomSpec.getBomSpecCode())
                             .bomSpecName(bomSpec.getBomSpecName())

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

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

+ 0 - 1
sd-business/src/main/resources/mapper/order/OrderSkuMapper.xml

@@ -28,7 +28,6 @@
                oi.settlement_status orderSettlementStatus,
                oi.total_amount      orderTotalAmount,
                oi.wln_create_time,
-               oi.outer_box_packing_fee,
                ss.code              skuSpecCode,
                ss.name              skuSpecName,
                bs.name              bomSpecName,