24282 1 жил өмнө
parent
commit
315eb31e34

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

@@ -293,8 +293,7 @@ public class StatementOfAccountServiceImpl extends ServiceImpl<StatementOfAccoun
                         .deliveryMaterialsFeeSummary(item.getDeliveryMaterialsFee().multiply(item.getQuantity()))
                         .packingLaborSummary(item.getPackingLabor().multiply(item.getQuantity()))
                         .build())
-                .peek(item -> item.setSubtotal(item.getUnitPrice()
-                        .multiply(item.getQuantity())
+                .peek(item -> item.setSubtotal(item.getUnitPrice().multiply(item.getQuantity())
                         .add(item.getLaserLogoSummary())
                         .add(item.getLaserMitochondrialSummary())
                         .add(item.getLssueFeeSummary())

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

@@ -300,7 +300,8 @@ public class WlnOrderServiceImpl implements WlnOrderService {
                 orderSkuBom.setUnitPrice(BigDecimal.ZERO);
             } else {
                 orderSkuBom.setUnitPrice(bomSpecBo.getInternalSellingPrice());
-                orderSku.setPackagingMaterialCost(bomSpecBo.getInternalSellingPrice().multiply(item.getQuantity()));
+                orderSku.setPackagingMaterialCost(orderSku.getPackagingMaterialCost()
+                        .add(bomSpecBo.getInternalSellingPrice().multiply(item.getQuantity())));
             }
             return orderSkuBom;
         }).collect(Collectors.toList());