Skip to content

D
dc-java
Commit b4376f72 by yinyong
Options

oms订单费用数据更改

parent 3e78469d
Showing with 16 additions and 10 deletions
data-base/base-sync-oms-order/src/main/java/com/bailuntec/job/OrderSyncJob.java
...@@ -980,16 +980,22 @@ public class OrderSyncJob extends PointJob { ...@@ -980,16 +980,22 @@ public class OrderSyncJob extends PointJob {
for(WmsFeeDetailDtos wmsFeeDetailDtos : wmsFeeDetailDtosList) { for(WmsFeeDetailDtos wmsFeeDetailDtos : wmsFeeDetailDtosList) {
if(wmsFeeDetailDtos.getPickingNo() != null && pickingOrder.getPickOrderId().equals(wmsFeeDetailDtos.getPickingNo())) { if(wmsFeeDetailDtos.getPickingNo() != null && pickingOrder.getPickOrderId().equals(wmsFeeDetailDtos.getPickingNo())) {
BigDecimal totalFee = wmsFeeDetailDtos.getTotalFee().multiply(weightRatio).setScale(5, RoundingMode.HALF_EVEN); BigDecimal totalFee = wmsFeeDetailDtos.getTotalFee() == null ? BigDecimal.ZERO : wmsFeeDetailDtos.getTotalFee().multiply(weightRatio).setScale(5, RoundingMode.HALF_EVEN);
BigDecimal shipping = wmsFeeDetailDtos.getShipping().multiply(weightRatio).setScale(5, RoundingMode.HALF_EVEN); BigDecimal shipping = wmsFeeDetailDtos.getShipping() == null ? BigDecimal.ZERO : wmsFeeDetailDtos.getShipping().multiply(weightRatio).setScale(5, RoundingMode.HALF_EVEN);
BigDecimal opf = wmsFeeDetailDtos.getOpf().multiply(weightRatio).setScale(5, RoundingMode.HALF_EVEN); BigDecimal opf = wmsFeeDetailDtos.getOpf() == null ? BigDecimal.ZERO : wmsFeeDetailDtos.getOpf().multiply(weightRatio).setScale(5, RoundingMode.HALF_EVEN);
BigDecimal fsc = wmsFeeDetailDtos.getFsc().multiply(weightRatio).setScale(5, RoundingMode.HALF_EVEN); BigDecimal fsc = wmsFeeDetailDtos.getFsc() == null ? BigDecimal.ZERO : wmsFeeDetailDtos.getFsc().multiply(weightRatio).setScale(5, RoundingMode.HALF_EVEN);
BigDecimal dt = wmsFeeDetailDtos.getDt().multiply(weightRatio).setScale(5, RoundingMode.HALF_EVEN); BigDecimal dt = wmsFeeDetailDtos.getDt() == null ? BigDecimal.ZERO : wmsFeeDetailDtos.getDt().multiply(weightRatio).setScale(5, RoundingMode.HALF_EVEN);
BigDecimal rsf = wmsFeeDetailDtos.getRsf().multiply(weightRatio).setScale(5, RoundingMode.HALF_EVEN); BigDecimal rsf = wmsFeeDetailDtos.getRsf() == null ? BigDecimal.ZERO : wmsFeeDetailDtos.getRsf().multiply(weightRatio).setScale(5, RoundingMode.HALF_EVEN);
BigDecimal otf = wmsFeeDetailDtos.getOtf().multiply(weightRatio).setScale(5, RoundingMode.HALF_EVEN); BigDecimal otf = wmsFeeDetailDtos.getOtf() == null ? BigDecimal.ZERO : wmsFeeDetailDtos.getOtf().multiply(weightRatio).setScale(5, RoundingMode.HALF_EVEN);
BigDecimal whf = wmsFeeDetailDtos.getWhf().multiply(weightRatio).setScale(5, RoundingMode.HALF_EVEN); BigDecimal whf = wmsFeeDetailDtos.getWhf() == null ? BigDecimal.ZERO : wmsFeeDetailDtos.getWhf().multiply(weightRatio).setScale(5, RoundingMode.HALF_EVEN);
BigDecimal wmsToCnyExchangeRate = CallBailunSystem.getExchangeRate(wmsFeeDetailDtos.getCurrencyCode(), Constant.RMB_CURRENCY, exchangeDate); BigDecimal wmsToCnyExchangeRate = BigDecimal.ZERO;
BigDecimal wmsToUsdExchangeRate = CallBailunSystem.getExchangeRate(wmsFeeDetailDtos.getCurrencyCode(), Constant.USD_CURRENCY, exchangeDate); BigDecimal wmsToUsdExchangeRate = BigDecimal.ZERO;
if(wmsFeeDetailDtos.getCurrencyCode() != null) {
wmsToCnyExchangeRate = CallBailunSystem.getExchangeRate(wmsFeeDetailDtos.getCurrencyCode(), Constant.RMB_CURRENCY, exchangeDate);
wmsToUsdExchangeRate = CallBailunSystem.getExchangeRate(wmsFeeDetailDtos.getCurrencyCode(), Constant.USD_CURRENCY, exchangeDate);
}else {
wmsFeeDetailDtos.setCurrencyCode("");
}
dcBaseOmsSku.setTotalFee(dcBaseOmsSku.getTotalFee() != null ? dcBaseOmsSku.getTotalFee().add(totalFee) : totalFee); dcBaseOmsSku.setTotalFee(dcBaseOmsSku.getTotalFee() != null ? dcBaseOmsSku.getTotalFee().add(totalFee) : totalFee);
dcBaseOmsSku.setShipping(dcBaseOmsSku.getShipping() != null ? dcBaseOmsSku.getShipping().add(shipping) : shipping); dcBaseOmsSku.setShipping(dcBaseOmsSku.getShipping() != null ? dcBaseOmsSku.getShipping().add(shipping) : shipping);
dcBaseOmsSku.setOpf(dcBaseOmsSku.getOpf() != null ? dcBaseOmsSku.getOpf().add(opf) : opf); dcBaseOmsSku.setOpf(dcBaseOmsSku.getOpf() != null ? dcBaseOmsSku.getOpf().add(opf) : opf);
......
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