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
06c8ac57
Commit
06c8ac57
authored
Aug 20, 2020
by
gxfeng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新增创建服务实例
parent
fd68779d
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
296 additions
and
103 deletions
+296
-103
tx-fi-tax/app/base/controller/impl/bizchance/deliverybillCtl.js
+67
-0
tx-fi-tax/app/base/db/impl/bizchance/deliverybillDao.js
+119
-0
tx-fi-tax/app/base/service/impl/bizchance/deliverybillSve.js
+110
-103
No files found.
tx-fi-tax/app/base/controller/impl/bizchance/deliverybillCtl.js
View file @
06c8ac57
...
...
@@ -9,6 +9,7 @@ const appconfig = system.getSysConfig();
class
DeliverybillCtl
extends
CtlBase
{
constructor
()
{
super
(
"bizchance"
,
CtlBase
.
getServiceName
(
DeliverybillCtl
));
this
.
logService
=
system
.
getObject
(
"service.bizchance.statuslogSve"
);
}
/**
...
...
@@ -139,5 +140,70 @@ class DeliverybillCtl extends CtlBase {
return
system
.
getResult
(
null
,
err
.
message
)
}
}
// 创建服务实例
async
insertInfo
(
pobj
,
qobj
,
req
)
{
// console.log(pobj);
// 检验各项必传参数
if
(
pobj
.
requestId
&&
pobj
.
requestId
!=
'undefined'
&&
pobj
.
bizId
&&
pobj
.
bizId
!=
'undefined'
&&
pobj
.
contactsPhone
&&
pobj
.
contactsPhone
!=
'undefined'
&&
pobj
.
userId
&&
pobj
.
userId
!=
'undefined'
&&
pobj
.
orderId
&&
pobj
.
orderId
!=
'undefined'
&&
pobj
.
areaType
&&
pobj
.
areaType
!=
'undefined'
&&
pobj
.
area
&&
pobj
.
area
!=
'undefined'
&&
pobj
.
topOrgCode
&&
pobj
.
topOrgCode
!=
'undefined'
&&
pobj
.
taxpayerType
&&
pobj
.
taxpayerType
!=
'undefined'
&&
pobj
.
product_code
&&
pobj
.
product_code
!=
'undefined'
&&
pobj
.
product_name
&&
pobj
.
product_name
!=
'undefined'
&&
pobj
.
service_address
&&
pobj
.
service_address
!=
'undefined'
&&
pobj
.
delivery_status
&&
pobj
.
delivery_status
!=
'undefined'
&&
pobj
.
facilitator_id
&&
pobj
.
facilitator_id
!=
'undefined'
)
{
try
{
// console.log(pobj);
var
buInfo
=
await
this
.
service
.
insertInfo
(
pobj
);
var
logInfo
=
{
"flowType"
:
"DELIVERY"
,
"flowId"
:
buInfo
.
id
,
"statusCode"
:
buInfo
.
delivery_status
,
"status_reason"
:
""
}
await
this
.
logService
.
insertInfo
(
logInfo
);
//插入状态日至表
return
system
.
getResult
(
buInfo
);
}
catch
(
error
)
{
// console.log(error);
return
system
.
getResultError
(
error
);
}
}
else
{
return
system
.
getResultError
(
"参数错误!"
);
}
}
}
module
.
exports
=
DeliverybillCtl
;
var
task
=
new
DeliverybillCtl
();
var
obj
=
{
"orderId"
:
"341184456620455_book"
,
"source_number"
:
"tx"
,
"demand_code"
:
"demand_code"
,
"sku_code"
:
"sku_code"
,
"solutionBizId"
:
"scheme_number"
,
"product_code"
:
"bookkeeping"
,
"product_name"
:
"代账服务"
,
"service_address"
:
"110100"
,
"delivery_status"
:
"success"
,
"facilitator_id"
:
"10"
,
"facilitator_name"
:
"公司宝"
,
"source_name"
:
"tencentCloud"
,
"requestId"
:
"282da0a74432-738f-4bed-b48d-d51aa433"
,
"bizId"
:
"1292748632"
,
"contactsPhone"
:
"18510669321"
,
"userId"
:
"10973452443103156"
,
"areaType"
:
"city"
,
"area"
:
"100010"
,
"topOrgCode"
:
"rong_yi_suan"
,
"taxpayerType"
:
1
};
task
.
insertInfo
(
obj
,
{},
{}).
then
(
d
=>
{
console
.
log
(
JSON
.
stringify
(
d
));
})
\ No newline at end of file
tx-fi-tax/app/base/db/impl/bizchance/deliverybillDao.js
View file @
06c8ac57
...
...
@@ -67,5 +67,124 @@ class DeliverybillDao extends Dao {
qc
.
where
[
"$and"
]
=
filters
;
return
qw
;
}
async
insertInfo
(
qobj
,
t
)
{
// console.log("dao层qobj===>");
// console.log(qobj);
var
obj
=
{
"delivery_code"
:
qobj
.
orderId
,
"product_code"
:
qobj
.
product_code
,
"product_name"
:
qobj
.
product_name
,
"service_address"
:
qobj
.
service_address
,
"delivery_status"
:
qobj
.
delivery_status
,
"facilitator_id"
:
qobj
.
facilitator_id
,
"biz_id"
:
qobj
.
bizId
};
// source_number
if
(
qobj
.
source_number
&&
qobj
.
source_number
!=
'undefined'
)
{
obj
.
source_number
=
qobj
.
source_number
;
delete
qobj
.
source_number
;
}
// demand_code
if
(
qobj
.
demand_code
&&
qobj
.
demand_code
!=
'undefined'
)
{
obj
.
demand_code
=
qobj
.
demand_code
;
delete
qobj
.
demand_code
;
}
// sku_code
if
(
qobj
.
sku_code
&&
qobj
.
sku_code
!=
'undefined'
)
{
obj
.
sku_code
=
qobj
.
sku_code
;
delete
qobj
.
sku_code
;
}
// scheme_number
if
(
qobj
.
solutionBizId
&&
qobj
.
solutionBizId
!=
'undefined'
)
{
obj
.
scheme_number
=
qobj
.
solutionBizId
;
delete
qobj
.
solutionBizId
;
}
// selling_price
if
(
qobj
.
selling_price
&&
qobj
.
selling_price
!=
'undefined'
)
{
obj
.
selling_price
=
qobj
.
selling_price
;
delete
qobj
.
selling_price
;
}
// cost_price
if
(
qobj
.
cost_price
&&
qobj
.
cost_price
!=
'undefined'
)
{
obj
.
cost_price
=
qobj
.
cost_price
;
delete
qobj
.
cost_price
;
}
// close_reason
if
(
qobj
.
close_reason
&&
qobj
.
close_reason
!=
'undefined'
)
{
obj
.
close_reason
=
qobj
.
close_reason
;
delete
qobj
.
close_reason
;
}
// facilitator_name
if
(
qobj
.
facilitator_name
&&
qobj
.
facilitator_name
!=
'undefined'
)
{
obj
.
facilitator_name
=
qobj
.
facilitator_name
;
delete
qobj
.
facilitator_name
;
}
// salesman_opcode
if
(
qobj
.
salesman_opcode
&&
qobj
.
salesman_opcode
!=
'undefined'
)
{
obj
.
salesman_opcode
=
qobj
.
salesman_opcode
;
delete
qobj
.
salesman_opcode
;
}
// salesman_id
if
(
qobj
.
salesman_id
&&
qobj
.
salesman_id
!=
'undefined'
)
{
obj
.
salesman_id
=
qobj
.
salesman_id
;
delete
qobj
.
salesman_id
;
}
// salesman_name
if
(
qobj
.
salesman_name
&&
qobj
.
salesman_name
!=
'undefined'
)
{
obj
.
salesman_name
=
qobj
.
salesman_name
;
delete
qobj
.
salesman_name
;
}
// salesman_phone
if
(
qobj
.
salesman_phone
&&
qobj
.
salesman_phone
!=
'undefined'
)
{
obj
.
salesman_phone
=
qobj
.
salesman_phone
;
delete
qobj
.
salesman_phone
;
}
// source_name
if
(
qobj
.
source_name
&&
qobj
.
source_name
!=
'undefined'
)
{
obj
.
source_name
=
qobj
.
source_name
;
delete
qobj
.
source_name
;
}
// master_source_number
if
(
qobj
.
master_source_number
&&
qobj
.
master_source_number
!=
'undefined'
)
{
obj
.
master_source_number
=
qobj
.
master_source_number
;
delete
qobj
.
master_source_number
;
}
// settle_status
if
(
qobj
.
settle_status
&&
qobj
.
settle_status
!=
'undefined'
)
{
obj
.
settle_status
=
qobj
.
settle_status
;
delete
qobj
.
settle_status
;
}
// settlebill_id
if
(
qobj
.
settlebill_id
&&
qobj
.
settlebill_id
!=
'undefined'
)
{
obj
.
settlebill_id
=
qobj
.
settlebill_id
;
delete
qobj
.
settlebill_id
;
}
// delivery_man_id
if
(
qobj
.
delivery_man_id
&&
qobj
.
delivery_man_id
!=
'undefined'
)
{
obj
.
delivery_man_id
=
qobj
.
delivery_man_id
;
delete
qobj
.
delivery_man_id
;
}
// delivery_man_name
if
(
qobj
.
delivery_man_name
&&
qobj
.
delivery_man_name
!=
'undefined'
)
{
obj
.
delivery_man_name
=
qobj
.
delivery_man_name
;
delete
qobj
.
delivery_man_name
;
}
// delivery_man_opcode
if
(
qobj
.
delivery_man_opcode
&&
qobj
.
delivery_man_opcode
!=
'undefined'
)
{
obj
.
delivery_man_opcode
=
qobj
.
delivery_man_opcode
;
delete
qobj
.
delivery_man_opcode
;
}
delete
qobj
.
orderId
;
delete
qobj
.
product_code
;
delete
qobj
.
product_name
;
delete
qobj
.
service_address
;
delete
qobj
.
delivery_status
;
delete
qobj
.
facilitator_id
;
obj
.
delivery_info
=
qobj
;
// console.log("dao层obj===>");
// console.log(obj);
return
await
this
.
create
(
obj
,
t
);
}
}
module
.
exports
=
DeliverybillDao
;
tx-fi-tax/app/base/service/impl/bizchance/deliverybillSve.js
View file @
06c8ac57
...
...
@@ -128,111 +128,117 @@ class DeliverybillService extends ServiceBase {
}
async
distributionPerson
(
pobj
)
{
let
{
numbers
,
nickName
,
userId
,
opCode
,
phone
,
type
}
=
pobj
;
switch
(
type
)
{
case
System
.
FLOWCODE
.
DELIVERY
:
let
datas
=
await
this
.
dao
.
findAll
({
delivery_code
:
{
$in
:
numbers
// let { numbers, nickName, userId, opCode, phone, type } = pobj;
// switch (type) {
// case System.FLOWCODE.DELIVERY:
// let datas = await this.dao.findAll({
// delivery_code: {
// $in: numbers
// }
// });
// if (datas.length !== numbers.length) {
// throw new Error("请检查单号是否正确");
// }
// await this.dao.updateByWhere({
// salesman_id: userId,
// salesman_opcode: opCode,
// salesman_phone: phone,
// salesman_name: nickName
// }, {
// delivery_code: {
// $in: numbers
// }
// });
// // 插入 流转 记录
// let logs = [];
// for (let val of datas) {
// logs.push({
// demand_code: val.delivery_code,
// operator: {
// id: pobj.userid,
// username: pobj.username
// },
// operation_type: "distribution",
// operation_details: {
// isFirst: val.salesman_id ? true : false,
// fromUserId: val.salesman_id,
// fromUserName: val.salesman_name,
// toUserId: userId,
// toUserName: nickName
// },
// order_type: System.FLOWCODE.DELIVERY
// })
// }
// this.operationrecordDao.bulkCreate(logs);
// break
// case System.FLOWCODE.BIZ:
// let datas = await this.bizoptDao.findAll({
// demand_code: {
// $in: numbers
// }
// });
// if (datas.length !== datas.length) {
// throw new Error("请检查单号是否正确");
// }
// return this.db.transaction(async (t) => {
// // 更新 操作人
// await this.bizoptDao.updateByWhere({
// salesman_id: userId,
// salesman_opcode: opCode,
// salesman_phone: phone,
// salesman_name: nickName
// }, {
// demand_code: {
// $in: numbers
// }
// }, t);
// // 更新 状态
// await this.bizoptDao.updateByWhere({
// business_status: "beforeFollowUp"
// }, {
// $and: [
// {
// demand_code: {
// $in: numbers
// }
// }, {
// business_status: "received"
// }
// ]
// }, t);
// // 插入 流转 记录
// let logs = [];
// for (let val of datas) {
// logs.push({
// demand_code: val.demand_code,
// operator: {
// id: pobj.userid,
// username: pobj.username
// },
// operation_type: "distribution",
// operation_details: {
// isFirst: val.salesman_id ? true : false,
// fromUserId: val.salesman_id,
// fromUserName: val.salesman_name,
// toUserId: userId,
// toUserName: nickName
// },
// order_type: System.FLOWCODE.BIZ
// })
// }
// this.operationrecordDao.bulkCreate(logs);
// return "success"
// });
// break
// }
// return "SUCCESS"
}
});
if
(
datas
.
length
!==
numbers
.
length
)
{
throw
new
Error
(
"请检查单号是否正确"
);
}
await
this
.
dao
.
updateByWhere
({
salesman_id
:
userId
,
salesman_opcode
:
opCode
,
salesman_phone
:
phone
,
salesman_name
:
nickName
},
{
delivery_code
:
{
$in
:
numbers
}
});
// 插入 流转 记录
let
logs
=
[];
for
(
let
val
of
datas
)
{
logs
.
push
({
demand_code
:
val
.
delivery_code
,
operator
:
{
id
:
pobj
.
userid
,
username
:
pobj
.
username
},
operation_type
:
"distribution"
,
operation_details
:
{
isFirst
:
val
.
salesman_id
?
true
:
false
,
fromUserId
:
val
.
salesman_id
,
fromUserName
:
val
.
salesman_name
,
toUserId
:
userId
,
toUserName
:
nickName
},
order_type
:
System
.
FLOWCODE
.
DELIVERY
})
}
this
.
operationrecordDao
.
bulkCreate
(
logs
);
break
case
System
.
FLOWCODE
.
BIZ
:
let
datas
=
await
this
.
bizoptDao
.
findAll
({
demand_code
:
{
$in
:
numbers
}
});
if
(
datas
.
length
!==
datas
.
length
)
{
throw
new
Error
(
"请检查单号是否正确"
);
}
return
this
.
db
.
transaction
(
async
(
t
)
=>
{
// 更新 操作人
await
this
.
bizoptDao
.
updateByWhere
({
salesman_id
:
userId
,
salesman_opcode
:
opCode
,
salesman_phone
:
phone
,
salesman_name
:
nickName
},
{
demand_code
:
{
$in
:
numbers
}
},
t
);
// 更新 状态
await
this
.
bizoptDao
.
updateByWhere
({
business_status
:
"beforeFollowUp"
},
{
$and
:
[
{
demand_code
:
{
$in
:
numbers
}
},
{
business_status
:
"received"
}
]
},
t
);
// 插入 流转 记录
let
logs
=
[];
for
(
let
val
of
datas
)
{
logs
.
push
({
demand_code
:
val
.
demand_code
,
operator
:
{
id
:
pobj
.
userid
,
username
:
pobj
.
username
},
operation_type
:
"distribution"
,
operation_details
:
{
isFirst
:
val
.
salesman_id
?
true
:
false
,
fromUserId
:
val
.
salesman_id
,
fromUserName
:
val
.
salesman_name
,
toUserId
:
userId
,
toUserName
:
nickName
},
order_type
:
System
.
FLOWCODE
.
BIZ
})
}
this
.
operationrecordDao
.
bulkCreate
(
logs
);
return
"success"
});
break
}
return
"SUCCESS"
async
insertInfo
(
qobj
)
{
var
self
=
this
;
return
self
.
db
.
transaction
(
async
function
(
t
)
{
return
await
self
.
dao
.
insertInfo
(
qobj
,
t
);
});
}
}
module
.
exports
=
DeliverybillService
;
\ 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