Parcourir la source

订单导出金额修改

fgd il y a 1 an
Parent
commit
fab043cbf6

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

@@ -1385,12 +1385,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
         BigDecimal orderPackagePrice = orderPackageSku.divide(BigDecimal.valueOf(orderSkuList.size()), 2, RoundingMode.HALF_UP);
         List<OrderSkuExportVo> exportVoList = orderSkuList.stream().map(item -> {
             BigDecimal subtotal = item.getUnitPrice()
-                    .add(item.getCustomProcessingFee())
-                    .add(item.getLssueFee())
                     .add(item.getDeliveryMaterialsFee())
-                    .add(item.getPackingLabor())
-                    .add(item.getPackagingMaterialCost())
-                    .add(item.getManagementFee());
+                    .add(item.getPackagingMaterialCost());
             BomSpecBo bomSpecBo = bomSpecBoMap.get(item.getBomSpecId());
             SkuSpec skuSpec = skuSpecMap.get(item.getSkuSpecId());
             OrderSkuExportVo orderSkuExportVo = new OrderSkuExportVo();

+ 2 - 4
sd-business/src/main/resources/mapper/sku/SkuMapper.xml

@@ -50,8 +50,7 @@
                         ss.name skuSpecName
         from sku s
                  inner join sku_spec ss on s.id = ss.sku_id
-                 left join sku_spec_link sslt on ss.id = sslt.sku_spec_id
-                 left join bom_spec bs on sslt.bom_spec_id = bs.id
+                 left join bom_spec bs on ss.bom_spec_id = bs.id
             ${ew.customSqlSegment}
     </select>
 
@@ -63,8 +62,7 @@
                         ss.name skuSpecName
         from sku s
                  inner join sku_spec ss on s.id = ss.sku_id
-                 left join sku_spec_link sslt on ss.id = sslt.sku_spec_id
-                 left join bom_spec bs on sslt.bom_spec_id = bs.id
+                 left join bom_spec bs on ss.bom_spec_id = bs.id
             ${ew.customSqlSegment}
     </select>