Commit 50a864c6 by jianshuqin

调整OMS分摊金额系数取值换算汇率问题

parent 3e936bdc
...@@ -207,7 +207,7 @@ public class OrderSyncJob extends PointJob { ...@@ -207,7 +207,7 @@ public class OrderSyncJob extends PointJob {
bailunSkuStructure.setBailunSku(bailunSkuObj.getBailunSku()); bailunSkuStructure.setBailunSku(bailunSkuObj.getBailunSku());
bailunSkuStructure.setBailunSkuUnitPrice((bailunSkuObj.getBailunSkuUnitPrice() != null && bailunSkuObj.getBailunSkuUnitPrice().getAmount() != null) ? bailunSkuObj.getBailunSkuUnitPrice().getAmount() : BigDecimal.ZERO); bailunSkuStructure.setBailunSkuUnitPrice((bailunSkuObj.getBailunSkuUnitPrice() != null && bailunSkuObj.getBailunSkuUnitPrice().getAmount() != null) ? bailunSkuObj.getBailunSkuUnitPrice().getAmount() : BigDecimal.ZERO);
bailunSkuStructure.setBailunSkuWeight(bailunSkuObj.getBailunSkuWeight() != null ? bailunSkuObj.getBailunSkuWeight() : BigDecimal.ZERO); bailunSkuStructure.setBailunSkuWeight(bailunSkuObj.getBailunSkuWeight() != null ? bailunSkuObj.getBailunSkuWeight() : BigDecimal.ZERO);
bailunSkuStructure.setSkuCostRatio(dcBaseOmsOrder.getCostProduct().compareTo(BigDecimal.ZERO) == 1 ? bailunSkuStructure.getBailunSkuUnitPrice().multiply(BigDecimal.valueOf(bailunSkuObj.getBailunSkuQuantityOrdered())).divide(dcBaseOmsOrder.getCostProduct(), 5, RoundingMode.HALF_EVEN) : BigDecimal.ONE); bailunSkuStructure.setSkuCostRatio(dcBaseOmsOrder.getCostProduct().compareTo(BigDecimal.ZERO) == 1 ? bailunSkuStructure.getBailunSkuUnitPrice().multiply(bailunSkuObj.getBailunSkuUnitPrice().getExchangeRate() != null ? bailunSkuObj.getBailunSkuUnitPrice().getExchangeRate() : BigDecimal.ONE).multiply(BigDecimal.valueOf(bailunSkuObj.getBailunSkuQuantityOrdered())).divide(dcBaseOmsOrder.getCostProduct(), 5, RoundingMode.HALF_EVEN) : BigDecimal.ONE);
bailunSkuStructure.setSkuWeightRatio(bailunSkuCumulative.getTotalWeight().compareTo(BigDecimal.ZERO) == 1 ? bailunSkuStructure.getBailunSkuWeight().multiply(BigDecimal.valueOf(bailunSkuObj.getBailunSkuQuantityOrdered())).divide(bailunSkuCumulative.getTotalWeight(), 5, RoundingMode.HALF_EVEN) : BigDecimal.ONE); bailunSkuStructure.setSkuWeightRatio(bailunSkuCumulative.getTotalWeight().compareTo(BigDecimal.ZERO) == 1 ? bailunSkuStructure.getBailunSkuWeight().multiply(BigDecimal.valueOf(bailunSkuObj.getBailunSkuQuantityOrdered())).divide(bailunSkuCumulative.getTotalWeight(), 5, RoundingMode.HALF_EVEN) : BigDecimal.ONE);
bailunSkuStructure.setSkuQuantityOrderd(bailunSkuObj.getBailunSkuQuantityOrdered() != null ? bailunSkuObj.getBailunSkuQuantityOrdered() : 0); bailunSkuStructure.setSkuQuantityOrderd(bailunSkuObj.getBailunSkuQuantityOrdered() != null ? bailunSkuObj.getBailunSkuQuantityOrdered() : 0);
DcBaseOmsSku dcBaseOmsSku = new DcBaseOmsSku(); DcBaseOmsSku dcBaseOmsSku = new DcBaseOmsSku();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment