Commit 0646fdae by jianshuqin

更换OA汇率接口

parent 144e97d3
......@@ -2,7 +2,7 @@ CASHIER_URL=http://cw.bailuntec.com/API/API/GetCashiers
WITHDRAW_DETAIL=http://cw.bailuntec.com/API/API/GetWithdrawDetailPages
SALES_PLATFORM=http://www.bailuntec.com/api/PlatformSite/GetPlatform
SALES_PLATFORM=http://oa.bailuntec.com/api/PlatformSite/GetPlatform
INTEREST_URL=http://cw.bailuntec.com/api/api/GetRepayPlanDetails
......
......@@ -1068,8 +1068,17 @@ public class OrderSyncJob extends PointJob {
wmsFeeDetailDtos.setCurrencyCode("CNY");
}
wmsToCnyExchangeRate = CallBailunSystem.getExchangeRate(wmsFeeDetailDtos.getCurrencyCode(), Constant.RMB_CURRENCY, exchangeDate);
if (wmsToCnyExchangeRate == null) {
wmsToCnyExchangeRate = BigDecimal.ZERO;
}
wmsToUsdExchangeRate = CallBailunSystem.getExchangeRate(wmsFeeDetailDtos.getCurrencyCode(), Constant.USD_CURRENCY, exchangeDate);
if (wmsToUsdExchangeRate == null) {
wmsToUsdExchangeRate = BigDecimal.ZERO;
}
wmsToRMBExchangeRate = CallBailunSystem.getExchangeRate(wmsFeeDetailDtos.getCurrencyCode(), Constant.RMB_CURRENCY, exchangeDate);
if (wmsToRMBExchangeRate == null) {
wmsToRMBExchangeRate = BigDecimal.ZERO;
}
dcBaseOmsPick.setTotalFee(totalFee);
dcBaseOmsPick.setShipping(shipping);
dcBaseOmsPick.setOpf(opf);
......
# \u751F\u4EA7\u73AF\u5883
SKU_URL=http://10.0.8.13:8000/api/sku/productsku/gmtproductskus
SKU_URL=http://api.skums.bailuntec.com/api/sku/productsku/gmtproductskus
SKU_SIMPLE_CATEGORY_URL=http://10.0.8.13:8000/api/category/simplecategory/categoriessimplebylevel?level=0
SKU_MAPPING_URL=http://172.31.255.108:6039/skumapping/getpageskumappings
BAILUN_CATEGORY_URL=http://10.0.8.13:8000/api/category/categorybailun/gmtbailuncategoriesbylevel
......
......@@ -13,7 +13,7 @@ public interface CommonConstant {
String SKU_APPID = "SystemNDC";
String SKU_APPKEY = "YmFpbHVuTkRD";
Pattern NUMBER_AND_DECIMAL = Pattern.compile("-?[0-9]+(\\.[0-9]+)?");
String EXCHANGE_RATE_URL = "http://www.bailuntec.com/Api/ExchangeRate/GetExchangeRateByCurAndDate";
String EXCHANGE_RATE_URL = "http://oa.bailuntec.com/Api/ExchangeRate/GetExchangeRateByCurAndDate";
String FIRST_FEE_URL = "http://lms.bailuntec.com/api/Logistics/ApiLogistics/GetFilterLogistics";
String ACCOUNT_NO_TOKEN_URL = "http://pams.bailuntec.com/Api/GetAccounts?Id=";
// String SKUMAPPING_URL = "http://api.sku.bailuntec.com/api/ApiCenter/SetData";
......
......@@ -55,7 +55,7 @@ url:
# 获取公司主体借款余额
getBorrowBalance: ${url.cwSystem}/api/api/GetBorrows
# 获取汇率
getExchangeRate: http://www.bailuntec.com/api/ExchangeRate/GetRmbExchangeRates
getExchangeRate: http://oa.bailuntec.com/api/ExchangeRate/GetRmbExchangeRates
# getExchangeRate: http://www.bailuntec.com/api/ExchangeRate/GetExchangeRate
# 获取销售平台和站点信息
getPlatformAndSite: http://pams.bailuntec.com/Api/GetPlatformSites
......
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