|
|
@@ -4869,12 +4869,14 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
|
|
|
//计算成本
|
|
|
goodsName.append(goodsDesc.getCname()).append(",");
|
|
|
retrieval.append(goodsDesc.getCnameInt()).append(",");
|
|
|
- item.setCostprie(item.getGoodsNum().multiply(inventoryCostPrice));
|
|
|
- item.setCostpriePrice(inventoryCostPrice);
|
|
|
- item.setRebateCostprie(item.getGoodsNum().multiply(rebateInventoryCostPrice));
|
|
|
- //计算毛利
|
|
|
- item.setGrossProfit(item.getSubTotalMoney().subtract(item.getCostprie()));
|
|
|
- item.setRebateProfit(item.getSubTotalMoney().subtract(item.getRebateCostprie()));
|
|
|
+ if (new BigDecimal("0.00").compareTo(item.getSendNum()) == 0){
|
|
|
+ item.setCostprie(item.getGoodsNum().multiply(inventoryCostPrice));
|
|
|
+ item.setCostpriePrice(inventoryCostPrice);
|
|
|
+ item.setRebateCostprie(item.getGoodsNum().multiply(rebateInventoryCostPrice));
|
|
|
+ //计算毛利
|
|
|
+ item.setGrossProfit(item.getSubTotalMoney().subtract(item.getCostprie()));
|
|
|
+ item.setRebateProfit(item.getSubTotalMoney().subtract(item.getRebateCostprie()));
|
|
|
+ }
|
|
|
}
|
|
|
orderItemsService.saveOrUpdate(item);
|
|
|
}
|