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
f3b6b102
Commit
f3b6b102
authored
Jan 09, 2020
by
王昆
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gsb
parent
4aae589d
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
648 additions
and
1034 deletions
+648
-1034
xgg-admin/app/base/controller/impl/order/orderCtl.js
+11
-320
xgg-admin/app/base/controller/impl/uc/userCtl.js
+11
-0
xgg-admin/app/base/service/impl/order/orderSve.js
+34
-277
xgg-admin/app/base/service/impl/uc/userSve.js
+18
-0
xgg-admin/app/config/routes/web.js
+4
-4
xgg-admin/app/front/entry/public/apidoc/order/order.md
+66
-433
xgg-admin/app/front/entry/public/apidoc/order/order_bak2.md
+504
-0
No files found.
xgg-admin/app/base/controller/impl/order/orderCtl.js
View file @
f3b6b102
...
@@ -3,7 +3,6 @@ const http = require("http")
...
@@ -3,7 +3,6 @@ const http = require("http")
const
querystring
=
require
(
'querystring'
);
const
querystring
=
require
(
'querystring'
);
var
settings
=
require
(
"../../../../config/settings"
);
var
settings
=
require
(
"../../../../config/settings"
);
const
CtlBase
=
require
(
"../../ctlms.base"
);
const
CtlBase
=
require
(
"../../ctlms.base"
);
const
logCtl
=
system
.
getObject
(
"web.common.oplogCtl"
);
var
cacheBaseComp
=
null
;
var
cacheBaseComp
=
null
;
class
OrderCtl
extends
CtlBase
{
class
OrderCtl
extends
CtlBase
{
...
@@ -12,345 +11,38 @@ class OrderCtl extends CtlBase {
...
@@ -12,345 +11,38 @@ class OrderCtl extends CtlBase {
this
.
orderSve
=
system
.
getObject
(
"service.order.orderSve"
);
this
.
orderSve
=
system
.
getObject
(
"service.order.orderSve"
);
}
}
async
allPage
(
pobj
,
pobj2
,
req
)
{
async
processList
(
pobj
,
pobj2
,
req
)
{
var
condition
=
{
currentPage
:
pobj
.
currentPage
||
1
,
pageSize
:
pobj
.
pageSize
||
10
,
merchantId
:
pobj
.
merchantId
,
orderId
:
this
.
trim
(
pobj
.
orderNo
),
channelOrderNo
:
this
.
trim
(
pobj
.
channelOrderNo
),
status
:
pobj
.
status
,
assignBegin
:
this
.
trim
(
pobj
.
assignBegin
),
assignEnd
:
this
.
trim
(
pobj
.
assignEnd
),
}
this
.
doTimeCondition
(
condition
,
[
"createdBegin"
,
"createdEnd"
]);
this
.
doTimeCondition
(
condition
,
[
"assignBegin"
,
"assignEnd"
]);
try
{
return
await
this
.
orderSve
.
allOrderList
(
condition
);
}
catch
(
e
)
{
console
.
log
(
e
);
return
system
.
getResultFail
(
500
,
"接口错误"
);
}
}
async
close
(
pobj
,
pobj2
,
req
)
{
try
{
return
await
this
.
orderSve
.
closeById
({
id
:
pobj
.
id
});
}
catch
(
e
)
{
console
.
log
(
e
);
return
system
.
getResultFail
(
500
,
"接口错误"
);
}
}
async
assign
(
pobj
,
pobj2
,
req
)
{
try
{
var
params
=
{
assignUcname
:
req
.
loginUser
.
ucname
,
id
:
pobj
.
id
,
deliver_id
:
this
.
trim
(
pobj
.
deliverId
),
deliverName
:
this
.
trim
(
pobj
.
deliverName
),
deliverDivide
:
system
.
y2f
(
Number
(
pobj
.
deliverDivide
)),
}
return
await
this
.
orderSve
.
assign
(
params
);
}
catch
(
e
)
{
console
.
log
(
e
);
return
system
.
getResultFail
(
500
,
"接口错误"
);
}
}
async
orderEdit
(
pobj
,
pobj2
,
req
)
{
try
{
var
params
=
{
id
:
pobj
.
id
,
merchantId
:
this
.
trim
(
pobj
.
merchantId
),
price
:
system
.
y2f
(
Number
(
pobj
.
price
)),
}
return
await
this
.
orderSve
.
orderEdit
(
params
);
}
catch
(
e
)
{
console
.
log
(
e
);
return
system
.
getResultFail
(
500
,
"接口错误"
);
}
}
async
allInfo
(
pobj
,
pobj2
,
req
)
{
try
{
var
params
=
{
id
:
pobj
.
id
}
return
await
this
.
orderSve
.
orderInfoAll
(
params
,
true
);
}
catch
(
e
)
{
console
.
log
(
e
);
return
system
.
getResultFail
(
500
,
"接口错误"
);
}
}
async
deliverInfo
(
pobj
,
pobj2
,
req
)
{
try
{
var
params
=
{
id
:
pobj
.
id
}
return
await
this
.
orderSve
.
orderInfoAll
(
params
);
}
catch
(
e
)
{
console
.
log
(
e
);
return
system
.
getResultFail
(
500
,
"接口错误"
);
}
}
async
deliverEdit
(
pobj
,
pobj2
,
req
)
{
try
{
try
{
return
await
this
.
orderSve
.
deliverEdit
(
pobj
);
return
this
.
orderSve
.
allProcess
(
pobj
);
}
catch
(
e
)
{
}
catch
(
e
)
{
console
.
log
(
e
);
console
.
log
(
e
);
return
system
.
getResultFail
(
500
,
"接口错误"
);
return
system
.
getResultFail
(
500
,
"接口错误"
);
}
}
}
}
async
deliverClose
(
pobj
,
pobj2
,
req
)
{
// ************************************
try
{
return
await
this
.
orderSve
.
deliverClose
(
pobj
);
}
catch
(
e
)
{
console
.
log
(
e
);
return
system
.
getResultFail
(
500
,
"接口错误"
);
}
}
async
handlePage
(
pobj
,
pobj2
,
req
)
{
async
platformOrders
(
pobj
,
pobj2
,
req
)
{
try
{
var
condition
=
{
var
condition
=
{
id
:
pobj
.
id
,
currentPage
:
pobj
.
currentPage
||
1
,
currentPage
:
pobj
.
currentPage
||
1
,
pageSize
:
pobj
.
pageSize
||
1
,
pageSize
:
pobj
.
pageSize
||
10
,
orderId
:
this
.
trim
(
pobj
.
orderId
)
||
this
.
trim
(
pobj
.
orderNo
),
id
:
this
.
trim
(
pobj
.
id
),
status
:
this
.
trim
(
pobj
.
status
),
deliverId
:
""
,
// TODO 传入具体办理人
}
this
.
doTimeCondition
(
condition
,
[
"createdBegin"
,
"createdEnd"
]);
return
await
this
.
orderSve
.
handlePage
(
condition
);
}
catch
(
e
)
{
console
.
log
(
e
);
return
system
.
getResultFail
(
500
,
"接口错误"
);
}
}
async
deliverHandle
(
pobj
,
pobj2
,
req
)
{
try
{
var
handleObj
=
{
id
:
pobj
.
id
,
status
:
pobj
.
status
,
status
:
pobj
.
status
,
createdBegin
:
this
.
trim
(
pobj
.
createdBegin
),
name
:
this
.
trim
(
pobj
.
name
),
createdEnd
:
this
.
trim
(
pobj
.
createdEnd
),
creditCode
:
this
.
trim
(
pobj
.
creditCode
),
businessPlace
:
this
.
trim
(
pobj
.
businessPlace
),
businessScope
:
this
.
trim
(
pobj
.
businessScope
),
regDate
:
this
.
trim
(
pobj
.
regDate
),
businessImg
:
this
.
trim
(
pobj
.
businessImg
),
gongzhang
:
this
.
trim
(
pobj
.
gongzhang
),
caiwuzhang
:
this
.
trim
(
pobj
.
caiwuzhang
),
fapiaozhang
:
this
.
trim
(
pobj
.
fapiaozhang
),
hetongzhang
:
this
.
trim
(
pobj
.
hetongzhang
),
farenzhang
:
this
.
trim
(
pobj
.
farenzhang
),
isBank
:
this
.
trim
(
pobj
.
isBank
),
bankName
:
this
.
trim
(
pobj
.
bankName
),
bankNo
:
this
.
trim
(
pobj
.
bankNo
),
bank
:
this
.
trim
(
pobj
.
bank
),
bankImg
:
this
.
trim
(
pobj
.
bankImg
),
caImg
:
this
.
trim
(
pobj
.
caImg
),
taxRegDay
:
this
.
trim
(
pobj
.
taxRegDay
),
taxOrg
:
this
.
trim
(
pobj
.
taxOrg
),
courierNo
:
this
.
trim
(
pobj
.
courierNo
),
courierImg
:
this
.
trim
(
pobj
.
courierImg
),
}
return
await
this
.
orderSve
.
deliverHandle
(
handleObj
);
}
catch
(
e
)
{
console
.
log
(
e
);
return
system
.
getResultFail
(
500
,
"接口错误"
);
}
}
}
async
deliverAudit
(
pobj
,
pobj2
,
req
)
{
this
.
doTimeCondition
(
condition
,
[
"createdBegin"
,
"createdEnd"
]);
try
{
try
{
var
auditObj
=
{};
return
await
this
.
orderSve
.
orders
(
condition
);
auditObj
.
id
=
pobj
.
id
;
auditObj
.
auditUser
=
req
.
loginUser
.
ucname
;
auditObj
.
status
=
pobj
.
status
;
auditObj
.
auditRemark
=
this
.
trim
(
pobj
.
auditRemark
);
auditObj
.
content
=
this
.
trim
(
pobj
.
content
);
auditObj
.
addressee
=
this
.
trim
(
pobj
.
addressee
);
auditObj
.
mobile
=
this
.
trim
(
pobj
.
mobile
);
auditObj
.
addr
=
this
.
trim
(
pobj
.
addr
);
auditObj
.
auditResult
=
this
.
trim
(
pobj
.
auditResult
);
return
await
this
.
orderSve
.
deliverAudit
(
auditObj
);
}
catch
(
e
)
{
}
catch
(
e
)
{
console
.
log
(
e
);
console
.
log
(
e
);
return
system
.
getResultFail
(
500
,
"接口错误"
);
return
system
.
getResultFail
(
500
,
"接口错误"
);
}
}
}
}
async
doProcess
(
pobj
,
pobj2
,
req
)
{
async
orderComplete
(
pobj
,
pobj2
,
req
)
{
try
{
var
handleObj
=
{
id
:
pobj
.
id
,
deliverType
:
this
.
trim
(
pobj
.
deliverType
),
deliverNo
:
this
.
trim
(
pobj
.
deliverNo
),
deliverImg
:
this
.
trim
(
pobj
.
deliverImg
),
}
}
return
await
this
.
orderSve
.
orderComplete
(
handleObj
);
}
catch
(
e
)
{
console
.
log
(
e
);
return
system
.
getResultFail
(
500
,
"接口错误"
);
}
}
/**
* 创建订单
* @param {*} pobj
* @param {*} pobj2
* @param {*} req
*/
async
createOrder
(
pobj
,
pobj2
,
req
){
try
{
return
await
this
.
orderSve
.
createOrder
(
pobj
);
}
catch
(
error
)
{
return
system
.
getResult
(
null
,
`系统错误 错误信息
${
error
}
`
);
}
}
/**
* 完善信息接口
* @param {*} pobj
* @param {*} pobj2
* @param {*} req
*/
async
completedOrder
(
pobj
,
pobj2
,
req
){
try
{
return
await
this
.
orderSve
.
completedOrder
(
pobj
);
}
catch
(
error
)
{
return
system
.
getResult
(
null
,
`系统错误 错误信息
${
error
}
`
);
}
}
/**
* 订单列表
* @param {*} pobj
* @param {*} pobj2
* @param {*} req
*/
async
orders
(
pobj
,
pobj2
,
req
){
try
{
return
await
this
.
orderSve
.
orders
(
pobj
);
}
catch
(
error
)
{
return
system
.
getResult
(
null
,
`系统错误 错误信息
${
error
}
`
);
}
}
// async orderList(pobj, pobj2, req) {
// try {
// // 订单状态 00待处理 10出执照 20已刻章 30银行开户 40税务报道 50已邮寄
// var condition = {
// currentPage: pobj.currentPage,
// pageSize: pobj.pageSize,
// merchantId: pobj.merchantId,
// orderNo: this.trim(pobj.orderNo),
// channelOrderNo: this.trim(pobj.channelOrderNo),
// status: pobj.status,
// createdBegin: this.trim(pobj.createdBegin),
// createdEnd: this.trim(pobj.createdEnd),
// }
// this.doTimeCondition(condition, ["createdBegin", "createdEnd"]);
// var page = await this.service.pageByCondition(condition);
// console.log(page);
// return system.getResultSuccess(page);
// } catch (error) {
// console.log(error);
// return system.getResultFail(500, "接口异常:" + error.message);
// }
// }
// async createStep(pobj, pobj2, req) {
// var id = Number(pobj.orderId);
// var status = pobj.status;
// try {
// switch (status) {
// case "05": //"执照办理中"
// case "15": //"刻章办理中"
// case "25": //"银行开户中"
// case "35": //"税务报到中"
// return await this.service.changeStatus(id, status);
// case "10": { //"已出执照"
// var params = {
// orderId: pobj.orderId,
// name: this.trim(pobj.name), // 个体工商户名称
// creditCode: this.trim(pobj.creditCode), // 统一社会信用代码
// businessPlace: this.trim(pobj.businessPlace), // 经营场所
// businessScope: this.trim(pobj.businessScope), // 经营范围
// regDate: this.trim(pobj.regDate), // 注册日期
// businessImg: this.trim(pobj.businessImg), // 执照照片
// };
// return await this.service.createLicense(pobj);
// }
// case "20": { //"已刻章"
// var params = {
// orderId: pobj.orderId,
// gongzhang: this.trim(pobj.gongzhang),
// caiwuzhang: this.trim(pobj.caiwuzhang),
// businessImg: this.trim(pobj.businessImg),
// fapiaozhang: this.trim(pobj.fapiaozhang),
// hetongzhang: this.trim(pobj.hetongzhang),
// farenzhang: this.trim(pobj.farenzhang),
// };
// return await this.businessmenSve.putSealInfo(params);
// }
// case "30": { //"银行已开户"
// var params = {
// orderId: pobj.orderId,
// isBank: Number(pobj.isBank) == 1,
// bankName: this.trim(pobj.bankName),
// bankNo: this.trim(pobj.bankNo),
// bank: this.trim(pobj.bank),
// bankImg: this.trim(pobj.bankImg),
// }
// return await this.businessmenSve.putBankInfo(params);
// }
// case "40": { //"已税务报到"
// var params = {
// orderId: pobj.orderId,
// caImg: this.trim(pobj.caImg),
// taxRegDay: this.trim(pobj.taxRegDay),
// taxOrg: this.trim(pobj.taxOrg),
// }
// return await this.businessmenSve.putTaxInfo(params);
// }
// case "50": { //"已邮寄"
// var params = {
// orderId: pobj.orderId,
// courierNo: this.trim(pobj.courierNo),
// courierImg: this.trim(pobj.courierImg),
// }
// return await this.businessmenSve.putExpressInfo(params);
// }
// default : {
// return system.getResult(null, "状态错误");
// }
// }
// } catch (error) {
// console.log(error);
// return system.getResultFail(500, "接口异常:" + error.message);
// }
// }
}
}
module
.
exports
=
OrderCtl
;
module
.
exports
=
OrderCtl
;
\ No newline at end of file
xgg-admin/app/base/controller/impl/uc/userCtl.js
View file @
f3b6b102
...
@@ -208,5 +208,15 @@ class UserCtl extends CtlBase {
...
@@ -208,5 +208,15 @@ class UserCtl extends CtlBase {
return
system
.
getResult
(
null
,
`系统错误 错误信息
${
error
}
`
);
return
system
.
getResult
(
null
,
`系统错误 错误信息
${
error
}
`
);
}
}
}
}
async
salesmanList
(
params
,
pobj2
,
req
)
{
try
{
params
.
uctype
=
1
;
return
await
this
.
userSve
.
findByRoleCodes
(
params
);
}
catch
(
error
)
{
console
.
log
(
error
);
return
system
.
getResult
(
null
,
`系统错误 错误信息
${
error
}
`
);
}
}
}
}
module
.
exports
=
UserCtl
;
module
.
exports
=
UserCtl
;
\ No newline at end of file
xgg-admin/app/base/service/impl/order/orderSve.js
View file @
f3b6b102
...
@@ -5,220 +5,65 @@ class OrderService extends ServiceBase {
...
@@ -5,220 +5,65 @@ class OrderService extends ServiceBase {
constructor
()
{
constructor
()
{
super
();
super
();
this
.
pushapiSve
=
system
.
getObject
(
"service.push.pushapiSve"
);
this
.
pushapiSve
=
system
.
getObject
(
"service.push.pushapiSve"
);
this
.
userSve
=
system
.
getObject
(
"service.uc.userSve"
);
}
}
async
addOrder
(
params
)
{
async
allProcess
(
params
)
{
var
merchantId
=
params
.
merchant_id
;
try
{
return
await
this
.
callms
(
"order"
,
"allProcess"
,
params
);
var
rs
=
await
this
.
callms
(
"merchant"
,
"getById"
,
{
}
catch
(
error
)
{
id
:
merchantId
return
system
.
getResult
(
null
,
`系统错误 错误信息
${
error
}
`
);
});
if
(
!
rs
||
rs
.
status
!=
0
||
!
rs
.
data
)
{
return
system
.
getResult
(
null
,
rs
.
msg
||
"商户不存在"
);
}
var
merchant
=
rs
.
data
;
// 处理参数
var
order
=
{};
order
.
merchantId
=
merchantId
;
order
.
channelOrderNo
=
this
.
trim
(
params
.
channelOrderNo
);
order
.
legalName
=
this
.
trim
(
params
.
legalName
);
order
.
legalMobile
=
this
.
trim
(
params
.
legalMobile
);
order
.
legalImg
=
this
.
trim
(
params
.
legalImg
);
order
.
idcard
=
this
.
trim
(
params
.
idcard
);
order
.
idcardFront
=
this
.
trim
(
params
.
idcardFront
);
order
.
idcardBack
=
this
.
trim
(
params
.
idcardBack
);
order
.
bankNo
=
this
.
trim
(
params
.
bankNo
);
order
.
bank
=
this
.
trim
(
params
.
bank
);
order
.
names
=
this
.
trim
(
params
.
names
);
order
.
capital
=
this
.
trim
(
params
.
capital
);
order
.
domicileId
=
this
.
trim
(
params
.
domicileId
);
order
.
businessScopeId
=
this
.
trim
(
params
.
businessScopeId
);
order
.
businesssScope
=
this
.
trim
(
params
.
businesssScope
);
order
.
bdId
=
this
.
trim
(
merchant
.
ownerId
);
order
.
bdPath
=
this
.
trim
(
merchant
.
ownerPath
);
return
await
this
.
callms
(
"order"
,
"addOrder"
,
params
);
}
async
putOrder
(
params
)
{
var
merchantId
=
params
.
merchant_id
;
var
rs
=
await
this
.
callms
(
"merchant"
,
"getById"
,
{
id
:
merchantId
});
if
(
!
rs
||
rs
.
status
!=
0
||
!
rs
.
data
)
{
return
system
.
getResult
(
null
,
rs
.
msg
||
"商户不存在"
);
}
var
merchant
=
rs
.
data
;
// 处理参数
var
order
=
{};
order
.
merchantId
=
merchantId
;
order
.
channelOrderNo
=
this
.
trim
(
params
.
channelOrderNo
);
order
.
legalName
=
this
.
trim
(
params
.
legalName
);
order
.
legalMobile
=
this
.
trim
(
params
.
legalMobile
);
order
.
legalImg
=
this
.
trim
(
params
.
legalImg
);
order
.
idcard
=
this
.
trim
(
params
.
idcard
);
order
.
idcardFront
=
this
.
trim
(
params
.
idcardFront
);
order
.
idcardBack
=
this
.
trim
(
params
.
idcardBack
);
order
.
bankNo
=
this
.
trim
(
params
.
bankNo
);
order
.
bank
=
this
.
trim
(
params
.
bank
);
order
.
names
=
this
.
trim
(
params
.
names
);
order
.
capital
=
this
.
trim
(
params
.
capital
);
order
.
domicileId
=
this
.
trim
(
params
.
domicileId
);
order
.
businessScopeId
=
this
.
trim
(
params
.
businessScopeId
);
order
.
businessScope
=
this
.
trim
(
params
.
businessScope
);
return
await
this
.
callms
(
"order"
,
"updOrder"
,
params
);
}
async
queryOrder
(
params
)
{
var
condition
=
{
merchantId
:
this
.
trim
(
params
.
merchant_id
),
channelOrderNo
:
this
.
trim
(
params
.
channelOrderNo
),
}
var
rs
=
await
this
.
callms
(
"order"
,
"byChannelOrderId"
,
condition
);
if
(
rs
.
status
!=
0
)
{
return
rs
;
}
var
order
=
rs
.
data
;
var
dto
=
{};
dto
.
orderNo
=
order
.
id
;
dto
.
channelOrderNo
=
order
.
channelOrderNo
;
dto
.
legalName
=
order
.
legalName
;
dto
.
legalMobile
=
order
.
legalMobile
;
dto
.
legalImg
=
order
.
legalImg
;
dto
.
idcard
=
order
.
idcard
;
dto
.
idcardFront
=
order
.
idcardFront
;
dto
.
idcardBack
=
order
.
idcardBack
;
dto
.
bankNo
=
order
.
bankNo
;
dto
.
bank
=
order
.
bank
;
dto
.
bankImg
=
order
.
bankImg
;
dto
.
names
=
order
.
names
;
dto
.
businessScope
=
order
.
businessScope
;
dto
.
capital
=
order
.
capital
;
dto
.
status
=
order
.
ostatus
;
dto
.
opNotes
=
order
.
opNotes
;
dto
.
domicileId
=
order
.
domicile_id
;
dto
.
businessScopeId
=
order
.
businessScope_id
;
dto
.
businessScope
=
order
.
businessScope
;
return
system
.
getResultSuccess
(
dto
);
}
}
async
allOrderList
(
params
)
{
var
rs
=
await
this
.
callms
(
"order"
,
"allOrderList"
,
params
);
await
this
.
transfield
(
rs
.
data
.
rows
);
await
this
.
setMerchant
(
rs
.
data
.
rows
);
return
rs
;
}
}
async
orderClose
(
params
)
{
async
orders
(
params
)
{
var
p
=
{
var
rs
=
await
this
.
callms
(
"order"
,
"orders"
,
params
);
merchantId
:
params
.
merchantId
||
params
.
merchant_id
,
await
this
.
setUcUser
(
rs
.
data
.
rows
);
channelOrderNo
:
params
.
channelOrderNo
};
var
rs
=
await
this
.
callms
(
"order"
,
"orderClose"
,
p
);
return
rs
;
return
rs
;
}
}
async
closeById
(
params
)
{
var
rs
=
await
this
.
callms
(
"order"
,
"closeOrderById"
,
{
id
:
params
.
id
});
return
rs
;
}
async
assign
(
params
)
{
async
statManageData
(
params
)
{
var
r
s
=
await
this
.
callms
(
"order"
,
"orderAssign
"
,
params
);
var
r
es
=
await
this
.
callms
(
"order"
,
"statTransData
"
,
params
);
return
rs
;
return
r
e
s
;
}
}
async
statBusinessData
(
params
)
{
async
orderEdit
(
params
)
{
var
res
=
await
this
.
callms
(
"order"
,
"statBusinessData"
,
params
);
var
rs
=
await
this
.
callms
(
"order"
,
"orderEdit"
,
params
);
return
res
;
return
rs
;
}
}
async
orderComplete
(
params
)
{
async
statDeliverData
(
params
)
{
var
rs
=
await
this
.
callms
(
"order"
,
"orderComplete"
,
params
);
var
res
=
await
this
.
callms
(
"order"
,
"statDeliverData"
,
params
);
if
(
rs
.
status
==
0
)
{
return
res
;
this
.
pushDeliver
(
params
);
}
return
rs
;
}
}
async
orderInfoAll
(
params
,
isMerchant
)
{
async
setUcUser
(
rows
)
{
var
rs
=
await
this
.
callms
(
"order"
,
"orderInfoAll"
,
params
);
if
(
!
rows
||
rows
.
length
==
0
)
{
await
this
.
transfield
([
rs
.
data
]);
return
;
if
(
rs
.
data
)
{
if
(
rs
.
data
.
deliver
)
{
rs
.
data
.
deliverDivide
=
system
.
f2y
(
rs
.
data
.
deliver
.
deliverDivide
);
}
if
(
rs
.
data
.
businessmen
)
{
rs
.
data
.
businessmen
.
costRate
=
system
.
f2y
(
rs
.
data
.
businessmen
.
costRate
);
rs
.
data
.
businessmen
.
taxRate
=
system
.
f2y
(
rs
.
data
.
businessmen
.
taxRate
);
rs
.
data
.
businessmen
.
serviceRate
=
system
.
f2y
(
rs
.
data
.
businessmen
.
serviceRate
);
}
if
(
isMerchant
)
{
var
merchant
=
await
this
.
callms
(
"merchant"
,
"getById"
,
{
id
:
rs
.
data
.
merchant_id
})
||
{};
rs
.
data
.
merchant
=
merchant
.
data
||
{};
}
}
return
rs
;
}
}
// 订单办理
let
ids
=
[];
async
handlePage
(
params
)
{
for
(
let
row
of
rows
)
{
var
rs
=
await
this
.
callms
(
"order"
,
"orderDeliverList"
,
params
);
if
(
row
.
bd_id
)
{
if
(
rs
.
status
===
0
&&
rs
.
data
&&
rs
.
data
.
rows
)
{
ids
.
push
(
row
.
bd_id
);
for
(
var
row
of
rs
.
data
.
rows
)
{
row
.
deliverDivide
=
system
.
f2y
(
row
.
deliverDivide
);
row
.
order
.
price
=
system
.
f2y
(
row
.
order
.
price
);
}
}
if
(
row
.
assign_user_id
)
{
ids
.
push
(
row
.
assign_user_id
);
}
}
return
rs
;
}
}
async
deliverEdit
(
params
)
{
let
userRs
=
await
this
.
userSve
.
mapByIds
({
ids
:
ids
});
var
obj
=
{
let
userMap
=
userRs
.
data
||
{};
order
:
params
.
order
,
businessmen
:
params
.
businessmen
};
return
await
this
.
callms
(
"order"
,
"orderDeliverEdit"
,
obj
);
}
async
deliverClose
(
params
)
{
for
(
let
row
of
rows
)
{
var
obj
=
{
let
user
=
userMap
[
row
.
bd_id
]
||
{};
id
:
params
.
id
,
row
.
bd_name
=
user
.
realName
||
""
;
breakReason
:
params
.
breakReason
,
};
return
await
this
.
callms
(
"order"
,
"orderDeliverClose"
,
obj
);
}
async
deliverHandle
(
obj
)
{
let
assignUser
=
userMap
[
row
.
assign_user_id
]
||
{};
var
rs
=
await
this
.
callms
(
"order"
,
"orderDeliverHandle"
,
obj
);
row
.
assign_user_name
=
assignUser
.
realName
||
""
;
// var rs = {status: 0};
if
(
rs
.
status
===
0
)
{
// 推送数据
this
.
pushDeliver
(
obj
);
}
}
return
rs
;
}
}
async
deliverAudit
(
obj
)
{
return
await
this
.
callms
(
"order"
,
"orderDeliverAudit"
,
obj
);
}
async
pushDeliver
(
obj
)
{
async
pushDeliver
(
obj
)
{
var
status
=
obj
.
status
;
var
status
=
obj
.
status
;
...
@@ -301,92 +146,5 @@ class OrderService extends ServiceBase {
...
@@ -301,92 +146,5 @@ class OrderService extends ServiceBase {
await
this
.
pushapiSve
.
push
(
options
);
await
this
.
pushapiSve
.
push
(
options
);
}
}
async
statManageData
(
params
)
{
var
res
=
await
this
.
callms
(
"order"
,
"statTransData"
,
params
);
return
res
;
}
async
statBusinessData
(
params
)
{
var
res
=
await
this
.
callms
(
"order"
,
"statBusinessData"
,
params
);
return
res
;
}
async
statDeliverData
(
params
)
{
var
res
=
await
this
.
callms
(
"order"
,
"statDeliverData"
,
params
);
return
res
;
}
async
transfield
(
rows
)
{
if
(
!
rows
||
rows
.
length
==
0
)
{
return
;
}
for
(
var
row
of
rows
)
{
row
.
price
=
system
.
f2y
(
row
.
price
);
}
return
rows
;
}
async
setMerchant
(
rows
)
{
if
(
!
rows
||
rows
.
length
==
0
)
{
return
;
}
var
merchantIds
=
[];
for
(
var
row
of
rows
)
{
merchantIds
.
push
(
row
.
merchant_id
);
}
var
mmap
=
await
this
.
callms
(
"merchant"
,
"getMapByIds"
,
{
ids
:
merchantIds
,
attrs
:
"id, name"
});
mmap
=
mmap
.
data
||
{};
for
(
var
row
of
rows
)
{
row
.
merchant
=
mmap
[
row
.
merchant_id
]
||
{};
}
}
/**
* 创建订单
* @param {*} pobj
* @param {*} pobj2
* @param {*} req
*/
async
createOrder
(
pobj
,
pobj2
,
req
){
try
{
var
res
=
await
this
.
callms
(
"order"
,
"createOrder"
,
pobj
);
return
res
;
}
catch
(
error
)
{
return
system
.
getResult
(
null
,
`系统错误 错误信息
${
error
}
`
);
}
}
/**
* 完善信息接口
* @param {*} pobj
* @param {*} pobj2
* @param {*} req
*/
async
completedOrder
(
pobj
,
pobj2
,
req
){
try
{
var
res
=
await
this
.
callms
(
"order"
,
"completedOrder"
,
pobj
);
return
res
;
}
catch
(
error
)
{
return
system
.
getResult
(
null
,
`系统错误 错误信息
${
error
}
`
);
}
}
/**
* 订单列表
* @param {*} pobj
* @param {*} pobj2
* @param {*} req
*/
async
orders
(
pobj
,
pobj2
,
req
){
try
{
return
await
this
.
callms
(
"order"
,
"orders"
,
pobj
);
}
catch
(
error
)
{
return
system
.
getResult
(
null
,
`系统错误 错误信息
${
error
}
`
);
}
}
}
}
module
.
exports
=
OrderService
;
module
.
exports
=
OrderService
;
\ No newline at end of file
xgg-admin/app/base/service/impl/uc/userSve.js
View file @
f3b6b102
...
@@ -117,5 +117,22 @@ class UserService extends ServiceBase {
...
@@ -117,5 +117,22 @@ class UserService extends ServiceBase {
}
}
}
}
async
mapByIds
(
params
)
{
try
{
return
await
this
.
callms
(
"uc"
,
"mapUserByIds"
,
params
);
}
catch
(
error
)
{
console
.
log
(
error
);
return
system
.
getResult
(
null
,
`系统错误 错误信息
${
error
}
`
);
}
}
async
findByRoleCodes
(
params
)
{
try
{
return
await
this
.
callms
(
"uc"
,
"findUsers"
,
params
);
}
catch
(
error
)
{
console
.
log
(
error
);
return
system
.
getResult
(
null
,
`系统错误 错误信息
${
error
}
`
);
}
}
}
}
module
.
exports
=
UserService
;
module
.
exports
=
UserService
;
\ No newline at end of file
xgg-admin/app/config/routes/web.js
View file @
f3b6b102
...
@@ -33,10 +33,10 @@ module.exports = function (app) {
...
@@ -33,10 +33,10 @@ module.exports = function (app) {
return
next
();
return
next
();
}
}
//
if (!jsonUser) {
if
(
!
jsonUser
)
{
//
res.end(JSON.stringify({ status: -99, msg: "no login" }));
res
.
end
(
JSON
.
stringify
({
status
:
-
99
,
msg
:
"no login"
}));
//
return;
return
;
//
}
}
if
(
xggadminsid
)
{
if
(
xggadminsid
)
{
redisClient
.
setWithEx
(
xggadminsid
,
JSON
.
stringify
(
jsonUser
),
60
*
60
*
60
);
redisClient
.
setWithEx
(
xggadminsid
,
JSON
.
stringify
(
jsonUser
),
60
*
60
*
60
);
...
...
xgg-admin/app/front/entry/public/apidoc/order/order.md
View file @
f3b6b102
<a
name=
"menu"
>
目录
</a>
<a
name=
"menu"
>
目录
</a>
1.
[
全部订单
](
#orderList
)
1.
[
业务进度字典
](
#processList
)
1.
[
订单关闭
](
#close
)
1.
[
订单管理列表
](
#orderList
)
1.
[
订单分配
](
#assign
)
1.
[
平台业务员查询
](
#salesmanList
)
1.
[
查看详情
](
#orderInfo
)
1.
[
编辑
](
#orderEdit
)
1.
[
交付审核
](
#deliverAudit
)
1.
[
订单完成
](
#orderComplete
)
1.
[
创建订单(企服通)
](
#createOrder
)
## **<a name="orderList"> 业务进度字典 </a>**
1.
[
完善信息
](
#completedOrder
)
1.
[
订单列表
](
#orders
)
## **<a name="orderList"> 全部订单 </a>**
[
返回到目录
](
#menu
)
[
返回到目录
](
#menu
)
##### URL
##### URL
[
/web/order/orderCtl/
allPage
]
[
/web/order/orderCtl/
processList
]
#### 参数格式 `JSON`
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
#### HTTP请求方式 `POST`
```
javascript
```
javascript
{
{}
"merchant_id"
:
110361384474
,
// 商户id
"orderNo"
:
""
,
// 订单号
"createdBegin"
:
""
,
// 创建时间
"createdEnd"
:
""
,
"assignBegin"
:
""
,
// 分配时间
"assignEnd"
:
""
,
"status"
:
""
}
```
```
#### 返回结果
#### 返回结果
```
javascript
```
javascript
{
{
"status"
:
0
,
"status"
:
0
,
"msg"
:
"success"
,
"msg"
:
"success"
,
"data"
:
{
"data"
:
[
"count"
:
4
,
"rows"
:
[
{
{
"id"
:
"13180527789003380"
,
// 订单号\订单号
"status"
:
"1000"
,
// 状态码
"merchant_id"
:
"11064622752480048"
,
// 商户id
"name"
:
"待分配"
// 状态名称
"channelOrderNo"
:
"xxxxxxxxx111"
,
// 渠道订单号
"price"
:
300000
,
// 订单价格(分)
"legalName"
:
"杨庆菊"
,
// 法人姓名
"legalMobile"
:
"杨庆菊手机号"
,
// 法人手机号
"legalImg"
:
"法人照片"
,
// 法人照片
"idcard"
:
"123身份证"
,
// 身份证号码
"idcardFront"
:
"在正面"
,
// 身份证正面图
"idcardBack"
:
"反面"
,
// 身份证反面图
"bankNo"
:
"2222"
,
// 银行卡号
"bank"
:
"开户行"
,
// 开户行
"bankImg"
:
"这是银行卡照片"
,
// 银行卡照片
"names"
:
"名称1,名称2,名称3"
,
// 2~3个注册名称,逗号分割
"domicile_id"
:
""
// 注册地id
"domicileName"
:
""
// 注册地名称
"businessScope_id"
:
"12218127596000645"
,
// 经营范围id
"businessType"
:
"物流信息类"
,
// 经营范围
"businessScope"
:
"国内物流信息服务;装"
,
// 经营范围详情
"capital"
:
"到底是多少"
,
// 注册资本
"statusName"
:
"未付款"
,
// 订单状态名称
"status"
:
"1000"
,
// 订单状态
"ostatusName"
:
"待处理"
,
// 业务进度状态名称
"ostatus"
:
"1030"
,
// 业务进度状态
"assignTime"
:
null
,
// 分配时间
"assignUcname"
:
"吴经理"
,
// 分配人
"created_at"
:
"2019-10-05 06:57:28"
,
// 创建时间
"deliverType"
:
""
,
// 交付类型 10交付商交付 20平台交付 30平台保存无需交付
"deliverTypeName"
:
""
,
// 交付类型名称
"deliverNo"
:
""
,
// 快递单号
"deliverImg"
:
""
,
// 交接单
"deliver"
:
{
// 交付商
"statusName"
:
"待处理"
// 办理状态名称
"status"
:
"1020"
,
// 办理状态
"deliverName"
:
"开封交付商"
,
// 交付商名称
"deliverDivide"
:
3311
,
// 交付商分成比例
"auditRemark"
:
null
,
// 审核备注
"content"
:
null
,
// 交付内容
"addressee"
:
null
,
// 收件人
"mobile"
:
null
,
// 联系电话
"addr"
:
null
,
// 邮寄地址
"auditResult"
:
""
,
// 审核状态
}
"merchant"
:
{
// 商户对象
"id"
:
"11064622752480055"
,
// 商户id
"name"
:
"司机宝"
// 商户名号曾
}
},
},
]
}
}
```
## **<a name="close"> 订单关闭 </a>**
[
返回到目录
](
#menu
)
##### URL
[
/web/order/orderCtl/close
]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
```
javascript
{
"id"
:
110361384474
,
// 商户id
}
```
#### 返回结果
```
javascript
{
"status"
:
0
,
"msg"
:
"success"
,
"data"
:
null
}
```
## **<a name="assign"> 订单分配 </a>**
[
返回到目录
](
#menu
)
##### URL
[
/web/order/orderCtl/assign
]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
```
javascript
{
{
"id"
:
110361384474
,
// 商户id
"status"
:
"1010"
,
"deliverId"
:
""
,
// 交付商id
"name"
:
"待完善"
"deliverName"
:
""
,
// 交付商名称
},
"orderDeliver"
:
500
,
// 交付商分成金额
],
"requestid"
:
"db9a3248c6b7483d93ccea6d66d0affc"
}
}
```
```
#### 返回结果
```
javascript
{
"status"
:
0
,
"msg"
:
"success"
,
"data"
:
null
}
```
## **<a name="order
Edit"> 订单编辑
</a>**
## **<a name="order
List"> 订单管理列表
</a>**
[
返回到目录
](
#menu
)
[
返回到目录
](
#menu
)
##### URL
##### URL
[
/web/order/orderCtl/
orderEdit
]
[
/web/order/orderCtl/
platformOrders
]
#### 参数格式 `JSON`
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
#### HTTP请求方式 `POST`
```
javascript
```
javascript
{
{
"id"
:
"13180527789003380"
,
// 订单id
"currentPage"
:
"1"
,
"merchantId"
:
"11064622752480055"
,
// 商户id
"pageSize"
:
"3"
,
"price"
:
2600.72
// 订单价格
"id"
:
""
,
// 订单编号
"status"
:
"1010"
,
// 业务进度
"createdBegin"
:
""
,
// 创建时间 开始
"createdEnd"
:
""
// 创建时间 结束
}
}
```
```
#### 返回结果
#### 返回结果
```
javascript
```
javascript
{
"status"
:
0
,
"msg"
:
"success"
,
"data"
:
null
}
```
## **<a name="orderInfo"> 查看详情 </a>**
[
返回到目录
](
#menu
)
##### URL
[
/web/order/orderCtl/allInfo
]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
```
javascript
{
{
"id"
:
"13180527789003380"
,
// 订单id
}
```
#### 返回结果
```
javascript
{
"status"
:
0
,
"status"
:
0
,
"msg"
:
"success
"
,
"msg"
:
"操作成功
"
,
"data"
:
{
"data"
:
{
"id"
:
"13180527789003380"
,
// 订单号\订单号
"count"
:
9
,
"merchant_id"
:
"11064622752480048"
,
// 商户id
"rows"
:
[
"channelOrderNo"
:
"xxxxxxxxx111"
,
// 渠道订单号
{
"price"
:
300000
,
// 订单价格(分)
"id"
:
"1567430558002579"
,
// 订单编号
"legalName"
:
"杨庆菊"
,
// 法人姓名
"status"
:
1000
,
// 订单状态
"legalMobile"
:
"杨庆菊手机号"
,
// 法人手机号
"statusName"
:
"待分配"
,
// 订单状态名称
"legalImg"
:
"法人照片"
,
// 法人照片
"assign_time"
:
null
,
// 分配时间
"idcard"
:
"123身份证"
,
// 身份证号码
"assign_user_name"
:
"郭德纲46"
// 分配人
"idcardFront"
:
"在正面"
,
// 身份证正面图
"product_id"
:
10010000
,
// 产品id
"idcardBack"
:
"反面"
,
// 身份证反面图
"bd_name"
:
""
,
// 业务员
"bankNo"
:
"2222"
,
// 银行卡号
"contact_mobile"
:
"13777777777"
,
// 联系电话
"bank"
:
"开户行"
,
// 开户行
"created_at"
:
"2020-01-09T07:42:23.000Z"
,
// 创建时间
"bankImg"
:
"这是银行卡照片"
,
// 银行卡照片
"desc"
:
""
,
// 订单描述
"names"
:
"名称1,名称2,名称3"
,
// 2~3个注册名称,逗号分割
"osource"
:
{
"id"
:
1000
,
"domicile_id"
:
""
// 注册地id
"name"
:
"企服通"
,
// 渠道名称
"domicileName"
:
""
// 注册地名称
"businessScope_id"
:
"12218127596000645"
,
// 经营范围id
"businessType"
:
"物流信息类"
,
// 经营范围
"businessScope"
:
"国内物流信息服务;装"
,
// 经营范围详情
"capital"
:
"到底是多少"
,
// 注册资本
"statusName"
:
"未付款"
,
// 订单状态名称
"status"
:
"1000"
,
// 订单状态
"ostatusName"
:
"待处理"
,
// 业务进度状态名称
"ostatus"
:
"1030"
,
// 业务进度状态
"assignTime"
:
null
,
// 分配时间
"assignUcname"
:
"吴经理"
,
// 分配人
"created_at"
:
"2019-10-05 06:57:28"
,
// 创建时间
"deliverType"
:
""
,
// 交付类型 10交付商交付 20平台交付 30平台保存无需交付
"deliverTypeName"
:
""
,
// 交付类型名称
"deliverNo"
:
""
,
// 快递单号
"deliverImg"
:
""
,
// 交接单
"deliver"
:
{
// 交付商
"statusName"
:
"待处理"
// 办理状态名称
"status"
:
"1020"
,
// 办理状态
"deliverName"
:
"开封交付商"
,
// 交付商名称
"deliverDivide"
:
3311
,
// 交付商分成比例
"auditRemark"
:
null
,
// 审核备注
"content"
:
null
,
// 交付内容
"addressee"
:
null
,
// 收件人
"mobile"
:
null
,
// 联系电话
"addr"
:
null
,
// 邮寄地址
"auditResult"
:
""
,
// 审核状态
},
},
"oproduct"
:
{
// 产品object
"businessmen"
:
{
"name"
:
"个体户注册一体化"
,
// 产品名称
"orderNo"
:
""
// 订单号
"desc"
:
"工商注册,刻章,银行卡户,税务报到"
,
// 产品描述
"channelOrderNo"
:
""
// 渠道订单号
"bstatus"
:
"2020"
,
// 业务状态
"bstatusName"
:
"已完成"
,
// 业务状态名称
"gstatus"
:
"2020"
,
// 客户看到的业务状态
"gstatusName"
:
"已完成"
,
// 客户看到的业务状态名号曾
"dstatus"
:
"2020"
,
// 交付商看到的状态
"dstatusName"
:
"已完成"
// 交付商看到的状态名称
"legalName"
:
""
// 法人姓名
"legalMobile"
:
""
// 法人电话
"name"
:
""
// 个体工商户名称
"creditCode"
:
""
// 统一社会信用代码
"businessPlace"
:
""
// 经营场所
"businessScope"
:
""
// 经营范围
"regDate"
:
""
// 注册日期
"businessImg"
:
""
// 执照照片
"gongzhang"
:
""
// 公章
"caiwuzhang"
:
""
// 财务章
"fapiaozhang"
:
""
// 发票章
"hetongzhang"
:
""
// 合同章
"farenzhang"
:
""
// 法人章
"isBank"
:
""
// 是否开户
"bankName"
:
""
// 账户名称
"bankNo"
:
""
// 账户号
"bank"
:
""
// 开户行
"bankImg"
:
""
// 账户信息
"caImg"
:
""
// CA照片
"taxRegDay"
:
""
// 税务登记日
"taxOrg"
:
""
// 税务机构名称
"courierNo"
:
""
// 快递单号
"courierImg"
:
""
// 快递交接单图片
"addedValueRate"
:
""
// 增值税率
"supertaxRate"
:
""
// 附加税率
"commonTaxLadder"
:
""
// 普票个税阶梯
"commonOtherLadder"
:
""
// 普票增值税、附加税阶梯
"specialTaxLadder"
:
""
// 专票个税阶梯
"specialOtherLadder"
:
""
// 专票增值税、附加税阶梯
"contract"
:
""
// 个体户合同
"contractStartData"
:
""
// 合同开始时间
"contractEndData"
:
""
// 合同结束时间
"notes"
:
""
// 备注
"opNotes"
:
""
// 操作备注
"created_at"
:
""
,
// 创建时间
"taxUpType"
:
"1"
,
// 个税累计类型 1按月累计 2按年累计
"addValueUpType"
:
"1"
,
// 增值税累计类型 1按月 2按季度
"costRate"
:
11.22
,
// 核定成本费用率
"taxRate"
:
3.20
,
// 含税价百分比
"serviceRate"
:
1.25
,
// 服务费比例
"signNotes"
:
null
,
// 签约备注
"signTime"
:
null
,
// 签约时间
}
},
},
}
"odeliver"
:
{
// 交付商object
"deliver_name"
:
""
// 交付商名称
```
},
"next_status"
:
[
// 下一个进度
## **<a name="deliverAudit"> 交付审核 </a>**
[
返回到目录
](
#menu
)
##### URL
[
/web/order/orderCtl/deliverAudit
]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
#### ※※※ 1140审核失败 1150审核成功
```
javascript
{
{
"id"
:
"12115182819000593"
,
// 注意 订单办理id,deliver对象中的id,或者order对象中的orderDeliverId
"next_status"
:
"1010"
,
// 状态码
"status"
:
"1140"
,
// 1140审核失败 1150审核成功
"next_name"
:
"待完善"
// 状态名称
"auditRemark"
:
"边1去"
,
// 审核备注
"content"
:
"靠靠靠2"
,
// 交付内容
"addressee"
:
"李庆菊"
,
// 收件人
"mobile"
:
"131222266663"
,
// 联系电话
"addr"
:
"国创产业园4"
,
// 联系地址
}
}
],
```
},
]
#### 返回结果
},
```
javascript
"bizmsg"
:
"empty"
,
"requestid"
:
"3a71cc19808d4fd88bfac8c82fb4f24d"
{
"status"
:
0
,
"msg"
:
"success"
,
"data"
:
null
}
```
## **<a name="orderComplete"> 订单完成 </a>**
[
返回到目录
](
#menu
)
##### URL
[
/web/order/orderCtl/orderComplete
]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
#### ※※※ 1140审核失败 1150审核成功
```
javascript
{
"id"
:
"13180527754002366"
,
// 订单id
"deliverType"
:
"20"
,
// 交付类型
"deliverNo"
:
"xxooxxoo"
,
// 快递单号
"deliverImg"
:
"https://g"
// 交接单
"completeFile"
:
"https://g"
// 客户验收文件----- 这是新加的
}
}
```
#### 返回结果
```
javascript
{
"status"
:
0
,
"msg"
:
"success"
,
"data"
:
null
}
```
```
## **<a name="createOrder"> 创建订单(企服通) </a>**
[
返回到目录
](
#menu
)
##### URL
[
/web/order/orderCtl/createOrder
]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
```
javascript
{
productType
:
1
,
// 产品类型 1000注册订单 1010代开订单 1030代账订单 1040增值服务
productItems
:
[
1050
,
1070
,
1100
,
1110
],
// 注册订单时填写产品项 1050注册 1070刻章 1100银行开户 1110税务报道
channelNo
:
"qifutong"
,
// 渠道名称
thirdNo
:
"xxxxxxx"
,
// 订单号 varchar(32)
price
:
50000
,
// 订单价格(分) bigint 20
payType
:
1
// 支付方式 1按次支付 2按年支付
notes
:
""
,
// 订单备注 随便写,200个字以内
legalName
:
""
,
// 联系人
legalMobile
:
""
,
// 联系电话
legalEmail
:
""
,
// 联系邮箱
invoiceType
:
""
,
// 代开订单时指定发票类型 10 普通发票 20 增值税专用发票 30 电子发票
}
```
#### 返回结果
```
javascript
{
"status"
:
0
,
"msg"
:
"success"
,
"data"
:
null
,
"requestid"
:
"c179a24ec402454aa0e74c4333cc6eab"
}
```
## **<a name="
completedOrder"> 完善信息
</a>**
## **<a name="
salesmanList"> 平台业务员查询
</a>**
[
返回到目录
](
#menu
)
[
返回到目录
](
#menu
)
##### URL
##### URL
[
/web/
order/orderCtl/completedOrder
]
[
/web/
uc/userCtl/salesmanList
]
#### 参数格式 `JSON`
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
#### HTTP请求方式 `POST`
```
javascript
```
javascript
{}
{
"orderId"
:
"13699868075000706"
,
//订单ID
"legalName"
:
"president_nan"
,
//法人名称
"legalMobile"
:
"18833836395"
,
//法人电话
"creditCode"
:
"XXEIGIGKTI8989"
,
//社会统一信用代码
"names"
:
"driver baby"
,
//个体户名称
"businessScope"
:
"crateTanke"
,
//经营范围
"productType"
:
"1010"
//商品类型 "1000" 注册订单 "1010" 代开订单 "1030" 代账订单 "1040" 增值服务
}
```
```
#### 返回结果
#### 返回结果
...
@@ -444,60 +122,14 @@
...
@@ -444,60 +122,14 @@
{
{
"status"
:
0
,
"status"
:
0
,
"msg"
:
"success"
,
"msg"
:
"success"
,
"data"
:
null
,
"data"
:
[
"requestid"
:
"c179a24ec402454aa0e74c4333cc6eab"
}
```
## **<a name="orders"> 订单列表 </a>**
[
返回到目录
](
#menu
)
##### URL
[
/web/order/orderCtl/orders
]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
```
javascript
{
{
"currentPage"
:
"1"
,
//页码 非必填
"id"
:
9
,
// id
"pageSize"
:
"10"
,
//记录条数 非必填
"realName"
:
"郭德纲"
// 姓名
"id"
:
"1"
,
//发票ID 非必填
"productType"
:
"1010"
//商品类型 必填 "1000" 注册订单 "1010" 代开订单 "1030" 代账订单 "1040" 增值服务
}
```
#### 返回结果
```
javascript
{
"status"
:
0
,
"msg"
:
"success"
,
"data"
:
{
"count"
:
1
,
"rows"
:
[
{
"id"
:
"13699868075000706"
,
"merchant_id"
:
null
,
"businessmen_id"
:
null
,
"orderpay_id"
:
null
,
"price"
:
50000
,
"status"
:
"1000"
,
"notes"
:
"by myself"
,
"orderDeliverId"
:
""
,
"legalName"
:
"president_nan"
,
"legalMobile"
:
"18833836395"
,
"names"
:
"driver baby"
,
"creditCode"
:
"XXEIGIGKTI8989"
,
"isBank"
:
0
,
"businessScope"
:
"crateTanke"
,
"isInfoComplete"
:
1
,
"created_at"
:
"2019-12-09 02:03:49"
,
"updated_at"
:
"2019-12-09T03:42:40.000Z"
,
"deleted_at"
:
null
,
"version"
:
0
,
"statusName"
:
""
}
]
},
},
"requestid"
:
"e940f89920b4427f93ddbe9c2ff06856"
],
"requestid"
:
"6c308d46116945968592fbce5f3f4a95"
}
}
```
```
\ No newline at end of file
xgg-admin/app/front/entry/public/apidoc/order/order_bak2.md
0 → 100644
View file @
f3b6b102
<a
name=
"menu"
>
目录
</a>
1.
[
全部订单
](
#orderList
)
1.
[
订单关闭
](
#close
)
1.
[
订单分配
](
#assign
)
1.
[
查看详情
](
#orderInfo
)
1.
[
编辑
](
#orderEdit
)
1.
[
交付审核
](
#deliverAudit
)
1.
[
订单完成
](
#orderComplete
)
1.
[
创建订单(企服通)
](
#createOrder
)
1.
[
完善信息
](
#completedOrder
)
1.
[
订单列表
](
#orders
)
## **<a name="orderList"> 全部订单 </a>**
[
返回到目录
](
#menu
)
##### URL
[
/web/order/orderCtl/allPage
]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
```
javascript
{
"merchant_id"
:
110361384474
,
// 商户id
"orderNo"
:
""
,
// 订单号
"createdBegin"
:
""
,
// 创建时间
"createdEnd"
:
""
,
"assignBegin"
:
""
,
// 分配时间
"assignEnd"
:
""
,
"status"
:
""
}
```
#### 返回结果
```
javascript
{
"status"
:
0
,
"msg"
:
"success"
,
"data"
:
{
"count"
:
4
,
"rows"
:
[
{
"id"
:
"13180527789003380"
,
// 订单号\订单号
"merchant_id"
:
"11064622752480048"
,
// 商户id
"channelOrderNo"
:
"xxxxxxxxx111"
,
// 渠道订单号
"price"
:
300000
,
// 订单价格(分)
"legalName"
:
"杨庆菊"
,
// 法人姓名
"legalMobile"
:
"杨庆菊手机号"
,
// 法人手机号
"legalImg"
:
"法人照片"
,
// 法人照片
"idcard"
:
"123身份证"
,
// 身份证号码
"idcardFront"
:
"在正面"
,
// 身份证正面图
"idcardBack"
:
"反面"
,
// 身份证反面图
"bankNo"
:
"2222"
,
// 银行卡号
"bank"
:
"开户行"
,
// 开户行
"bankImg"
:
"这是银行卡照片"
,
// 银行卡照片
"names"
:
"名称1,名称2,名称3"
,
// 2~3个注册名称,逗号分割
"domicile_id"
:
""
// 注册地id
"domicileName"
:
""
// 注册地名称
"businessScope_id"
:
"12218127596000645"
,
// 经营范围id
"businessType"
:
"物流信息类"
,
// 经营范围
"businessScope"
:
"国内物流信息服务;装"
,
// 经营范围详情
"capital"
:
"到底是多少"
,
// 注册资本
"statusName"
:
"未付款"
,
// 订单状态名称
"status"
:
"1000"
,
// 订单状态
"ostatusName"
:
"待处理"
,
// 业务进度状态名称
"ostatus"
:
"1030"
,
// 业务进度状态
"assignTime"
:
null
,
// 分配时间
"assignUcname"
:
"吴经理"
,
// 分配人
"created_at"
:
"2019-10-05 06:57:28"
,
// 创建时间
"deliverType"
:
""
,
// 交付类型 10交付商交付 20平台交付 30平台保存无需交付
"deliverTypeName"
:
""
,
// 交付类型名称
"deliverNo"
:
""
,
// 快递单号
"deliverImg"
:
""
,
// 交接单
"deliver"
:
{
// 交付商
"statusName"
:
"待处理"
// 办理状态名称
"status"
:
"1020"
,
// 办理状态
"deliverName"
:
"开封交付商"
,
// 交付商名称
"deliverDivide"
:
3311
,
// 交付商分成比例
"auditRemark"
:
null
,
// 审核备注
"content"
:
null
,
// 交付内容
"addressee"
:
null
,
// 收件人
"mobile"
:
null
,
// 联系电话
"addr"
:
null
,
// 邮寄地址
"auditResult"
:
""
,
// 审核状态
}
"merchant"
:
{
// 商户对象
"id"
:
"11064622752480055"
,
// 商户id
"name"
:
"司机宝"
// 商户名号曾
}
},
]
}
}
```
## **<a name="close"> 订单关闭 </a>**
[
返回到目录
](
#menu
)
##### URL
[
/web/order/orderCtl/close
]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
```
javascript
{
"id"
:
110361384474
,
// 商户id
}
```
#### 返回结果
```
javascript
{
"status"
:
0
,
"msg"
:
"success"
,
"data"
:
null
}
```
## **<a name="assign"> 订单分配 </a>**
[
返回到目录
](
#menu
)
##### URL
[
/web/order/orderCtl/assign
]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
```
javascript
{
"id"
:
110361384474
,
// 商户id
"deliverId"
:
""
,
// 交付商id
"deliverName"
:
""
,
// 交付商名称
"orderDeliver"
:
500
,
// 交付商分成金额
}
```
#### 返回结果
```
javascript
{
"status"
:
0
,
"msg"
:
"success"
,
"data"
:
null
}
```
## **<a name="orderEdit"> 订单编辑 </a>**
[
返回到目录
](
#menu
)
##### URL
[
/web/order/orderCtl/orderEdit
]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
```
javascript
{
"id"
:
"13180527789003380"
,
// 订单id
"merchantId"
:
"11064622752480055"
,
// 商户id
"price"
:
2600.72
// 订单价格
}
```
#### 返回结果
```
javascript
{
"status"
:
0
,
"msg"
:
"success"
,
"data"
:
null
}
```
## **<a name="orderInfo"> 查看详情 </a>**
[
返回到目录
](
#menu
)
##### URL
[
/web/order/orderCtl/allInfo
]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
```
javascript
{
"id"
:
"13180527789003380"
,
// 订单id
}
```
#### 返回结果
```
javascript
{
"status"
:
0
,
"msg"
:
"success"
,
"data"
:
{
"id"
:
"13180527789003380"
,
// 订单号\订单号
"merchant_id"
:
"11064622752480048"
,
// 商户id
"channelOrderNo"
:
"xxxxxxxxx111"
,
// 渠道订单号
"price"
:
300000
,
// 订单价格(分)
"legalName"
:
"杨庆菊"
,
// 法人姓名
"legalMobile"
:
"杨庆菊手机号"
,
// 法人手机号
"legalImg"
:
"法人照片"
,
// 法人照片
"idcard"
:
"123身份证"
,
// 身份证号码
"idcardFront"
:
"在正面"
,
// 身份证正面图
"idcardBack"
:
"反面"
,
// 身份证反面图
"bankNo"
:
"2222"
,
// 银行卡号
"bank"
:
"开户行"
,
// 开户行
"bankImg"
:
"这是银行卡照片"
,
// 银行卡照片
"names"
:
"名称1,名称2,名称3"
,
// 2~3个注册名称,逗号分割
"domicile_id"
:
""
// 注册地id
"domicileName"
:
""
// 注册地名称
"businessScope_id"
:
"12218127596000645"
,
// 经营范围id
"businessType"
:
"物流信息类"
,
// 经营范围
"businessScope"
:
"国内物流信息服务;装"
,
// 经营范围详情
"capital"
:
"到底是多少"
,
// 注册资本
"statusName"
:
"未付款"
,
// 订单状态名称
"status"
:
"1000"
,
// 订单状态
"ostatusName"
:
"待处理"
,
// 业务进度状态名称
"ostatus"
:
"1030"
,
// 业务进度状态
"assignTime"
:
null
,
// 分配时间
"assignUcname"
:
"吴经理"
,
// 分配人
"created_at"
:
"2019-10-05 06:57:28"
,
// 创建时间
"deliverType"
:
""
,
// 交付类型 10交付商交付 20平台交付 30平台保存无需交付
"deliverTypeName"
:
""
,
// 交付类型名称
"deliverNo"
:
""
,
// 快递单号
"deliverImg"
:
""
,
// 交接单
"deliver"
:
{
// 交付商
"statusName"
:
"待处理"
// 办理状态名称
"status"
:
"1020"
,
// 办理状态
"deliverName"
:
"开封交付商"
,
// 交付商名称
"deliverDivide"
:
3311
,
// 交付商分成比例
"auditRemark"
:
null
,
// 审核备注
"content"
:
null
,
// 交付内容
"addressee"
:
null
,
// 收件人
"mobile"
:
null
,
// 联系电话
"addr"
:
null
,
// 邮寄地址
"auditResult"
:
""
,
// 审核状态
},
"businessmen"
:
{
"orderNo"
:
""
// 订单号
"channelOrderNo"
:
""
// 渠道订单号
"bstatus"
:
"2020"
,
// 业务状态
"bstatusName"
:
"已完成"
,
// 业务状态名称
"gstatus"
:
"2020"
,
// 客户看到的业务状态
"gstatusName"
:
"已完成"
,
// 客户看到的业务状态名号曾
"dstatus"
:
"2020"
,
// 交付商看到的状态
"dstatusName"
:
"已完成"
// 交付商看到的状态名称
"legalName"
:
""
// 法人姓名
"legalMobile"
:
""
// 法人电话
"name"
:
""
// 个体工商户名称
"creditCode"
:
""
// 统一社会信用代码
"businessPlace"
:
""
// 经营场所
"businessScope"
:
""
// 经营范围
"regDate"
:
""
// 注册日期
"businessImg"
:
""
// 执照照片
"gongzhang"
:
""
// 公章
"caiwuzhang"
:
""
// 财务章
"fapiaozhang"
:
""
// 发票章
"hetongzhang"
:
""
// 合同章
"farenzhang"
:
""
// 法人章
"isBank"
:
""
// 是否开户
"bankName"
:
""
// 账户名称
"bankNo"
:
""
// 账户号
"bank"
:
""
// 开户行
"bankImg"
:
""
// 账户信息
"caImg"
:
""
// CA照片
"taxRegDay"
:
""
// 税务登记日
"taxOrg"
:
""
// 税务机构名称
"courierNo"
:
""
// 快递单号
"courierImg"
:
""
// 快递交接单图片
"addedValueRate"
:
""
// 增值税率
"supertaxRate"
:
""
// 附加税率
"commonTaxLadder"
:
""
// 普票个税阶梯
"commonOtherLadder"
:
""
// 普票增值税、附加税阶梯
"specialTaxLadder"
:
""
// 专票个税阶梯
"specialOtherLadder"
:
""
// 专票增值税、附加税阶梯
"contract"
:
""
// 个体户合同
"contractStartData"
:
""
// 合同开始时间
"contractEndData"
:
""
// 合同结束时间
"notes"
:
""
// 备注
"opNotes"
:
""
// 操作备注
"created_at"
:
""
,
// 创建时间
"taxUpType"
:
"1"
,
// 个税累计类型 1按月累计 2按年累计
"addValueUpType"
:
"1"
,
// 增值税累计类型 1按月 2按季度
"costRate"
:
11.22
,
// 核定成本费用率
"taxRate"
:
3.20
,
// 含税价百分比
"serviceRate"
:
1.25
,
// 服务费比例
"signNotes"
:
null
,
// 签约备注
"signTime"
:
null
,
// 签约时间
}
},
}
```
## **<a name="deliverAudit"> 交付审核 </a>**
[
返回到目录
](
#menu
)
##### URL
[
/web/order/orderCtl/deliverAudit
]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
#### ※※※ 1140审核失败 1150审核成功
```
javascript
{
"id"
:
"12115182819000593"
,
// 注意 订单办理id,deliver对象中的id,或者order对象中的orderDeliverId
"status"
:
"1140"
,
// 1140审核失败 1150审核成功
"auditRemark"
:
"边1去"
,
// 审核备注
"content"
:
"靠靠靠2"
,
// 交付内容
"addressee"
:
"李庆菊"
,
// 收件人
"mobile"
:
"131222266663"
,
// 联系电话
"addr"
:
"国创产业园4"
,
// 联系地址
}
```
#### 返回结果
```
javascript
{
"status"
:
0
,
"msg"
:
"success"
,
"data"
:
null
}
```
## **<a name="orderComplete"> 订单完成 </a>**
[
返回到目录
](
#menu
)
##### URL
[
/web/order/orderCtl/orderComplete
]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
#### ※※※ 1140审核失败 1150审核成功
```
javascript
{
"id"
:
"13180527754002366"
,
// 订单id
"deliverType"
:
"20"
,
// 交付类型
"deliverNo"
:
"xxooxxoo"
,
// 快递单号
"deliverImg"
:
"https://g"
// 交接单
"completeFile"
:
"https://g"
// 客户验收文件----- 这是新加的
}
```
#### 返回结果
```
javascript
{
"status"
:
0
,
"msg"
:
"success"
,
"data"
:
null
}
```
## **<a name="createOrder"> 创建订单(企服通) </a>**
[
返回到目录
](
#menu
)
##### URL
[
/web/order/orderCtl/createOrder
]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
```
javascript
{
productType
:
1
,
// 产品类型 1000注册订单 1010代开订单 1030代账订单 1040增值服务
productItems
:
[
1050
,
1070
,
1100
,
1110
],
// 注册订单时填写产品项 1050注册 1070刻章 1100银行开户 1110税务报道
channelNo
:
"qifutong"
,
// 渠道名称
thirdNo
:
"xxxxxxx"
,
// 订单号 varchar(32)
price
:
50000
,
// 订单价格(分) bigint 20
payType
:
1
// 支付方式 1按次支付 2按年支付
notes
:
""
,
// 订单备注 随便写,200个字以内
legalName
:
""
,
// 联系人
legalMobile
:
""
,
// 联系电话
legalEmail
:
""
,
// 联系邮箱
invoiceType
:
""
,
// 代开订单时指定发票类型 10 普通发票 20 增值税专用发票 30 电子发票
}
```
#### 返回结果
```
javascript
{
"status"
:
0
,
"msg"
:
"success"
,
"data"
:
null
,
"requestid"
:
"c179a24ec402454aa0e74c4333cc6eab"
}
```
## **<a name="completedOrder"> 完善信息 </a>**
[
返回到目录
](
#menu
)
##### URL
[
/web/order/orderCtl/completedOrder
]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
```
javascript
{
"orderId"
:
"13699868075000706"
,
//订单ID
"legalName"
:
"president_nan"
,
//法人名称
"legalMobile"
:
"18833836395"
,
//法人电话
"creditCode"
:
"XXEIGIGKTI8989"
,
//社会统一信用代码
"names"
:
"driver baby"
,
//个体户名称
"businessScope"
:
"crateTanke"
,
//经营范围
"productType"
:
"1010"
//商品类型 "1000" 注册订单 "1010" 代开订单 "1030" 代账订单 "1040" 增值服务
}
```
#### 返回结果
```
javascript
{
"status"
:
0
,
"msg"
:
"success"
,
"data"
:
null
,
"requestid"
:
"c179a24ec402454aa0e74c4333cc6eab"
}
```
## **<a name="orders"> 订单列表 </a>**
[
返回到目录
](
#menu
)
##### URL
[
/web/order/orderCtl/orders
]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
```
javascript
{
"currentPage"
:
"1"
,
//页码 非必填
"pageSize"
:
"10"
,
//记录条数 非必填
"id"
:
"1"
,
//发票ID 非必填
"productType"
:
"1010"
//商品类型 必填 "1000" 注册订单 "1010" 代开订单 "1030" 代账订单 "1040" 增值服务
}
```
#### 返回结果
```
javascript
{
"status"
:
0
,
"msg"
:
"success"
,
"data"
:
{
"count"
:
1
,
"rows"
:
[
{
"id"
:
"13699868075000706"
,
"merchant_id"
:
null
,
"businessmen_id"
:
null
,
"orderpay_id"
:
null
,
"price"
:
50000
,
"status"
:
"1000"
,
"notes"
:
"by myself"
,
"orderDeliverId"
:
""
,
"legalName"
:
"president_nan"
,
"legalMobile"
:
"18833836395"
,
"names"
:
"driver baby"
,
"creditCode"
:
"XXEIGIGKTI8989"
,
"isBank"
:
0
,
"businessScope"
:
"crateTanke"
,
"isInfoComplete"
:
1
,
"created_at"
:
"2019-12-09 02:03:49"
,
"updated_at"
:
"2019-12-09T03:42:40.000Z"
,
"deleted_at"
:
null
,
"version"
:
0
,
"statusName"
:
""
}
]
},
"requestid"
:
"e940f89920b4427f93ddbe9c2ff06856"
}
```
\ No newline at end of file
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