Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
dc-java
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
huluobin
dc-java
Commits
0646fdae
Commit
0646fdae
authored
Feb 27, 2023
by
jianshuqin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更换OA汇率接口
parent
144e97d3
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
4 deletions
+13
-4
const.properties
...ase/base-sync-cashier/src/main/resources/const.properties
+1
-1
OrderSyncJob.java
...s-order/src/main/java/com/bailuntec/job/OrderSyncJob.java
+9
-0
const.properties
data-base/base-sync-sku/src/main/resources/const.properties
+1
-1
CommonConstant.java
...in/java/com/bailuntec/domain/constant/CommonConstant.java
+1
-1
application.yml
...mid/mid-ebay-uk-report/src/main/resources/application.yml
+1
-1
No files found.
data-base/base-sync-cashier/src/main/resources/const.properties
View file @
0646fdae
...
@@ -2,7 +2,7 @@ CASHIER_URL=http://cw.bailuntec.com/API/API/GetCashiers
...
@@ -2,7 +2,7 @@ CASHIER_URL=http://cw.bailuntec.com/API/API/GetCashiers
WITHDRAW_DETAIL
=
http://cw.bailuntec.com/API/API/GetWithdrawDetailPages
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
INTEREST_URL
=
http://cw.bailuntec.com/api/api/GetRepayPlanDetails
...
...
data-base/base-sync-oms-order/src/main/java/com/bailuntec/job/OrderSyncJob.java
View file @
0646fdae
...
@@ -1068,8 +1068,17 @@ public class OrderSyncJob extends PointJob {
...
@@ -1068,8 +1068,17 @@ public class OrderSyncJob extends PointJob {
wmsFeeDetailDtos
.
setCurrencyCode
(
"CNY"
);
wmsFeeDetailDtos
.
setCurrencyCode
(
"CNY"
);
}
}
wmsToCnyExchangeRate
=
CallBailunSystem
.
getExchangeRate
(
wmsFeeDetailDtos
.
getCurrencyCode
(),
Constant
.
RMB_CURRENCY
,
exchangeDate
);
wmsToCnyExchangeRate
=
CallBailunSystem
.
getExchangeRate
(
wmsFeeDetailDtos
.
getCurrencyCode
(),
Constant
.
RMB_CURRENCY
,
exchangeDate
);
if
(
wmsToCnyExchangeRate
==
null
)
{
wmsToCnyExchangeRate
=
BigDecimal
.
ZERO
;
}
wmsToUsdExchangeRate
=
CallBailunSystem
.
getExchangeRate
(
wmsFeeDetailDtos
.
getCurrencyCode
(),
Constant
.
USD_CURRENCY
,
exchangeDate
);
wmsToUsdExchangeRate
=
CallBailunSystem
.
getExchangeRate
(
wmsFeeDetailDtos
.
getCurrencyCode
(),
Constant
.
USD_CURRENCY
,
exchangeDate
);
if
(
wmsToUsdExchangeRate
==
null
)
{
wmsToUsdExchangeRate
=
BigDecimal
.
ZERO
;
}
wmsToRMBExchangeRate
=
CallBailunSystem
.
getExchangeRate
(
wmsFeeDetailDtos
.
getCurrencyCode
(),
Constant
.
RMB_CURRENCY
,
exchangeDate
);
wmsToRMBExchangeRate
=
CallBailunSystem
.
getExchangeRate
(
wmsFeeDetailDtos
.
getCurrencyCode
(),
Constant
.
RMB_CURRENCY
,
exchangeDate
);
if
(
wmsToRMBExchangeRate
==
null
)
{
wmsToRMBExchangeRate
=
BigDecimal
.
ZERO
;
}
dcBaseOmsPick
.
setTotalFee
(
totalFee
);
dcBaseOmsPick
.
setTotalFee
(
totalFee
);
dcBaseOmsPick
.
setShipping
(
shipping
);
dcBaseOmsPick
.
setShipping
(
shipping
);
dcBaseOmsPick
.
setOpf
(
opf
);
dcBaseOmsPick
.
setOpf
(
opf
);
...
...
data-base/base-sync-sku/src/main/resources/const.properties
View file @
0646fdae
# \u751F\u4EA7\u73AF\u5883
# \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_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
SKU_MAPPING_URL
=
http://172.31.255.108:6039/skumapping/getpageskumappings
BAILUN_CATEGORY_URL
=
http://10.0.8.13:8000/api/category/categorybailun/gmtbailuncategoriesbylevel
BAILUN_CATEGORY_URL
=
http://10.0.8.13:8000/api/category/categorybailun/gmtbailuncategoriesbylevel
...
...
data-common/src/main/java/com/bailuntec/domain/constant/CommonConstant.java
View file @
0646fdae
...
@@ -13,7 +13,7 @@ public interface CommonConstant {
...
@@ -13,7 +13,7 @@ public interface CommonConstant {
String
SKU_APPID
=
"SystemNDC"
;
String
SKU_APPID
=
"SystemNDC"
;
String
SKU_APPKEY
=
"YmFpbHVuTkRD"
;
String
SKU_APPKEY
=
"YmFpbHVuTkRD"
;
Pattern
NUMBER_AND_DECIMAL
=
Pattern
.
compile
(
"-?[0-9]+(\\.[0-9]+)?"
);
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
FIRST_FEE_URL
=
"http://lms.bailuntec.com/api/Logistics/ApiLogistics/GetFilterLogistics"
;
String
ACCOUNT_NO_TOKEN_URL
=
"http://pams.bailuntec.com/Api/GetAccounts?Id="
;
String
ACCOUNT_NO_TOKEN_URL
=
"http://pams.bailuntec.com/Api/GetAccounts?Id="
;
// String SKUMAPPING_URL = "http://api.sku.bailuntec.com/api/ApiCenter/SetData";
// String SKUMAPPING_URL = "http://api.sku.bailuntec.com/api/ApiCenter/SetData";
...
...
data-mid/mid-ebay-uk-report/src/main/resources/application.yml
View file @
0646fdae
...
@@ -55,7 +55,7 @@ url:
...
@@ -55,7 +55,7 @@ url:
# 获取公司主体借款余额
# 获取公司主体借款余额
getBorrowBalance
:
${url.cwSystem}/api/api/GetBorrows
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
# getExchangeRate: http://www.bailuntec.com/api/ExchangeRate/GetExchangeRate
# 获取销售平台和站点信息
# 获取销售平台和站点信息
getPlatformAndSite
:
http://pams.bailuntec.com/Api/GetPlatformSites
getPlatformAndSite
:
http://pams.bailuntec.com/Api/GetPlatformSites
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment