Commit 7cbf0cd7 by yinyong

订单FBA费修改

parent f737c22a
...@@ -140,6 +140,7 @@ public class OrderSyncJob extends PointJob { ...@@ -140,6 +140,7 @@ public class OrderSyncJob extends PointJob {
dcBaseOmsOrder.setQuantityBailunSku(bailunSkuCumulative.getTotalQuantity()); dcBaseOmsOrder.setQuantityBailunSku(bailunSkuCumulative.getTotalQuantity());
//计算每个SKU采购价占总采购价比重(用于摊分SKU售价之类) 以及 每个SKU重量价占总重量的比重 //计算每个SKU采购价占总采购价比重(用于摊分SKU售价之类) 以及 每个SKU重量价占总重量的比重
BigDecimal omsOrderFBAFee = BigDecimal.valueOf(0); BigDecimal omsOrderFBAFee = BigDecimal.valueOf(0);
dcBaseOmsOrder.setHasFbaFee(false);
for (BailunSku bailunSkuObj : omsResult.getBailunSku()) { for (BailunSku bailunSkuObj : omsResult.getBailunSku()) {
BailunSkuStructure bailunSkuStructure = new BailunSkuStructure(); BailunSkuStructure bailunSkuStructure = new BailunSkuStructure();
/* /*
...@@ -201,7 +202,6 @@ public class OrderSyncJob extends PointJob { ...@@ -201,7 +202,6 @@ public class OrderSyncJob extends PointJob {
BigDecimal FBAFee = dcBaseOmsSkuMapper.selectFBAFee(dcBaseOmsSku.getBailunSku(), dcBaseOmsSku.getWebsite()); BigDecimal FBAFee = dcBaseOmsSkuMapper.selectFBAFee(dcBaseOmsSku.getBailunSku(), dcBaseOmsSku.getWebsite());
dcBaseOmsSku.setCostFbaFee(FBAFee == null ? BigDecimal.valueOf(0) : FBAFee); dcBaseOmsSku.setCostFbaFee(FBAFee == null ? BigDecimal.valueOf(0) : FBAFee);
omsOrderFBAFee = omsOrderFBAFee.add(FBAFee); omsOrderFBAFee = omsOrderFBAFee.add(FBAFee);
dcBaseOmsOrder.setHasFbaFee(false);
} }
//FBA的发货数不用从配货单信息拿, FBA只要下单亚马逊就发货 //FBA的发货数不用从配货单信息拿, FBA只要下单亚马逊就发货
dcBaseOmsSku.setBailunSkuQuantityShipped(bailunSkuObj.getBailunSkuQuantityOrdered()); dcBaseOmsSku.setBailunSkuQuantityShipped(bailunSkuObj.getBailunSkuQuantityOrdered());
......
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