Commit 8ee918a8 by yinyong

订单FBA费用判断修改

parent c60e8d84
...@@ -193,7 +193,7 @@ public class OrderSyncJob extends PointJob { ...@@ -193,7 +193,7 @@ public class OrderSyncJob extends PointJob {
assignmentSkuInfo(omsResult, dcBaseOmsOrder, dcBaseOmsSku, bailunSkuObj, dcBaseWarehouse, logisticsHashMap,bailunSkuStructure); assignmentSkuInfo(omsResult, dcBaseOmsOrder, dcBaseOmsSku, bailunSkuObj, dcBaseWarehouse, logisticsHashMap,bailunSkuStructure);
if (PlatformType.FBA.value().equals(omsResult.getPlatformType().toUpperCase())) { if (PlatformType.FBA.value().equals(omsResult.getPlatformType().toUpperCase())) {
//FBA费用 //FBA费用
if(dcBaseOmsOrder.getCostFbaFee().compareTo(BigDecimal.valueOf(0)) == 1) { if((dcBaseOmsOrder.getCostFbaFee().compareTo(BigDecimal.valueOf(0)) == 1) || (dcBaseOmsOrder.getAmountTotal().compareTo(BigDecimal.valueOf(0)) == 0)) {
BigDecimal skuCostFbaFee = bailunSkuStructure.getSkuWeightRatio().multiply(dcBaseOmsOrder.getCostFbaFee()).setScale(5, RoundingMode.HALF_EVEN); BigDecimal skuCostFbaFee = bailunSkuStructure.getSkuWeightRatio().multiply(dcBaseOmsOrder.getCostFbaFee()).setScale(5, RoundingMode.HALF_EVEN);
dcBaseOmsSku.setCostFbaFee(skuCostFbaFee); dcBaseOmsSku.setCostFbaFee(skuCostFbaFee);
dcBaseOmsOrder.setHasFbaFee(true); dcBaseOmsOrder.setHasFbaFee(true);
......
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