Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Z
zhichan
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
蒋勇
zhichan
Commits
d9b75e60
Commit
d9b75e60
authored
May 14, 2021
by
庄冰
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
jdtm2qft
parent
17d8777b
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
61 additions
and
2 deletions
+61
-2
center-channel/app/base/api/impl/opaction/order.js
+3
-0
center-channel/app/base/service/impl/utilsSve/utilsOrderSve.js
+57
-1
center-channel/app/config/businessConfig.js
+1
-1
No files found.
center-channel/app/base/api/impl/opaction/order.js
View file @
d9b75e60
...
@@ -102,6 +102,9 @@ class ProductAPI extends WEBBase {
...
@@ -102,6 +102,9 @@ class ProductAPI extends WEBBase {
case
"receiveAliTmOrder"
:
//接收阿里商标订单
case
"receiveAliTmOrder"
:
//接收阿里商标订单
opResult
=
await
this
.
utilsOrderSve
.
receiveAliTmOrder
(
pobj
,
pobj
.
actionBody
);
opResult
=
await
this
.
utilsOrderSve
.
receiveAliTmOrder
(
pobj
,
pobj
.
actionBody
);
break
;
break
;
case
"receiveFqbossTmOrder"
:
//接收阿里商标订单
opResult
=
await
this
.
utilsOrderSve
.
receiveFqbossTmOrder
(
pobj
,
pobj
.
actionBody
);
break
;
case
"receiveAliTmStatus"
:
//接收阿里商标状态
case
"receiveAliTmStatus"
:
//接收阿里商标状态
opResult
=
await
this
.
utilsOrderSve
.
receiveAliTmStatus
(
pobj
,
pobj
.
actionBody
);
opResult
=
await
this
.
utilsOrderSve
.
receiveAliTmStatus
(
pobj
,
pobj
.
actionBody
);
break
;
break
;
...
...
center-channel/app/base/service/impl/utilsSve/utilsOrderSve.js
View file @
d9b75e60
...
@@ -1729,6 +1729,16 @@ class UtilsOrderService extends AppServiceBase {
...
@@ -1729,6 +1729,16 @@ class UtilsOrderService extends AppServiceBase {
* @param {*} actionBody
* @param {*} actionBody
*/
*/
async
receiveAliTmOrder
(
pobj
,
actionBody
)
{
async
receiveAliTmOrder
(
pobj
,
actionBody
)
{
var
res
=
await
this
.
receiveFqbossTmOrder
(
pobj
,
actionBody
);
return
res
;
}
/**
* 接收蜂擎boss商标订单
* @param {*} pobj
* @param {*} actionBody
*/
async
receiveFqbossTmOrder
(
pobj
,
actionBody
)
{
if
(
!
actionBody
.
channelItemCode
)
{
if
(
!
actionBody
.
channelItemCode
)
{
return
system
.
getResult
(
null
,
"产品编码有误,100010"
);
return
system
.
getResult
(
null
,
"产品编码有误,100010"
);
}
}
...
@@ -1743,12 +1753,58 @@ class UtilsOrderService extends AppServiceBase {
...
@@ -1743,12 +1753,58 @@ class UtilsOrderService extends AppServiceBase {
}
}
pobj
.
productInfo
=
productItemResult
.
data
.
data
;
pobj
.
productInfo
=
productItemResult
.
data
.
data
;
pobj
.
productInfo
.
price_item
=
pobj
.
productInfo
.
price_list
[
0
];
pobj
.
productInfo
.
price_item
=
pobj
.
productInfo
.
price_list
[
0
];
pobj
.
actionType
=
"receive
Ali
TmOrder"
;
pobj
.
actionType
=
"receive
Fqboss
TmOrder"
;
var
reqUrl
=
this
.
centerOrderUrl
+
"action/order/springBoard"
;
var
reqUrl
=
this
.
centerOrderUrl
+
"action/order/springBoard"
;
var
result
=
await
this
.
restPostUrl
(
pobj
,
reqUrl
);
var
result
=
await
this
.
restPostUrl
(
pobj
,
reqUrl
);
if
(
result
&&
result
.
status
==
0
){
if
(
pobj
.
appInfo
&&
pobj
.
appInfo
.
uapp_id
==
31
&&
!
pobj
.
actionBody
.
serviceOrderNo
){
//京东云自助商标注册
await
this
.
pushChannelOrder2fq
(
pobj
);
}
}
return
result
;
return
result
;
}
}
async
pushChannelOrder2fq
(
pobj
)
{
try
{
var
yfobj
=
{
actionBody
:
{
idempotentSource
:
pobj
.
productInfo
.
service_business_code
||
''
,
//渠道来源 N
quantity
:
1
,
//数量 N
needId
:
pobj
.
actionBody
.
needNo
||
''
,
//需求id N
contactsName
:
pobj
.
actionBody
.
contactsName
||
''
,
//联系人名称 N
companyName
:
pobj
.
actionBody
.
applyName
||
''
,
//公司名称 N
scope
:
"商标自助订单进行备案,不用做任何处理"
,
// N
orderNo
:
pobj
.
actionBody
.
channelOrderNo
,
orderPrice
:
300
,
//写死 自助300
phone
:
pobj
.
actionBody
.
contactsMobile
,
appName
:
pobj
.
appInfo
.
app_name
||
''
,
sku
:
'125855508212158464'
//写死 自助一个
},
appInfo
:
pobj
.
appInfo
};
//yfPushRes.data.data
// {"contractNo":null,"orderNos":["20010618850"],"orderList":[{"operator_name":"系统用户","operatorName":"系统用户","operator":"124496450905186304","order_id":"20010618850","order_no":"20010618850","orderNo":"20010618850","message":"success","contractNo":null}]}
var
yfPushRes
=
await
this
.
utilsPushSve
.
business2Channel
(
yfobj
,
"pushOrderICPBusinessNew"
);
//日志记录
this
.
logCtl
.
info
({
optitle
:
(
new
Date
()).
Format
(
"yyyy-MM-dd hh:mm:ss"
)
+
"企服通渠道订单推送至蜂擎:,method=pushChannelOrder2fq"
,
op
:
"service/impl/utilsSve/utilsOrderSve.js/pushChannelOrder2fq"
,
content
:
"参数:"
+
JSON
.
stringify
(
pobj
)
+
";返回结果:"
+
JSON
.
stringify
(
yfPushRes
),
clientIp
:
""
});
}
catch
(
e
)
{
//日志记录
this
.
logCtl
.
error
({
optitle
:
(
new
Date
()).
Format
(
"yyyy-MM-dd hh:mm:ss"
)
+
"企服通渠道订单推送至蜂擎异常:,method=pushChannelOrder2fq"
,
op
:
"service/impl/utilsSve/utilsOrderSve.js/pushChannelOrder2fq---error"
,
content
:
"参数:"
+
JSON
.
stringify
(
pobj
)
+
";异常信息:"
+
JSON
.
stringify
(
e
.
stack
),
clientIp
:
""
});
console
.
log
(
"service/impl/utilsSve/utilsOrderSve.js/pushChannelOrder2fq推送异常"
,
e
.
stack
);
}
}
/**
/**
* 接收阿里订单退款信息git
* 接收阿里订单退款信息git
* @param {*} pobj
* @param {*} pobj
...
...
center-channel/app/config/businessConfig.js
View file @
d9b75e60
...
@@ -18,7 +18,7 @@ module.exports = {
...
@@ -18,7 +18,7 @@ module.exports = {
"rtSubmitMaterial"
,
"rtNotification"
,
"rtSubmitSolution"
,
"rtCloseNeed"
,
"rtClosePlan"
,
"rtSubmitMaterial"
,
"rtNotification"
,
"rtSubmitSolution"
,
"rtCloseNeed"
,
"rtClosePlan"
,
"getParamsFor360"
,
"addOrderWeb"
,
"getPayRecords"
,
"getLoginInfo"
,
"putUserMobileByVcode"
,
"getParamsFor360"
,
"addOrderWeb"
,
"getPayRecords"
,
"getLoginInfo"
,
"putUserMobileByVcode"
,
"putUserPwdByMobile"
,
"icpNotifyNew"
,
"getOrderStatisticsByUappId"
,
"getOrderStatisticsByProduct"
,
"getOrdersComparison"
,
"getOrdersComparisonList"
,
"putUserPwdByMobile"
,
"icpNotifyNew"
,
"getOrderStatisticsByUappId"
,
"getOrderStatisticsByProduct"
,
"getOrdersComparison"
,
"getOrdersComparisonList"
,
"importOrders"
,
"importNeeds"
,
"receiveAliTmOrder"
,
"receiveAliTmOrderRefund"
,
"receiveAliTmStatus"
,
"importOrders"
,
"importNeeds"
,
"receiveAliTmOrder"
,
"receiveFqbossTmOrder"
,
"receiveAliTmOrderRefund"
,
"receiveAliTmStatus"
,
//百度工商注册
//百度工商注册
"regGetInfoByChannelNeedNo"
,
"submitRegNeed"
,
"regFeedbackSubmit"
,
"regOrderStatus"
,
"regOrderClose"
,
"regGetInfoByChannelNeedNo"
,
"submitRegNeed"
,
"regFeedbackSubmit"
,
"regOrderStatus"
,
"regOrderClose"
,
"getSolutionByChannelOrderNo"
,
"regSubmitSolution"
,
"regNeedClose"
,
"getSolutionByChannelOrderNo"
,
"regSubmitSolution"
,
"regNeedClose"
,
...
...
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