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
4b59539f
Commit
4b59539f
authored
Jun 16, 2020
by
蒋勇
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d
parent
9cf7636e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
122 additions
and
109 deletions
+122
-109
ic-deliver/app/base/db/metadata/app/platform.js
+115
-106
ic-deliver/app/base/service/impl/bizchance/deliverybillSve.js
+7
-3
No files found.
ic-deliver/app/base/db/metadata/app/platform.js
View file @
4b59539f
module
.
exports
=
{
"config"
:
{
"pdict"
:
{
"app_type"
:
{
"api"
:
"API服务"
,
"web"
:
"PCWEB"
,
"app"
:
"移动APP"
,
"xcx"
:
"小程序"
,
"access"
:
"接入"
},
"app_type"
:
{
"api"
:
"API服务"
,
"web"
:
"PCWEB"
,
"app"
:
"移动APP"
,
"xcx"
:
"小程序"
,
"access"
:
"接入"
},
"data_priv"
:
{
"auth.role"
:
"角色"
,
"auth.user"
:
"用户"
},
"noticeType"
:
{
"sms"
:
"短信"
,
"email"
:
"邮件"
,
"wechat"
:
"微信"
},
"authType"
:
{
"add"
:
"新增"
,
"edit"
:
"编辑"
,
"delete"
:
"删除"
,
"export"
:
"导出"
,
"show"
:
"查看"
},
"mediaType"
:
{
"vd"
:
"视频"
,
"ad"
:
"音频"
,
"qt"
:
"其它"
},
"usageType"
:
{
"kt"
:
"课堂"
,
"taxkt"
:
"财税课堂"
,
"qt"
:
"其它"
},
"opstatus"
:
{
"0"
:
"失败"
,
"1"
:
"成功"
},
"sex"
:
{
"male"
:
"男"
,
"female"
:
"女"
},
"logLevel"
:
{
"debug"
:
0
,
"info"
:
1
,
"warn"
:
2
,
"error"
:
3
,
"fatal"
:
4
},
"msgType"
:
{
"sys"
:
"系统"
,
"single"
:
"单点"
,
"multi"
:
"群发"
},
"node_type"
:
{
"org"
:
"组织"
,
"arc"
:
"文档"
},
"noticeType"
:
{
"sms"
:
"短信"
,
"email"
:
"邮件"
,
"wechat"
:
"微信"
},
"authType"
:
{
"add"
:
"新增"
,
"edit"
:
"编辑"
,
"delete"
:
"删除"
,
"export"
:
"导出"
,
"show"
:
"查看"
},
"mediaType"
:
{
"vd"
:
"视频"
,
"ad"
:
"音频"
,
"qt"
:
"其它"
},
"usageType"
:
{
"kt"
:
"课堂"
,
"taxkt"
:
"财税课堂"
,
"qt"
:
"其它"
},
"opstatus"
:
{
"0"
:
"失败"
,
"1"
:
"成功"
},
"sex"
:
{
"male"
:
"男"
,
"female"
:
"女"
},
"logLevel"
:
{
"debug"
:
0
,
"info"
:
1
,
"warn"
:
2
,
"error"
:
3
,
"fatal"
:
4
},
"msgType"
:
{
"sys"
:
"系统"
,
"single"
:
"单点"
,
"multi"
:
"群发"
},
"node_type"
:
{
"org"
:
"组织"
,
"arc"
:
"文档"
},
"source"
:
{
//渠道来源
"tencentCloud"
:
"腾讯云"
},
},
"businessType"
:
{
//商机类型
"companyCase"
:
"公司注册"
,
"psCase"
:
"云上园区注册"
,
"psCase"
:
"云上园区注册"
,
// "psCase": "个体户注册",
// "soleCase": "个人独资企业注册",
"agentCase"
:
"代理记账"
,
...
...
@@ -37,55 +37,55 @@ module.exports = {
"isClosed"
:
"已关闭"
},
"deliverStatus"
:
{
//交付单状态
"received"
:
"已接单"
,
//接单日期,公司注册云上园区
"collecting"
:
"收集工商注册材料"
,
//请配合顾问尽快提供,公司注册
"uploading"
:
"上传注册材料"
,
//请配合顾问尽快提供,云上园区注册
"checking"
:
"园区入驻审核"
,
//1个工作日完成,云上园区注册
"auditing"
:
"工商审核环节"
,
//10个工作日内,公司注册、云上园区
"engraving"
:
"刻章环节"
,
//5个工作日内,只有选择了刻章服务时才有该状态
"posting"
:
"证件邮寄环节"
,
//3个工作日内,公司注册、云上园区
"paid"
:
"已付款"
,
//增值服务
"inservice"
:
"已交付"
,
//增值服务
"success"
:
"已完成"
,
//税务报道、税控申请、银行开户、工商年报、工商变更、社保开户、刻章服务
"signed"
:
"已签收"
,
//公司注册、云上园区
"expired"
:
"已到期"
,
//代理记账、注册地址
"closed"
:
"关闭交付"
//只有在已接单和收集工商注册材料阶段才能关闭交付
"received"
:
"已接单"
,
//接单日期,公司注册云上园区
"collecting"
:
"收集工商注册材料"
,
//请配合顾问尽快提供,公司注册
"uploading"
:
"上传注册材料"
,
//请配合顾问尽快提供,云上园区注册
"checking"
:
"园区入驻审核"
,
//1个工作日完成,云上园区注册
"auditing"
:
"工商审核环节"
,
//10个工作日内,公司注册、云上园区
"engraving"
:
"刻章环节"
,
//5个工作日内,只有选择了刻章服务时才有该状态
"posting"
:
"证件邮寄环节"
,
//3个工作日内,公司注册、云上园区
"paid"
:
"已付款"
,
//增值服务
"inservice"
:
"已交付"
,
//增值服务
"success"
:
"已完成"
,
//税务报道、税控申请、银行开户、工商年报、工商变更、社保开户、刻章服务
"signed"
:
"已签收"
,
//公司注册、云上园区
"expired"
:
"已到期"
,
//代理记账、注册地址
"closed"
:
"关闭交付"
//只有在已接单和收集工商注册材料阶段才能关闭交付
},
"diliverStatus1"
:
{
//公司注册交付单状态
"received"
:
"已接单"
,
//接单日期
"collecting"
:
"收集工商注册材料"
,
//请配合顾问尽快提供
"auditing"
:
"工商审核环节"
,
//10个工作日内
"engraving"
:
"刻章环节"
,
//5个工作日内,只有选择了刻章服务时才有该状态
"posting"
:
"证件邮寄环节"
,
//3个工作日内
"signed"
:
"已签收"
,
"closed"
:
"关闭交付"
//只有在已接单和收集工商注册材料阶段才能关闭交付
"received"
:
"已接单"
,
//接单日期
"collecting"
:
"收集工商注册材料"
,
//请配合顾问尽快提供
"auditing"
:
"工商审核环节"
,
//10个工作日内
"engraving"
:
"刻章环节"
,
//5个工作日内,只有选择了刻章服务时才有该状态
"posting"
:
"证件邮寄环节"
,
//3个工作日内
"signed"
:
"已签收"
,
"closed"
:
"关闭交付"
//只有在已接单和收集工商注册材料阶段才能关闭交付
},
"diliverSataus2"
:
{
//云上园区注册交付状态
"received"
:
"已接单"
,
//接单日期
"uploading"
:
"上传注册材料"
,
//请配合顾问尽快提供
"checking"
:
"园区入驻审核"
,
//1个工作日完成
"auditing"
:
"工商审核环节"
,
//10个工作日内
"engraving"
:
"刻章环节"
,
//5个工作日内,只有选择了刻章服务时才有该状态
"posting"
:
"证件邮寄环节"
,
//3个工作日内
"signed"
:
"已签收"
,
"closed"
:
"关闭交付"
//只有在已接单和收集工商注册材料阶段才能关闭交付
},
"diliverSataus3"
:{
// 税务报道、税控申请、银行开户、工商年报、工商变更、社保开户、刻章服务交付状态
"paid"
:
"已付款"
,
"received"
:
"已接单"
,
"inservice"
:
"已交付"
,
"completed"
:
"已完成"
},
"payStatus"
:{
//交付状态
"已交付"
:
"已交付"
,
"待交付"
:
"待交付"
,
"已关闭"
:
"已关闭"
"received"
:
"已接单"
,
//接单日期
"uploading"
:
"上传注册材料"
,
//请配合顾问尽快提供
"checking"
:
"园区入驻审核"
,
//1个工作日完成
"auditing"
:
"工商审核环节"
,
//10个工作日内
"engraving"
:
"刻章环节"
,
//5个工作日内,只有选择了刻章服务时才有该状态
"posting"
:
"证件邮寄环节"
,
//3个工作日内
"signed"
:
"已签收"
,
"closed"
:
"关闭交付"
//只有在已接单和收集工商注册材料阶段才能关闭交付
},
"diliverSataus3"
:
{
// 税务报道、税控申请、银行开户、工商年报、工商变更、社保开户、刻章服务交付状态
"paid"
:
"已付款"
,
"received"
:
"已接单"
,
"inservice"
:
"已交付"
,
"completed"
:
"已完成"
},
"payStatus"
:
{
//交付状态
"已交付"
:
"已交付"
,
"待交付"
:
"待交付"
,
"已关闭"
:
"已关闭"
},
"diliverSataus4"
:
{
//代理记账、注册地址交付状态
"paid"
:
"已付款"
,
"received"
:
"已接单"
,
"inservice"
:
"已交付"
,
"expired"
:
"已到期"
"paid"
:
"已付款"
,
"received"
:
"已接单"
,
"inservice"
:
"已交付"
,
"expired"
:
"已到期"
},
"registeredAreaDict"
:
{
//注册地区
"beijing"
:
"北京市"
,
...
...
@@ -102,11 +102,11 @@ module.exports = {
"shijiazhuang"
:
"石家庄市"
,
"jinhua"
:
"金华市"
,
"changzhou"
:
"常州市"
,
"nantong"
:
"南通市"
,
"nantong"
:
"南通市"
,
"xuzhou"
:
"徐州市"
,
"jiaxing"
:
"嘉兴市"
,
"taizhou"
:
"台州市"
,
"shaoxing"
:
"绍兴市"
,
"taizhou"
:
"台州市"
,
"shaoxing"
:
"绍兴市"
,
"taiyuan"
:
"太原市"
,
"yantai"
:
"烟台市"
,
"yangzhou"
:
"扬州市"
...
...
@@ -147,17 +147,17 @@ module.exports = {
"selfEmployed"
:
"个体工商户"
,
"soleProprietorship"
:
"个人独资企业"
},
"registeredParkDict"
:{
//注册园区
"shanghai"
:
"上海云上公司"
,
"beijing"
:
"北京云上公司"
"registeredParkDict"
:
{
//注册园区
"shanghai"
:
"上海云上公司"
,
"beijing"
:
"北京云上公司"
},
"sealSevTypeDict"
:
{
//刻章类型
"company"
:
"公司章"
,
"individual"
:
"个体工商户章"
"company"
:
"公司章"
,
"individual"
:
"个体工商户章"
},
"agentTypeDict"
:
{
//代理记账主体类型
"company"
:
"公司"
,
"individual"
:
"个体户"
"individual"
:
"个体户"
},
"buyDurationDict"
:
{
//购买时长
"buyDuration"
:
"1年"
,
...
...
@@ -165,51 +165,60 @@ module.exports = {
"isRenewDict"
:
{
//是否自动续费
"isRenew"
:
"开启"
,
},
"dyDict"
:{
//产品对应关系
"/ic/gsreg/"
:
"companyCase"
,
"/ic/kzfw/"
:
"sealSevCase"
,
"/ic/cpreg/"
:
"psCase"
,
"/ic/bankopen/"
:
"openBankAccountCase"
,
"/ic/swbd/"
:
"taxCase"
,
"/ic/sksq/"
:
"taxControlCase"
,
"/ic/dljz/"
:
"agentCase"
,
"/ic/regaddr/"
:
"regAddrCase"
,
"/ic/gsnb/"
:
"icCheckCase"
,
"/ic/gschangs/"
:
"icChangeCase"
,
"/ic/sbopen/"
:
"ssOpenCase"
},
"fdyDict"
:{
//产品反对应关系
"companyCase"
:
"/ic/gsreg/"
,
"sealSevCase"
:
"/ic/kzfw/"
,
"psCase"
:
"/ic/cpreg/"
,
"openBankAccountCase"
:
"/ic/bankopen/"
,
"taxCase"
:
"/ic/swbd/"
,
"taxControlCase"
:
"/ic/sksq/"
,
"agentCase"
:
"/ic/dljz/"
,
"regAddrCase"
:
"/ic/regaddr/"
,
"icCheckCase"
:
"/ic/gsnb/"
,
"icChangeCase"
:
"/ic/gschangs/"
,
"ssOpenCase"
:
"/ic/sbopen/"
},
"ddyDict"
:{
//和庄冰的交付单对应关系
"paid"
:
1
,
"received"
:
20
,
"inservice"
:
30
,
"collecting"
:
100
,
"uploading"
:
110
,
"checking"
:
120
,
"auditing"
:
130
,
"engraving"
:
140
,
"posting"
:
150
,
"signed"
:
160
,
"completed"
:
170
,
"expired"
:
180
,
"closed"
:
190
},
"flowType"
:{
"dyDict"
:
{
//产品对应关系
"/ic/gsreg/"
:
"companyCase"
,
"/ic/kzfw/"
:
"sealSevCase"
,
"/ic/cpreg/"
:
"psCase"
,
"/ic/bankopen/"
:
"openBankAccountCase"
,
"/ic/swbd/"
:
"taxCase"
,
"/ic/sksq/"
:
"taxControlCase"
,
"/ic/dljz/"
:
"agentCase"
,
"/ic/regaddr/"
:
"regAddrCase"
,
"/ic/gsnb/"
:
"icCheckCase"
,
"/ic/gschangs/"
:
"icChangeCase"
,
"/ic/sbopen/"
:
"ssOpenCase"
},
"fdyDict"
:
{
//产品反对应关系
"companyCase"
:
"/ic/gsreg/"
,
"sealSevCase"
:
"/ic/kzfw/"
,
"psCase"
:
"/ic/cpreg/"
,
"openBankAccountCase"
:
"/ic/bankopen/"
,
"taxCase"
:
"/ic/swbd/"
,
"taxControlCase"
:
"/ic/sksq/"
,
"agentCase"
:
"/ic/dljz/"
,
"regAddrCase"
:
"/ic/regaddr/"
,
"icCheckCase"
:
"/ic/gsnb/"
,
"icChangeCase"
:
"/ic/gschangs/"
,
"ssOpenCase"
:
"/ic/sbopen/"
},
"ddyDict"
:
{
//和庄冰的交付单对应关系
"paid"
:
1
,
"received"
:
20
,
"inservice"
:
30
,
"collecting"
:
100
,
"uploading"
:
110
,
"checking"
:
120
,
"auditing"
:
130
,
"engraving"
:
140
,
"posting"
:
150
,
"signed"
:
160
,
"completed"
:
170
,
"expired"
:
180
,
"closed"
:
190
},
"flowType"
:
{
"BIZ"
:
"BIZ"
,
//商机表
"SCHEME"
:
"SCHEME"
,
//方案表
"DELIVERY"
:
"DELIVERY"
//服务单表
},
settle_status
:
{
"waittosettle"
:
"待结算"
,
"settling"
:
"结算中"
,
"settled"
:
"已结算"
},
audit_status
:
{
"waittoaudit"
:
"待审核"
,
"audited"
:
"已审核"
,
}
}
}
...
...
ic-deliver/app/base/service/impl/bizchance/deliverybillSve.js
View file @
4b59539f
...
...
@@ -10,16 +10,20 @@ class DeliverybillService extends ServiceBase {
var
self
=
this
return
this
.
db
.
transaction
(
async
function
(
t
){
//先按照ids查询出交付单的合计服务成本
let
settleAmount
=
await
self
.
dao
.
model
.
findSum
(
"cost_price"
,{
where
:{
[
self
.
db
.
Op
.
In
]:
ids
},
transaction
:
t
})
let
settleAmount
=
await
self
.
dao
.
model
.
findSum
(
"cost_price"
,{
where
:{
id
:{[
self
.
db
.
Op
.
In
]:
ids
}
},
transaction
:
t
})
let
settlecode
=
await
self
.
getBusUid
(
"JSD"
)
let
settleObj
=
{
code
:
settlecode
,
settle_amount
:
settleAmount
,
}
//生成结算单,结算单状态为待审核
await
self
.
db
.
models
.
settlebill
.
create
(
settleObj
,{
transaction
:
t
})
let
newentity
=
await
self
.
db
.
models
.
settlebill
.
create
(
settleObj
,{
transaction
:
t
})
//然后按照ids更新交付单的状态为结算中,更新结算单的id到交付单表
await
self
.
updateByWhere
({
'settle_status'
:
'settling'
,
'settlebill_id'
:
newentity
.
id
},{
id
:{[
self
.
db
.
Op
.
In
]:
ids
}},
t
)
return
newentity
});
}
async
findAndCountAll
(
obj
)
{
...
...
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