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
a9a21164
Commit
a9a21164
authored
Dec 25, 2019
by
宋毅
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tj
parent
f91114fe
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
23 additions
and
15 deletions
+23
-15
igirl-channel/app/base/api/impl/action/receiveData.js
+1
-1
igirl-channel/app/base/api/impl/action/tmOrder.js
+2
-2
igirl-channel/app/base/api/impl/action/tmQuery.js
+1
-1
igirl-channel/app/base/api/impl/action/tmTools.js
+1
-1
igirl-channel/app/base/service/impl/dborder/ordertmproductSve.js
+18
-10
No files found.
igirl-channel/app/base/api/impl/action/receiveData.js
View file @
a9a21164
...
@@ -37,7 +37,7 @@ class ReceiveDataAPI extends APIBase {
...
@@ -37,7 +37,7 @@ class ReceiveDataAPI extends APIBase {
case
"1688"
:
//1688
case
"1688"
:
//1688
result
=
await
this
.
opActionProcess
(
pobj
.
actionProcess
,
pobj
.
actionType
,
pobj
.
actionBody
,
pobj
,
req
);
result
=
await
this
.
opActionProcess
(
pobj
.
actionProcess
,
pobj
.
actionType
,
pobj
.
actionBody
,
pobj
,
req
);
break
;
break
;
case
"gsb
"
:
//gsb
case
"gsb
home"
:
//gsb_homepage
result
=
await
this
.
opActionProcess
(
pobj
.
actionProcess
,
pobj
.
actionType
,
pobj
.
actionBody
,
pobj
,
req
);
result
=
await
this
.
opActionProcess
(
pobj
.
actionProcess
,
pobj
.
actionType
,
pobj
.
actionBody
,
pobj
,
req
);
break
;
break
;
default
:
default
:
...
...
igirl-channel/app/base/api/impl/action/tmOrder.js
View file @
a9a21164
...
@@ -38,7 +38,7 @@ class TmOrderAPI extends APIBase {
...
@@ -38,7 +38,7 @@ class TmOrderAPI extends APIBase {
case
"1688"
:
//1688
case
"1688"
:
//1688
result
=
await
this
.
opActionProcess
(
pobj
.
actionProcess
,
pobj
.
actionType
,
pobj
.
actionBody
,
pobj
,
req
);
result
=
await
this
.
opActionProcess
(
pobj
.
actionProcess
,
pobj
.
actionType
,
pobj
.
actionBody
,
pobj
,
req
);
break
;
break
;
case
"gsb
"
:
//1688
case
"gsb
home"
:
//gsb_homepage
result
=
await
this
.
opActionProcess
(
pobj
.
actionProcess
,
pobj
.
actionType
,
pobj
.
actionBody
,
pobj
,
req
);
result
=
await
this
.
opActionProcess
(
pobj
.
actionProcess
,
pobj
.
actionType
,
pobj
.
actionBody
,
pobj
,
req
);
break
;
break
;
default
:
default
:
...
@@ -109,7 +109,7 @@ class TmOrderAPI extends APIBase {
...
@@ -109,7 +109,7 @@ class TmOrderAPI extends APIBase {
opResult
=
await
this
.
ordertmproductSve
.
get1688ChannelOrder
(
action_body
);
opResult
=
await
this
.
ordertmproductSve
.
get1688ChannelOrder
(
action_body
);
break
;
break
;
case
"subTmOrder"
:
//商标提报
case
"subTmOrder"
:
//商标提报
opResult
=
await
this
.
ordertmproductSve
.
addTmOrder
(
action_body
);
opResult
=
await
this
.
ordertmproductSve
.
addTmOrder
(
action_body
,
pobj
,
req
);
if
(
opResult
&&
opResult
.
status
==
0
&&
opResult
.
data
)
{
if
(
opResult
&&
opResult
.
status
==
0
&&
opResult
.
data
)
{
var
returnTms
=
opResult
.
data
.
tm
;
var
returnTms
=
opResult
.
data
.
tm
;
for
(
var
i
=
0
;
i
<
pobj
.
actionBody
.
nclones
.
length
;
i
++
)
{
for
(
var
i
=
0
;
i
<
pobj
.
actionBody
.
nclones
.
length
;
i
++
)
{
...
...
igirl-channel/app/base/api/impl/action/tmQuery.js
View file @
a9a21164
...
@@ -29,7 +29,7 @@ class TmQueryAPI extends APIBase {
...
@@ -29,7 +29,7 @@ class TmQueryAPI extends APIBase {
case
"1688"
:
case
"1688"
:
result
=
await
this
.
opActionProcess
(
pobj
.
actionProcess
,
pobj
.
actionType
,
pobj
.
actionBody
,
req
);
result
=
await
this
.
opActionProcess
(
pobj
.
actionProcess
,
pobj
.
actionType
,
pobj
.
actionBody
,
req
);
break
;
break
;
case
"gsb"
:
case
"gsb
home
"
:
result
=
await
this
.
opActionProcess
(
pobj
.
actionProcess
,
pobj
.
actionType
,
pobj
.
actionBody
,
req
);
result
=
await
this
.
opActionProcess
(
pobj
.
actionProcess
,
pobj
.
actionType
,
pobj
.
actionBody
,
req
);
break
;
break
;
default
:
default
:
...
...
igirl-channel/app/base/api/impl/action/tmTools.js
View file @
a9a21164
...
@@ -26,7 +26,7 @@ class TmToolsAPI extends APIBase {
...
@@ -26,7 +26,7 @@ class TmToolsAPI extends APIBase {
case
"1688"
:
case
"1688"
:
result
=
await
this
.
opActionProcess
(
pobj
.
actionProcess
,
pobj
.
actionType
,
pobj
.
actionBody
,
req
);
result
=
await
this
.
opActionProcess
(
pobj
.
actionProcess
,
pobj
.
actionType
,
pobj
.
actionBody
,
req
);
break
;
break
;
case
"gsb"
:
case
"gsb
home
"
:
result
=
await
this
.
opActionProcess
(
pobj
.
actionProcess
,
pobj
.
actionType
,
pobj
.
actionBody
,
req
);
result
=
await
this
.
opActionProcess
(
pobj
.
actionProcess
,
pobj
.
actionType
,
pobj
.
actionBody
,
req
);
break
;
break
;
default
:
default
:
...
...
igirl-channel/app/base/service/impl/dborder/ordertmproductSve.js
View file @
a9a21164
...
@@ -164,7 +164,7 @@ class OrderTmProductService extends ServiceBase {
...
@@ -164,7 +164,7 @@ class OrderTmProductService extends ServiceBase {
});
});
})
})
}
}
async
addTmOrder
(
params
)
{
//创建商标订单信息
async
addTmOrder
(
params
,
pobj
,
req
)
{
//创建商标订单信息
var
self
=
this
;
var
self
=
this
;
var
itemCode
=
params
.
itemCode
;
//产品编码
var
itemCode
=
params
.
itemCode
;
//产品编码
var
tm
=
params
.
tm
;
//增加sourceType || "00";//来源类型:00订单,10需求,20服务商
var
tm
=
params
.
tm
;
//增加sourceType || "00";//来源类型:00订单,10需求,20服务商
...
@@ -193,15 +193,21 @@ class OrderTmProductService extends ServiceBase {
...
@@ -193,15 +193,21 @@ class OrderTmProductService extends ServiceBase {
if
(
verifyResult
)
{
if
(
verifyResult
)
{
return
verifyResult
;
return
verifyResult
;
}
}
var
orderAmount
=
tm
;
orderAmount
.
salesNum
=
tm
.
nclOneCodes
?
tm
.
nclOneCodes
.
length
:
0
;
orderAmount
.
minitermNum
=
tm
.
nclCount
?
tm
.
nclCount
:
0
;
if
(
pobj
.
actionProcess
==
"jd"
)
{
if
(
orderAmount
.
salesNum
>
1
||
orderAmount
.
minitermNum
>
10
)
{
return
system
.
getResult
(
null
,
"选择的尼斯数据有误,目前只支持1大类10小项"
);
}
}
if
(
tm
.
tmFormType
==
"4"
)
{
//图形商标
if
(
tm
.
tmFormType
==
"4"
)
{
//图形商标
tm
[
"name"
]
=
"图形"
;
tm
[
"name"
]
=
"图形"
;
}
}
return
await
self
.
db
.
transaction
(
async
function
(
t
)
{
return
await
self
.
db
.
transaction
(
async
function
(
t
)
{
//创建订单
//创建订单
var
ordercode
=
await
self
.
getBusUid
(
"tm"
);
var
ordercode
=
await
self
.
getBusUid
(
"tm"
);
var
orderAmount
=
tm
;
orderAmount
.
salesNum
=
tm
.
nclOneCodes
?
tm
.
nclOneCodes
.
length
:
0
;
orderAmount
.
minitermNum
=
tm
.
nclCount
?
tm
.
nclCount
:
0
;
channelOrder
.
payStatus
=
"dfk"
;
channelOrder
.
payStatus
=
"dfk"
;
var
orderResult
=
await
self
.
orderDao
.
addOrder
(
ordercode
,
orderType
,
user
,
app
,
productItem
,
channelOrder
,
channelUser
,
apply
,
orderAmount
,
t
);
var
orderResult
=
await
self
.
orderDao
.
addOrder
(
ordercode
,
orderType
,
user
,
app
,
productItem
,
channelOrder
,
channelUser
,
apply
,
orderAmount
,
t
);
if
(
orderResult
.
status
!=
0
)
{
if
(
orderResult
.
status
!=
0
)
{
...
@@ -307,12 +313,14 @@ class OrderTmProductService extends ServiceBase {
...
@@ -307,12 +313,14 @@ class OrderTmProductService extends ServiceBase {
productCount
=
nclones
.
length
;
productCount
=
nclones
.
length
;
for
(
var
a
=
0
;
a
<
nclones
.
length
;
a
++
)
{
for
(
var
a
=
0
;
a
<
nclones
.
length
;
a
++
)
{
var
nclone
=
nclones
[
a
];
var
nclone
=
nclones
[
a
];
tm
.
nclOneCodes
.
push
(
nclone
.
code
);
if
(
nclone
.
code
)
{
tm
.
nclCount
=
tm
.
nclCount
+
nclone
.
nclThree
.
length
;
tm
.
nclOneCodes
.
push
(
nclone
.
code
);
var
nclthreeobj
=
nclone
.
nclThree
;
tm
.
nclCount
=
tm
.
nclCount
+
nclone
.
nclThree
.
length
;
gfze
=
gfze
+
gf
;
var
nclthreeobj
=
nclone
.
nclThree
;
if
(
nclthreeobj
.
length
>
10
)
{
gfze
=
gfze
+
gf
;
gfze
=
gfze
+
(
nclthreeobj
.
length
-
10
)
*
nclSmallPrice
;
if
(
nclthreeobj
.
length
>
10
)
{
gfze
=
gfze
+
(
nclthreeobj
.
length
-
10
)
*
nclSmallPrice
;
}
}
}
}
}
}
}
...
...
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