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
19645d24
Commit
19645d24
authored
Jun 12, 2020
by
高宇强
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gyq
parent
0d76bb45
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
115 additions
and
197 deletions
+115
-197
ic-deliver/app/base/controller/impl/bizchance/bizoptCtl.js
+28
-21
ic-deliver/app/base/controller/impl/bizchance/deliverybillCtl.js
+5
-1
ic-deliver/app/base/controller/impl/bizchance/schemeCtl.js
+16
-19
ic-deliver/app/base/db/impl/bizchance/deliverybillDao.js
+46
-39
ic-deliver/app/base/db/impl/bizchance/schemeDao.js
+9
-105
ic-deliver/app/base/db/metadata/app/platform.js
+1
-2
ic-deliver/app/base/service/impl/bizchance/SchemeSve.js
+8
-8
ic-deliver/app/base/service/impl/bizchance/deliverybillSve.js
+2
-2
No files found.
ic-deliver/app/base/controller/impl/bizchance/bizoptCtl.js
View file @
19645d24
...
@@ -8,6 +8,7 @@ const appconfig = system.getSysConfig();
...
@@ -8,6 +8,7 @@ const appconfig = system.getSysConfig();
class
BizOptCtl
extends
CtlBase
{
class
BizOptCtl
extends
CtlBase
{
constructor
()
{
constructor
()
{
super
(
"bizchance"
,
CtlBase
.
getServiceName
(
BizOptCtl
));
super
(
"bizchance"
,
CtlBase
.
getServiceName
(
BizOptCtl
));
this
.
schemeService
=
system
.
getObject
(
"service.bizchance.schemeSve"
);
this
.
receiveUrl
=
"http://192.168.1.140:4011/api/receive/entService/springBoard"
;
this
.
receiveUrl
=
"http://192.168.1.140:4011/api/receive/entService/springBoard"
;
}
}
...
@@ -45,31 +46,36 @@ class BizOptCtl extends CtlBase {
...
@@ -45,31 +46,36 @@ class BizOptCtl extends CtlBase {
{
{
try
{
try
{
var
rs
=
await
this
.
service
.
findInfoByDemandCode
(
pobj
);
var
rs
=
await
this
.
service
.
findInfoByDemandCode
(
pobj
);
var
ms
=
await
this
.
schemeService
.
findInfoByDemandCode
(
pobj
);
var
rarr
=
{}
var
rarr
=
{}
if
(
rs
){
if
(
rs
){
rarr
.
id
=
rs
.
id
;
//数据的id
var
statusInfo
=
{
"currentStatus"
:
rs
.
business_status
};
//商机状态
rarr
.
businessMode
=
rs
.
demand_code
;
//商机编号
var
bussinessInfo
=
{};
rarr
.
channelSource
=
rs
.
source_name
;
//渠道来源
bussinessInfo
.
businessMode
=
rs
.
demand_code
;
//商机编号
rarr
.
businessType
=
rs
.
business_type
;
//商机类型代码
bussinessInfo
.
channelSource
=
rs
.
source_name
;
//渠道来源
rarr
.
businessName
=
appconfig
.
pdict
.
businessType
[
rarr
.
businessType
];
//商机类型名称
bussinessInfo
.
businessType
=
rs
.
business_type
;
//商机类型代码
rarr
.
currentStatus
=
rs
.
business_status
;
//商机状态
bussinessInfo
.
businessName
=
appconfig
.
pdict
.
businessType
[
rarr
.
businessType
];
//商机类型名称
rarr
.
serviceCode
=
rs
.
service_address
;
//服务地区
bussinessInfo
.
serviceCode
=
rs
.
service_address
;
//服务地区
if
(
rarr
.
businessName
==
"
园区注册"
){
if
(
bussinessInfo
.
businessName
==
"云上
园区注册"
){
rarr
.
serviceName
=
appconfig
.
pdict
.
registeredParkDict
[
rarr
.
serviceCode
];
//服务地区名称
bussinessInfo
.
serviceName
=
appconfig
.
pdict
.
registeredParkDict
[
bussinessInfo
.
serviceCode
];
//服务地区名称
}
}
else
{
else
{
rarr
.
serviceName
=
appconfig
.
pdict
.
registeredAreaDict
[
rarr
.
serviceCode
];
//服务地区名称
bussinessInfo
.
serviceName
=
appconfig
.
pdict
.
registeredAreaDict
[
bussinessInfo
.
serviceCode
];
//服务地区名称
}
}
rarr
.
statusReason
=
rs
.
close_reason
;
//商机关闭原因
bussinessInfo
.
statusReason
=
rs
.
close_reason
;
//商机关闭原因
rarr
.
clerkName
=
rs
.
salesman_name
;
//业务员名称
bussinessInfo
.
memoInfo
=
rs
.
business_info
.
memoInfo
;
//备注信息
rarr
.
clerkPhone
=
rs
.
salesman_phone
;
//业务员联系方式
bussinessInfo
.
contactsName
=
rs
.
business_info
.
contactsName
;
//联系人名称
rarr
.
memoInfo
=
rs
.
business_info
.
memoInfo
;
//备注信息
bussinessInfo
.
contactsPhone
=
rs
.
business_info
.
contactsPhone
;
//联系人联系方式
rarr
.
contactsName
=
rs
.
business_info
.
contactsName
;
//联系人名称
bussinessInfo
.
createdTime
=
this
.
timeFormat
(
rs
.
created_at
);
//商机创建时间
rarr
.
contactsPhone
=
rs
.
business_info
.
contactsPhone
;
//联系人联系方式
rarr
.
push
(
statusInfo
);
rarr
.
servicerCode
=
rs
.
facilitator_id
;
//服务商编码
rarr
.
push
(
bussinessInfo
);
rarr
.
servicerName
=
rs
.
facilitator_name
;
//服务商名称
}
rarr
.
createdTime
=
this
.
timeFormat
(
rs
.
created_at
);
//商机创建时间
if
(
ms
){
rarr
.
statusTime
=
this
.
timeFormat
(
rs
.
updated_at
);
//当前状态时间
var
planInfo
=
ms
.
scheme_info
;
planInfo
.
schemeNumber
=
ms
.
scheme_number
;
planInfo
.
currentStatus
=
ms
.
scheme_status
;
planInfo
.
statusReason
=
ms
.
reject_reason
;
rarr
.
push
(
planInfo
);
}
}
return
system
.
getResult
(
rarr
);
return
system
.
getResult
(
rarr
);
}
}
...
@@ -87,6 +93,7 @@ class BizOptCtl extends CtlBase {
...
@@ -87,6 +93,7 @@ class BizOptCtl extends CtlBase {
if
(
pobj
.
businessMode
&&
pobj
.
businessMode
!=
'undefined'
&&
pobj
.
currentStatus
&&
pobj
.
currentStatus
!=
'undefined'
){
if
(
pobj
.
businessMode
&&
pobj
.
businessMode
!=
'undefined'
&&
pobj
.
currentStatus
&&
pobj
.
currentStatus
!=
'undefined'
){
try
{
try
{
var
res
=
await
this
.
service
.
updateStatusByDemandCode
(
pobj
);
var
res
=
await
this
.
service
.
updateStatusByDemandCode
(
pobj
);
await
this
.
schemeService
.
updateStatusByDemandCode
(
pobj
);
//同时更新方案的状态
//调商城接口,回传状态信息,后加
//调商城接口,回传状态信息,后加
if
(
pobj
.
currentStatus
==
"isClosed"
){
if
(
pobj
.
currentStatus
==
"isClosed"
){
var
rc
=
system
.
getObject
(
"util.execClient"
);
var
rc
=
system
.
getObject
(
"util.execClient"
);
...
@@ -104,7 +111,7 @@ class BizOptCtl extends CtlBase {
...
@@ -104,7 +111,7 @@ class BizOptCtl extends CtlBase {
return
system
.
getResult
(
"操作成功!"
);
return
system
.
getResult
(
"操作成功!"
);
}
}
else
{
else
{
return
system
.
getResultError
(
"
提交方案
出错!"
);
return
system
.
getResultError
(
"
更新方案状态
出错!"
);
}
}
}
}
}
}
...
...
ic-deliver/app/base/controller/impl/bizchance/deliverybillCtl.js
View file @
19645d24
...
@@ -28,6 +28,7 @@ class DeliverybillCtl extends CtlBase {
...
@@ -28,6 +28,7 @@ class DeliverybillCtl extends CtlBase {
robj
.
sourceName
=
element
.
source_name
;
//渠道来源
robj
.
sourceName
=
element
.
source_name
;
//渠道来源
robj
.
channelNumber
=
element
.
source_number
;
//渠道编码
robj
.
channelNumber
=
element
.
source_number
;
//渠道编码
robj
.
baseInfo
=
element
.
delivery_info
;
//交付单详情
robj
.
baseInfo
=
element
.
delivery_info
;
//交付单详情
robj
.
payStatus
=
element
.
delivery_info
.
payStatus
;
//交付状态
if
(
robj
.
businessName
==
'公司注册'
){
if
(
robj
.
businessName
==
'公司注册'
){
if
(
robj
.
baseInfo
.
isWhether
==
"是"
||
robj
.
baseInfo
.
isVirtual
==
"是"
){
//如果有刻章需求或者是虚拟地址
if
(
robj
.
baseInfo
.
isWhether
==
"是"
||
robj
.
baseInfo
.
isVirtual
==
"是"
){
//如果有刻章需求或者是虚拟地址
robj
.
relatedProducts
=
'有'
;
robj
.
relatedProducts
=
'有'
;
...
@@ -230,7 +231,7 @@ class DeliverybillCtl extends CtlBase {
...
@@ -230,7 +231,7 @@ class DeliverybillCtl extends CtlBase {
}
}
/*根据交付单编号更新交付单状态*/
/*根据交付单编号更新交付单状态*/
async
update
Info
ByDeliverCode
(
pobj
,
qobj
,
req
){
async
update
Status
ByDeliverCode
(
pobj
,
qobj
,
req
){
if
(
pobj
.
deliverNumber
&&
pobj
.
deliverNumber
!=
'undefined'
&&
pobj
.
deliverStatus
&&
pobj
.
deliverStatus
!=
'undefined'
){
if
(
pobj
.
deliverNumber
&&
pobj
.
deliverNumber
!=
'undefined'
&&
pobj
.
deliverStatus
&&
pobj
.
deliverStatus
!=
'undefined'
){
try
{
try
{
var
res
=
await
this
.
service
.
updateInfoByDeliverCode
(
pobj
);
var
res
=
await
this
.
service
.
updateInfoByDeliverCode
(
pobj
);
...
@@ -247,6 +248,9 @@ class DeliverybillCtl extends CtlBase {
...
@@ -247,6 +248,9 @@ class DeliverybillCtl extends CtlBase {
}
}
}
}
/*根据插入交付单信息*/
async
insertInfo
(
pobj
,
qobj
,
req
){
async
insertInfo
(
pobj
,
qobj
,
req
){
if
(
pobj
.
businessMode
&&
pobj
.
businessMode
!=
'undefined'
&&
pobj
.
schemeNumber
&&
pobj
.
schemeNumber
!=
'undefined'
){
if
(
pobj
.
businessMode
&&
pobj
.
businessMode
!=
'undefined'
&&
pobj
.
schemeNumber
&&
pobj
.
schemeNumber
!=
'undefined'
){
try
{
try
{
...
...
ic-deliver/app/base/controller/impl/bizchance/schemeCtl.js
View file @
19645d24
...
@@ -94,11 +94,11 @@ class SchemeCtl extends CtlBase {
...
@@ -94,11 +94,11 @@ class SchemeCtl extends CtlBase {
}
}
}
}
/*根据
方案
编号获取方案详情*/
/*根据
商机
编号获取方案详情*/
async
findInfoBy
SchemeNumber
(
pobj
,
qobj
,
req
){
async
findInfoBy
DemandCode
(
pobj
,
qobj
,
req
){
if
(
pobj
.
schemeNumber
&&
pobj
.
schemeNumber
!=
'undefined'
){
if
(
pobj
.
businessMode
&&
pobj
.
businessMode
!=
'undefined'
){
try
{
try
{
var
rs
=
await
this
.
service
.
findInfoBy
SchemeNumber
(
pobj
);
var
rs
=
await
this
.
service
.
findInfoBy
DemandCode
(
pobj
);
var
rarr
=
{}
var
rarr
=
{}
if
(
rs
){
if
(
rs
){
rarr
.
businessMode
=
rs
.
demand_code
;
//商机编号
rarr
.
businessMode
=
rs
.
demand_code
;
//商机编号
...
@@ -175,11 +175,11 @@ class SchemeCtl extends CtlBase {
...
@@ -175,11 +175,11 @@ class SchemeCtl extends CtlBase {
}
}
}
}
/* 根据
方案
编号更新方案状态及原因 */
/* 根据
商机
编号更新方案状态及原因 */
async
updateStatusBy
SchemeNumber
(
pobj
,
qobj
,
req
){
async
updateStatusBy
DemandCode
(
pobj
,
qobj
,
req
){
if
(
pobj
.
schemeNumber
&&
pobj
.
schemeNumber
!=
'undefined'
&&
pobj
.
currentStatus
&&
pobj
.
currentStatus
!=
'undefined'
){
if
(
pobj
.
businessMode
&&
pobj
.
businessMode
!=
'undefined'
&&
pobj
.
currentStatus
&&
pobj
.
currentStatus
!=
'undefined'
){
try
{
try
{
await
this
.
service
.
updateStatusBy
SchemeNumber
(
pobj
);
await
this
.
service
.
updateStatusBy
DemandCode
(
pobj
);
return
system
.
getResult
(
"更新成功!"
);
return
system
.
getResult
(
"更新成功!"
);
}
}
catch
(
error
){
catch
(
error
){
...
@@ -191,17 +191,14 @@ class SchemeCtl extends CtlBase {
...
@@ -191,17 +191,14 @@ class SchemeCtl extends CtlBase {
}
}
}
}
/*根据
方案
编号更新方案详情*/
/*根据
商机
编号更新方案详情*/
async
updateInfoBy
SchemeNumber
(
pobj
,
qobj
,
req
){
async
updateInfoBy
DemandCode
(
pobj
,
qobj
,
req
){
if
(
pobj
.
schemeNumber
&&
pobj
.
schemeNumber
!=
'undefined'
){
if
(
pobj
.
businessMode
&&
pobj
.
businessMode
!=
'undefined'
&&
pobj
.
planInfo
&&
pobj
.
planInfo
!=
'undefined'
){
try
{
try
{
var
retn
=
await
this
.
service
.
updateInfoBySchemeNumber
(
pobj
);
var
retn
=
await
this
.
service
.
updateInfoByDemandCode
(
pobj
);
if
(
retn
==
-
1
){
var
bobj
=
{
"businessMode"
:
pobj
.
businessMode
,
"currentStatus"
:
"beforeSubmission"
};
//把商机状态更新回待提交方案
return
system
.
getResultError
(
"要更新的数据不存在!"
);
await
this
.
bizoptService
.
updateStatusByDemandCode
(
bobj
);
}
return
system
.
getResult
(
"更新成功!"
);
else
{
return
system
.
getResult
(
"更新成功!"
);
}
}
}
catch
(
error
){
catch
(
error
){
return
system
.
getResultError
(
error
);
return
system
.
getResultError
(
error
);
...
@@ -244,7 +241,7 @@ class SchemeCtl extends CtlBase {
...
@@ -244,7 +241,7 @@ class SchemeCtl extends CtlBase {
pobj
.
clerkId
=
businessInfo
.
salesman_id
;
//业务员id
pobj
.
clerkId
=
businessInfo
.
salesman_id
;
//业务员id
pobj
.
clerkName
=
businessInfo
.
salesman_name
;
//业务员名称
pobj
.
clerkName
=
businessInfo
.
salesman_name
;
//业务员名称
pobj
.
clerkPhone
=
businessInfo
.
salesman_phone
;
//业务员联系电话
pobj
.
clerkPhone
=
businessInfo
.
salesman_phone
;
//业务员联系电话
pobj
.
currentStatus
=
businessInfo
.
business_status
;
//商机状态即为方案状态
pobj
.
currentStatus
=
appconfig
.
pdict
.
businessStatus
[
businessInfo
.
business_status
]
;
//商机状态即为方案状态
pobj
.
statusReason
=
businessInfo
.
close_reason
;
//状态原因
pobj
.
statusReason
=
businessInfo
.
close_reason
;
//状态原因
}
}
var
mobj
=
pobj
;
var
mobj
=
pobj
;
...
...
ic-deliver/app/base/db/impl/bizchance/deliverybillDao.js
View file @
19645d24
...
@@ -26,7 +26,7 @@ class DeliverybillDao extends Dao {
...
@@ -26,7 +26,7 @@ class DeliverybillDao extends Dao {
}
}
/*根据交付单编号更新状态信息*/
/*根据交付单编号更新状态信息*/
async
update
Info
ByDeliverCode
(
qobj
,
t
){
async
update
Status
ByDeliverCode
(
qobj
,
t
){
var
setobj
=
{
"delivery_status"
:
qobj
.
deliverStatus
};
var
setobj
=
{
"delivery_status"
:
qobj
.
deliverStatus
};
if
(
qobj
.
statusReason
&&
qobj
.
statusReason
!=
'undefined'
){
if
(
qobj
.
statusReason
&&
qobj
.
statusReason
!=
'undefined'
){
setobj
.
close_reason
=
qobj
.
statusReason
;
setobj
.
close_reason
=
qobj
.
statusReason
;
...
@@ -35,20 +35,27 @@ class DeliverybillDao extends Dao {
...
@@ -35,20 +35,27 @@ class DeliverybillDao extends Dao {
return
await
this
.
updateByWhere
(
setobj
,
whereobj
,
t
);
return
await
this
.
updateByWhere
(
setobj
,
whereobj
,
t
);
}
}
// /*根据交付单更新交付材料信息*/
// async UpdateInfoByDeliverCode(qobj,t){
// // var
// }
/*插入交付单信息*/
/*插入交付单信息*/
async
insertInfo
(
qobj
,
t
){
async
insertInfo
(
qobj
,
t
){
//到时候看交付单信息后再确定
var
obj
=
{
var
obj
=
{
"demand_code"
:
qobj
.
businessMode
,
"demand_code"
:
qobj
.
businessMode
,
"scheme_number"
:
qobj
.
schemeNumber
"scheme_number"
:
qobj
.
schemeNumber
,
"delivery_code"
:
qobj
.
deliverNumber
,
"delivery_status"
:
"received"
};
};
if
(
qobj
.
deliverNumber
&&
qobj
.
deliverNumber
!=
'undefined'
){
obj
.
delivery_code
=
qobj
.
deliverNumber
;
}
if
(
qobj
.
businessName
&&
qobj
.
businessName
!=
'undefined'
){
if
(
qobj
.
businessName
&&
qobj
.
businessName
!=
'undefined'
){
obj
.
product_name
=
qobj
.
businessName
;
obj
.
product_name
=
qobj
.
businessName
;
}
}
if
(
qobj
.
businessType
&&
qobj
.
businessType
!=
'undefined'
){
if
(
qobj
.
businessType
&&
qobj
.
businessType
!=
'undefined'
){
obj
.
product_code
=
qobj
.
businessType
;
obj
.
product_code
=
qobj
.
businessType
;
//if (qobj.businessType == "companyCase" || qobj.businessType == "psCase"){
obj
.
delivery_info
.
payStatus
=
"待交付"
;
//}
}
}
if
(
qobj
.
channelSource
&&
qobj
.
channelSource
!=
'undefined'
){
if
(
qobj
.
channelSource
&&
qobj
.
channelSource
!=
'undefined'
){
obj
.
source_name
=
qobj
.
channelSource
;
obj
.
source_name
=
qobj
.
channelSource
;
...
@@ -83,45 +90,45 @@ class DeliverybillDao extends Dao {
...
@@ -83,45 +90,45 @@ class DeliverybillDao extends Dao {
if
(
qobj
.
payAmount
&&
qobj
.
payAmount
!=
'undefined'
){
if
(
qobj
.
payAmount
&&
qobj
.
payAmount
!=
'undefined'
){
obj
.
selling_price
=
qobj
.
payAmount
;
obj
.
selling_price
=
qobj
.
payAmount
;
}
}
if
(
qobj
.
deliverStatus
&&
qobj
.
deliverStatus
!=
'undefined'
){
//
if (qobj.deliverStatus && qobj.deliverStatus != 'undefined'){
obj
.
delivery_status
=
qobj
.
deliverStatus
;
//
obj.delivery_status = qobj.deliverStatus;
}
//
}
if
(
qobj
.
costPrice
&&
qobj
.
costPrice
!=
'undefined'
){
if
(
qobj
.
costPrice
&&
qobj
.
costPrice
!=
'undefined'
){
obj
.
cost_price
=
qobj
.
costPrice
;
obj
.
cost_price
=
qobj
.
costPrice
;
}
}
if
(
qobj
.
statusReason
&&
qobj
.
statusReason
!=
'undefined'
){
if
(
qobj
.
statusReason
&&
qobj
.
statusReason
!=
'undefined'
){
obj
.
close_reason
=
qobj
.
statusReason
;
obj
.
close_reason
=
qobj
.
statusReason
;
}
}
if
(
qobj
.
isWhether
&&
qobj
.
isWhether
!=
'undefined'
){
//
if (qobj.isWhether && qobj.isWhether != 'undefined'){
obj
.
delivery_info
.
isWhether
=
qobj
.
isWhether
;
//
obj.delivery_info.isWhether = qobj.isWhether;
}
//
}
if
(
qobj
.
isVirtual
&&
qobj
.
isVirtual
!=
'undefined'
){
//
if (qobj.isVirtual && qobj.isVirtual != 'undefined'){
obj
.
delivery_info
.
isVirtual
=
qobj
.
isVirtual
;
//
obj.delivery_info.isVirtual = qobj.isVirtual;
}
//
}
if
(
qobj
.
officialSeal
&&
qobj
.
officialSeal
!=
'undefined'
){
//
if (qobj.officialSeal && qobj.officialSeal != 'undefined'){
obj
.
delivery_info
.
officialSeal
=
qobj
.
officialSeal
;
//
obj.delivery_info.officialSeal = qobj.officialSeal;
}
//
}
if
(
qobj
.
businessLicense
&&
qobj
.
businessLicense
!=
'undefined'
){
//
if (qobj.businessLicense && qobj.businessLicense != 'undefined'){
obj
.
delivery_info
.
businessLicense
=
obj
.
businessLicense
;
//
obj.delivery_info.businessLicense = obj.businessLicense;
}
//
}
if
(
qobj
.
taxpayerType
&&
qobj
.
taxpayerType
!=
'undefined'
){
//
if (qobj.taxpayerType && qobj.taxpayerType != 'undefined'){
obj
.
delivery_info
.
taxpayerType
=
qobj
.
taxpayerType
;
//
obj.delivery_info.taxpayerType = qobj.taxpayerType;
}
//
}
if
(
qobj
.
whetherType
&&
qobj
.
whetherType
!=
'undefined'
){
//
if (qobj.whetherType && qobj.whetherType != 'undefined'){
obj
.
delivery_info
.
whetherType
=
qobj
.
whetherType
;
//
obj.delivery_info.whetherType = qobj.whetherType;
}
//
}
if
(
qobj
.
subjectType
&&
qobj
.
subjectType
!=
'undefined'
){
//
if (qobj.subjectType && qobj.subjectType != 'undefined'){
obj
.
delivery_info
.
subjectType
=
qobj
.
subjectType
;
//
obj.delivery_info.subjectType = qobj.subjectType;
}
//
}
if
(
qobj
.
buyTime
&&
qobj
.
buyTime
!=
'undefined'
){
//
if (qobj.buyTime && qobj.buyTime != 'undefined'){
obj
.
delivery_info
.
buyTime
=
qobj
.
buyTime
;
//
obj.delivery_info.buyTime = qobj.buyTime;
}
//
}
if
(
qobj
.
buyDuration
&&
qobj
.
buyDuration
!=
'undefined'
){
//
if (qobj.buyDuration && qobj.buyDuration != 'undefined'){
obj
.
delivery_info
.
buyDuration
=
qobj
.
buyDuration
;
//
obj.delivery_info.buyDuration = qobj.buyDuration;
}
//
}
if
(
qobj
.
isRenew
&&
qobj
.
isRenew
!=
'undefined'
){
//
if (qobj.isRenew && qobj.isRenew != 'undefined'){
obj
.
delivery_info
.
isRenew
=
qobj
.
isRenew
;
//
obj.delivery_info.isRenew = qobj.isRenew;
}
//
}
if
(
qobj
.
contactsName
&&
qobj
.
contactsName
!=
'undefined'
){
if
(
qobj
.
contactsName
&&
qobj
.
contactsName
!=
'undefined'
){
obj
.
delivery_info
.
contactsName
=
qobj
.
contactsName
;
obj
.
delivery_info
.
contactsName
=
qobj
.
contactsName
;
}
}
...
...
ic-deliver/app/base/db/impl/bizchance/schemeDao.js
View file @
19645d24
...
@@ -5,123 +5,27 @@ class SchemeDao extends Dao {
...
@@ -5,123 +5,27 @@ class SchemeDao extends Dao {
super
(
Dao
.
getModelName
(
SchemeDao
));
super
(
Dao
.
getModelName
(
SchemeDao
));
}
}
/*根据
方案
编号获取方案信息详情*/
/*根据
商机
编号获取方案信息详情*/
async
findInfoBy
SchemeNumber
(
qobj
){
async
findInfoBy
DemandCode
(
qobj
){
var
qcwhere
=
{
"
scheme_number"
:
qobj
.
schemeNumber
};
var
qcwhere
=
{
"
demand_code"
:
qobj
.
businessMode
};
return
await
this
.
findOne
(
qcwhere
);
return
await
this
.
findOne
(
qcwhere
);
}
}
/*根据方案编号更新方案状态及原因*/
/*根据方案编号更新方案状态及原因*/
async
updateStatusBy
SchemeNumber
(
qobj
,
t
){
async
updateStatusBy
DemandCode
(
qobj
,
t
){
var
setobj
=
{
"scheme_status"
:
qobj
.
currentStatus
};
var
setobj
=
{
"scheme_status"
:
qobj
.
currentStatus
};
if
(
qobj
.
statusReason
&&
qobj
.
statusReason
!=
'undefined'
){
if
(
qobj
.
statusReason
&&
qobj
.
statusReason
!=
'undefined'
){
setobj
[
"reject_reason"
]
=
qobj
.
statusReason
;
setobj
[
"reject_reason"
]
=
qobj
.
statusReason
;
}
}
var
whereobj
=
{
"
scheme_number"
:
qobj
.
schemeNumber
};
var
whereobj
=
{
"
demand_code"
:
qobj
.
businessMode
};
return
await
this
.
updateByWhere
(
setobj
,
whereobj
,
t
);
return
await
this
.
updateByWhere
(
setobj
,
whereobj
,
t
);
}
}
/*根据方案编号更新方案详情*/
/*根据方案编号更新方案详情*/
async
updateInfoBySchemeNumber
(
qobj
,
t
){
async
updateInfoByDemandCode
(
qobj
,
t
){
var
whereobj
=
{
"scheme_number"
:
qobj
.
schemeNumber
};
var
whereobj
=
{
"demand_code"
:
qobj
.
businessMode
};
var
setobj
=
await
this
.
findOne
(
whereobj
);
var
setobj
=
{
"scheme_info"
:
qobj
.
planInfo
};
if
(
setobj
){
return
await
this
.
updateByWhere
(
setobj
,
whereobj
,
t
);
if
(
qobj
.
businessMode
&&
qobj
.
businessMode
!=
'undefined'
){
setobj
.
demand_code
=
qobj
.
businessMode
;
}
if
(
qobj
.
statusReason
&&
qobj
.
statusReason
!=
'undefined'
){
setobj
.
reject_reason
=
qobj
.
statusReason
;
}
if
(
qobj
.
memoInfo
&&
qobj
.
memoInfo
!=
'undefined'
){
setobj
.
remark_info
=
qobj
.
memoInfo
;
}
if
(
qobj
.
businessId
&&
qobj
.
businessId
!=
'undefined'
){
setobj
.
bizopt_id
=
qobj
.
businessId
;
}
if
(
qobj
.
servicerCode
&&
qobj
.
servicerCode
!=
'undefined'
){
setobj
.
facilitator_id
=
qobj
.
servicerCode
;
}
if
(
qobj
.
servicerName
&&
qobj
.
servicerName
!=
'undefined'
){
setobj
.
facilitator_name
=
qobj
.
servicerName
;
}
if
(
qobj
.
clerkOpcode
&&
qobj
.
clerkOpcode
!=
'undefined'
){
setobj
.
salesman_opcode
=
qobj
.
clerkOpcode
;
}
if
(
qobj
.
clerkId
&&
qobj
.
clerkId
!=
'undefined'
){
setobj
.
salesman_id
=
qobj
.
clerkId
;
}
if
(
qobj
.
clerkName
&&
qobj
.
clerkName
!=
'undefined'
){
setobj
.
salesman_name
=
qobj
.
clerkName
;
}
if
(
qobj
.
clerkPhone
&&
qobj
.
clerkPhone
!=
'undefined'
){
setobj
.
salesman_phone
=
qobj
.
clerkPhone
;
}
if
(
qobj
.
taxpayerType
&&
qobj
.
taxpayerType
!=
'undefined'
){
setobj
.
scheme_info
.
taxpayerType
=
qobj
.
taxpayerType
;
}
if
(
qobj
.
registeredType
&&
qobj
.
registeredType
!=
'undefined'
){
setobj
.
scheme_info
.
registeredType
=
qobj
.
registeredType
;
}
if
(
qobj
.
companyProperties
&&
qobj
.
companyProperties
!=
'undefined'
){
setobj
.
scheme_info
.
companyProperties
=
qobj
.
companyProperties
;
}
if
(
qobj
.
engagedIndustry
&&
qobj
.
engagedIndustry
!=
'undefined'
){
setobj
.
scheme_info
.
engagedIndustry
=
qobj
.
engagedIndustry
;
}
if
(
qobj
.
addressType
&&
qobj
.
addressType
!=
'undefined'
){
setobj
.
scheme_info
.
addressType
=
qobj
.
addressType
;
}
if
(
qobj
.
fullAddress
&&
qobj
.
fullAddress
!=
'undefined'
){
setobj
.
scheme_info
.
fullAddress
=
qobj
.
fullAddress
;
}
if
(
qobj
.
businessScope
&&
qobj
.
businessScope
!=
'undefined'
){
setobj
.
scheme_info
.
businessScope
=
qobj
.
businessScope
;
}
if
(
qobj
.
isWhether
&&
qobj
.
isWhether
!=
'undefined'
){
setobj
.
scheme_info
.
isWhether
=
qobj
.
isWhether
;
}
if
(
qobj
.
whetherType
&&
qobj
.
whetherType
!=
'undefined'
){
setobj
.
scheme_info
.
whetherType
=
qobj
.
whetherType
;
}
if
(
qobj
.
subjectType
&&
qobj
.
subjectType
!=
'undefined'
){
setobj
.
scheme_info
.
subjectType
=
qobj
.
subjectType
;
}
if
(
qobj
.
buyTime
&&
qobj
.
buyTime
!=
'undefined'
){
setobj
.
scheme_info
.
buyTime
=
qobj
.
buyTime
;
}
if
(
qobj
.
buyDuration
&&
qobj
.
buyDuration
!=
'undefined'
){
setobj
.
scheme_info
.
buyDuration
=
qobj
.
buyDuration
;
}
if
(
qobj
.
isRenew
&&
qobj
.
isRenew
!=
'undefined'
){
setobj
.
scheme_info
.
isRenew
=
qobj
.
isRenew
;
}
if
(
qobj
.
creditCode
&&
qobj
.
creditCode
!=
'undefined'
){
setobj
.
scheme_info
.
creditCode
=
qobj
.
creditCode
;
}
if
(
qobj
.
companyType
&&
qobj
.
companyType
!=
'undefined'
){
setobj
.
scheme_info
.
companyType
=
qobj
.
companyType
;
}
if
(
qobj
.
establishedTime
&&
qobj
.
establishedTime
!=
'undefined'
){
setobj
.
scheme_info
.
establishedTime
=
qobj
.
establishedTime
;
}
if
(
qobj
.
registeredCapital
&&
qobj
.
registeredCapital
!=
'undefined'
){
setobj
.
scheme_info
.
registeredCapital
=
qobj
.
registeredCapital
;
}
if
(
qobj
.
shareholderName
&&
qobj
.
shareholderName
!=
'undefined'
){
setobj
.
scheme_info
.
shareholderName
=
qobj
.
shareholderName
;
}
if
(
qobj
.
businessTerm
&&
qobj
.
businessTerm
!=
'undefined'
){
setobj
.
scheme_info
.
businessTerm
=
qobj
.
businessTerm
;
}
if
(
qobj
.
residenceAddress
&&
qobj
.
residenceAddress
!=
'undefined'
){
setobj
.
scheme_info
.
residenceAddress
=
qobj
.
residenceAddress
;
}
return
await
this
.
updateByWhere
(
setobj
,
whereobj
,
t
);
}
else
{
return
-
1
;
}
}
}
/*根据商机编号更新方案编号*/
/*根据商机编号更新方案编号*/
...
...
ic-deliver/app/base/db/metadata/app/platform.js
View file @
19645d24
...
@@ -17,7 +17,7 @@ module.exports = {
...
@@ -17,7 +17,7 @@ module.exports = {
},
},
"businessType"
:
{
//商机类型
"businessType"
:
{
//商机类型
"companyCase"
:
"公司注册"
,
"companyCase"
:
"公司注册"
,
"psCase"
:
"园区注册"
,
"psCase"
:
"
云上
园区注册"
,
// "psCase": "个体户注册",
// "psCase": "个体户注册",
// "soleCase": "个人独资企业注册",
// "soleCase": "个人独资企业注册",
"agentCase"
:
"代理记账"
,
"agentCase"
:
"代理记账"
,
...
@@ -34,7 +34,6 @@ module.exports = {
...
@@ -34,7 +34,6 @@ module.exports = {
"beforeSubmission"
:
"待提交方案"
,
"beforeSubmission"
:
"待提交方案"
,
"beforeConfirmation"
:
"待用户确认"
,
"beforeConfirmation"
:
"待用户确认"
,
"isFinished"
:
"已成交"
,
"isFinished"
:
"已成交"
,
"isexpired"
:
"已到期"
,
// 注册地址和代理记账
"isClosed"
:
"已关闭"
"isClosed"
:
"已关闭"
},
},
"deliverStatus"
:
{
//交付单状态
"deliverStatus"
:
{
//交付单状态
...
...
ic-deliver/app/base/service/impl/bizchance/SchemeSve.js
View file @
19645d24
...
@@ -19,23 +19,23 @@ class SchemeService extends ServiceBase {
...
@@ -19,23 +19,23 @@ class SchemeService extends ServiceBase {
}
}
/*根据方案编号获取方案详情*/
/*根据方案编号获取方案详情*/
async
findInfoBy
SchemeNumber
(
qobj
){
async
findInfoBy
DemandCode
(
qobj
){
return
await
this
.
dao
.
findInfoBy
SchemeNumber
(
qobj
);
return
await
this
.
dao
.
findInfoBy
DemandCode
(
qobj
);
}
}
/* 根据
方案编
号更新方案状态及原因 */
/* 根据
商机编号
号更新方案状态及原因 */
async
updateStatusBy
SchemeNumber
(
qobj
){
async
updateStatusBy
DemandCode
(
qobj
){
var
self
=
this
;
var
self
=
this
;
return
self
.
db
.
transaction
(
async
function
(
t
)
{
return
self
.
db
.
transaction
(
async
function
(
t
)
{
return
await
self
.
dao
.
updateStatusBy
SchemeNumber
(
qobj
,
t
);
return
await
self
.
dao
.
updateStatusBy
DemandCode
(
qobj
,
t
);
});
});
}
}
/*根据
方案
编号更新方案详情*/
/*根据
商机
编号更新方案详情*/
async
updateInfoBy
SchemeNumber
(
qobj
){
async
updateInfoBy
DemandCode
(
qobj
){
var
self
=
this
;
var
self
=
this
;
return
self
.
db
.
transaction
(
async
function
(
t
)
{
return
self
.
db
.
transaction
(
async
function
(
t
)
{
return
await
self
.
dao
.
updateInfoBy
SchemeNumber
(
qobj
,
t
);
return
await
self
.
dao
.
updateInfoBy
DemandCode
(
qobj
,
t
);
});
});
}
}
...
...
ic-deliver/app/base/service/impl/bizchance/deliverybillSve.js
View file @
19645d24
...
@@ -18,10 +18,10 @@ class DeliverybillService extends ServiceBase {
...
@@ -18,10 +18,10 @@ class DeliverybillService extends ServiceBase {
}
}
/* 根据交付单编号更新交付单状态 */
/* 根据交付单编号更新交付单状态 */
async
update
Info
ByDeliverCode
(
qobj
){
async
update
Status
ByDeliverCode
(
qobj
){
var
self
=
this
;
var
self
=
this
;
return
self
.
db
.
transaction
(
async
function
(
t
)
{
return
self
.
db
.
transaction
(
async
function
(
t
)
{
return
await
self
.
dao
.
update
Info
ByDeliverCode
(
qobj
,
t
);
return
await
self
.
dao
.
update
Status
ByDeliverCode
(
qobj
,
t
);
});
});
}
}
...
...
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