Commit 21db9b17 authored by 高诸锋's avatar 高诸锋

fix

parent e63c7c72
Pipeline #5856 passed with stage
in 2 seconds
...@@ -145,6 +145,10 @@ class OrderController extends Controller { ...@@ -145,6 +145,10 @@ class OrderController extends Controller {
async orderShow() { async orderShow() {
const { ctx, service } = this; const { ctx, service } = this;
const { appKey, orderId } = ctx.params; const { appKey, orderId } = ctx.params;
const appKeyInfo = await service.partner.fetchInfo(appKey);
if (!(appKeyInfo && appKeyInfo.valid === true && appKeyInfo.enableHfView === true)) {
return ctx.fail('未开通此服务');
}
const data = await service.order.getOneByOrderId(orderId); const data = await service.order.getOneByOrderId(orderId);
if (data) { if (data) {
if (data.status === 'success' && (data.appKey === appKey)) { if (data.status === 'success' && (data.appKey === appKey)) {
......
...@@ -22,11 +22,15 @@ class PartnerService extends Service { ...@@ -22,11 +22,15 @@ class PartnerService extends Service {
} }
} }
} }
const ret = await ctx.curl(`${host + fetchTheme}/${appKey}`, { const ret = await ctx.curl(`${host + fetchTheme}`, {
charset: 'utf-8', charset: 'utf-8',
timeout: ['30s', '30s'], timeout: ['30s', '30s'],
dataType: 'json', dataType: 'json',
method: 'GET', method: 'GET',
data: {
appKey,
subject: 'ss',
},
}); });
ctx.logger.info(`【Partner】 fetchTheme ${host + fetchTheme}/${appKey}`, ret.data); ctx.logger.info(`【Partner】 fetchTheme ${host + fetchTheme}/${appKey}`, ret.data);
if (ret.status === 200 && ret.data && ret.data.id === appKey) { if (ret.status === 200 && ret.data && ret.data.id === appKey) {
......
...@@ -43,6 +43,13 @@ class WashDataService extends Service { ...@@ -43,6 +43,13 @@ class WashDataService extends Service {
bar.appKey = ''; bar.appKey = '';
return bar; return bar;
} }
dealData(data, passID = false) {
delete data.data.shebaoData.data['基本信息']['身份证'];
delete data.data.shebaoData.data['基本信息']['银行卡号'];
delete data.data.shebaoData.data['基本信息']['电话号码'];
return data;
}
} }
module.exports = WashDataService; module.exports = WashDataService;
...@@ -15,7 +15,7 @@ module.exports = () => { ...@@ -15,7 +15,7 @@ module.exports = () => {
config.partnerAPI = { config.partnerAPI = {
host: 'https://dev-nginx.jianbing.com/zeus-api/v1', host: 'https://dev-nginx.jianbing.com/zeus-api/v1',
fetchTheme: '/chaos/partners/theme', fetchTheme: '/chaos/theme',
fetchScripts: '/chaos/partners/scripts', fetchScripts: '/chaos/partners/scripts',
redisThemePrefix: 'DATA_SERVER_SHEBAO.THEME', redisThemePrefix: 'DATA_SERVER_SHEBAO.THEME',
redisScriptsPrefix: 'DATA_SERVER_SHEBAO.SCRIPTS', redisScriptsPrefix: 'DATA_SERVER_SHEBAO.SCRIPTS',
...@@ -27,14 +27,14 @@ module.exports = () => { ...@@ -27,14 +27,14 @@ module.exports = () => {
config.scriptsAPI = { config.scriptsAPI = {
host: 'https://dev-nginx.jianbing.com/zeus-api/v1', host: 'https://dev-nginx.jianbing.com/zeus-api/v1',
fetchScriptsUrl: '/chaos/hf/two_dimension_array/queries', fetchScriptsUrl: '/chaos/ss/two_dimension_array/queries',
fetchOneScriptUrl: '/chaos/hf/two_dimension_array/info', fetchOneScriptUrl: '/chaos/ss/two_dimension_array/info',
fetchParamsInfoUrl: '/chaos/hf/login_param_map', fetchParamsInfoUrl: '/chaos/ss/login_param_map',
fetchQueryButtonUrl: '/chaos/hf/query_button', fetchQueryButtonUrl: '/chaos/ss/query_button',
fetchHelpUrl: '/chaos/hf/help', fetchHelpUrl: '/chaos/ss/help',
fetchNoticeUrl: '/chaos/hf/notice', fetchNoticeUrl: '/chaos/ss/notice',
fetchHubSeriptsUrl: '/chaos/hf/hubs', fetchHubSeriptsUrl: '/chaos/ss/hubs',
fetchScriptByCityNameUrl: '/chaos/hf/city_scripts', fetchScriptByCityNameUrl: '/chaos/ss/city_scripts',
redisScriptsKey: 'DATA_SERVER_SHEBAO.SCRIPTS', redisScriptsKey: 'DATA_SERVER_SHEBAO.SCRIPTS',
redisParamsKey: 'DATA_SERVER_SHEBAO.PARAMS', redisParamsKey: 'DATA_SERVER_SHEBAO.PARAMS',
redisScriptListKey: 'DATA_SERVER_SHEBAO.SCRIPTLIST', redisScriptListKey: 'DATA_SERVER_SHEBAO.SCRIPTLIST',
...@@ -64,9 +64,9 @@ module.exports = () => { ...@@ -64,9 +64,9 @@ module.exports = () => {
}; };
config.lockKeys = { config.lockKeys = {
fecthHub: 'NEWSB.HF.HUBS.LOCK', fecthHub: 'NEWSB.SS.HUBS.LOCK',
fecteToken: 'NEWSB.HF.TOKEN.LOCK', fecteToken: 'NEWSB.SS.TOKEN.LOCK',
token: 'NEWSB.HF.TOKEN', token: 'NEWSB.SS.TOKEN',
fecthParnters: 'NEWSB.PARNTERS.LOCK', fecthParnters: 'NEWSB.PARNTERS.LOCK',
taskPrefix: 'NEWSB.TASK', taskPrefix: 'NEWSB.TASK',
}; };
......
...@@ -16,7 +16,7 @@ module.exports = () => { ...@@ -16,7 +16,7 @@ module.exports = () => {
config.partnerAPI = { config.partnerAPI = {
host: process.env.PARTNERAPI_HOST, host: process.env.PARTNERAPI_HOST,
fetchTheme: '/chaos/partners/theme', fetchTheme: '/chaos/theme',
fetchScripts: '/chaos/partners/scripts', fetchScripts: '/chaos/partners/scripts',
redisThemePrefix: 'DATA_SERVER_SHEBAO.PARNTERS.THEME', redisThemePrefix: 'DATA_SERVER_SHEBAO.PARNTERS.THEME',
redisScriptsPrefix: 'DATA_SERVER_SHEBAO.PARNTERS.SCRIPTS', redisScriptsPrefix: 'DATA_SERVER_SHEBAO.PARNTERS.SCRIPTS',
...@@ -24,16 +24,16 @@ module.exports = () => { ...@@ -24,16 +24,16 @@ module.exports = () => {
config.scriptsAPI = { config.scriptsAPI = {
host: process.env.SCRIPTSAPI_HOST, host: process.env.SCRIPTSAPI_HOST,
fetchScriptsUrl: '/chaos/hf/two_dimension_array/queries', fetchScriptsUrl: '/chaos/ss/two_dimension_array/queries',
fetchOneScriptUrl: '/chaos/hf/two_dimension_array/info', fetchOneScriptUrl: '/chaos/ss/two_dimension_array/info',
fetchParamsInfoUrl: '/chaos/hf/login_param_map', fetchParamsInfoUrl: '/chaos/ss/login_param_map',
fetchQueryButtonUrl: '/chaos/hf/query_button', fetchQueryButtonUrl: '/chaos/ss/query_button',
fetchHelpUrl: '/chaos/hf/help', fetchHelpUrl: '/chaos/ss/help',
fetchNoticeUrl: '/chaos/hf/notice', fetchNoticeUrl: '/chaos/ss/notice',
fetchHubSeriptsUrl: '/chaos/hf/hubs', fetchHubSeriptsUrl: '/chaos/ss/hubs',
centersInfoUrl: 'https://t.51gjj.com/shebao/centersInfo', centersInfoUrl: 'https://t.51gjj.com/shebao/centersInfo',
cityInfoUrl: 'https://t.51gjj.com/shebao/cityConfig', cityInfoUrl: 'https://t.51gjj.com/shebao/cityConfig',
fetchScriptByCityNameUrl: '/chaos/hf/city_scripts', fetchScriptByCityNameUrl: '/chaos/ss/city_scripts',
redisScriptsKey: 'DATA_SERVER_SHEBAO.SCRIPTS', redisScriptsKey: 'DATA_SERVER_SHEBAO.SCRIPTS',
redisParamsKey: 'DATA_SERVER_SHEBAO.PARAMS', redisParamsKey: 'DATA_SERVER_SHEBAO.PARAMS',
}; };
...@@ -62,9 +62,9 @@ module.exports = () => { ...@@ -62,9 +62,9 @@ module.exports = () => {
}; };
config.redisKeys = { config.redisKeys = {
fecthHub: 'NEWSB.HF.HUBS.LOCK', fecthHub: 'NEWSB.SS.HUBS.LOCK',
fecteToken: 'NEWSB.HF.TOKEN.LOCK', fecteToken: 'NEWSB.SS.TOKEN.LOCK',
token: 'NEWSB.HF.TOKEN', token: 'NEWSB.SS.TOKEN',
fecthParnters: 'NEWSB.PARNTERS.LOCK', fecthParnters: 'NEWSB.PARNTERS.LOCK',
}; };
......
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