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
00cafbfb
Commit
00cafbfb
authored
Dec 17, 2019
by
宋毅
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tj
parent
0a52ce92
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
8 deletions
+8
-8
igirl-channel/app/base/api/api.base.js
+2
-2
igirl-channel/app/base/api/impl/action/tmOrder.js
+1
-1
igirl-channel/app/base/service/impl/dborder/orderSve.js
+3
-3
igirl-channel/app/base/service/impl/trademark/toolSve.js
+2
-2
No files found.
igirl-channel/app/base/api/api.base.js
View file @
00cafbfb
...
@@ -100,7 +100,7 @@ class APIBase {
...
@@ -100,7 +100,7 @@ class APIBase {
channelUserId
=
pobj
.
actionBody
.
channelUser
.
channelUserId
;
channelUserId
=
pobj
.
actionBody
.
channelUser
.
channelUserId
;
}
}
if
(
!
channelUserId
)
{
if
(
!
channelUserId
)
{
return
system
.
getResult
(
null
,
"base verify channelUserId is
not
empty"
);
return
system
.
getResult
(
null
,
"base verify channelUserId is empty"
);
}
}
var
userCacheKey
=
selfAppInfo
.
data
.
uappKey
+
"_"
+
channelUserId
;
var
userCacheKey
=
selfAppInfo
.
data
.
uappKey
+
"_"
+
channelUserId
;
var
userInfo
=
await
this
.
cacheManager
[
"ApiUserCache"
].
cache
(
userCacheKey
,
channelUserId
,
var
userInfo
=
await
this
.
cacheManager
[
"ApiUserCache"
].
cache
(
userCacheKey
,
channelUserId
,
...
@@ -125,7 +125,7 @@ class APIBase {
...
@@ -125,7 +125,7 @@ class APIBase {
try
{
try
{
if
(
pobj
.
actionType
==
"createChannelUser"
)
{
if
(
pobj
.
actionType
==
"createChannelUser"
)
{
if
(
!
pobj
.
isUser
)
{
if
(
!
pobj
.
isUser
)
{
system
.
getResult
(
null
,
"isUser is
not
empty"
);
system
.
getResult
(
null
,
"isUser is empty"
);
}
}
if
(
pobj
.
isUser
!=
"yes"
)
{
if
(
pobj
.
isUser
!=
"yes"
)
{
system
.
getResult
(
null
,
"isUser value must yes"
);
system
.
getResult
(
null
,
"isUser value must yes"
);
...
...
igirl-channel/app/base/api/impl/action/tmOrder.js
View file @
00cafbfb
...
@@ -54,7 +54,7 @@ class TmOrderAPI extends APIBase {
...
@@ -54,7 +54,7 @@ class TmOrderAPI extends APIBase {
"tmConfirm"
,
"updateTmInfo"
,
"updateNclInfo"
,
"updateContacts"
,
"tmConfirm"
,
"updateTmInfo"
,
"updateNclInfo"
,
"updateContacts"
,
"updateCustomerInfo"
,
"addOrderAndDelivery"
,
"updateOrderPayStatus"
].
indexOf
(
action_type
)
>=
0
)
{
"updateCustomerInfo"
,
"addOrderAndDelivery"
,
"updateOrderPayStatus"
].
indexOf
(
action_type
)
>=
0
)
{
if
(
!
action_body
.
channelUserId
)
{
if
(
!
action_body
.
channelUserId
)
{
return
system
.
getResult
(
null
,
"verify channelUserId is
not
empty"
);
return
system
.
getResult
(
null
,
"verify channelUserId is empty"
);
}
}
}
}
switch
(
action_type
)
{
switch
(
action_type
)
{
...
...
igirl-channel/app/base/service/impl/dborder/orderSve.js
View file @
00cafbfb
...
@@ -16,14 +16,14 @@ class OrderService extends ServiceBase {
...
@@ -16,14 +16,14 @@ class OrderService extends ServiceBase {
async
addOrderAndDelivery
(
action_body
,
pobj
,
req
)
{
async
addOrderAndDelivery
(
action_body
,
pobj
,
req
)
{
if
(
!
action_body
.
needNo
)
{
if
(
!
action_body
.
needNo
)
{
return
system
.
getResult
(
null
,
"needNo is
not
empty"
);
return
system
.
getResult
(
null
,
"needNo is empty"
);
}
}
if
(
!
action_body
.
channelItemCode
)
{
if
(
!
action_body
.
channelItemCode
)
{
return
system
.
getResult
(
null
,
"channelItemCode is
not
empty"
);
return
system
.
getResult
(
null
,
"channelItemCode is empty"
);
}
}
var
productItem
=
await
this
.
appproductDao
.
findOneByChannelItemCode
(
action_body
.
channelItemCode
,
req
.
app
.
id
);
//获取产品
var
productItem
=
await
this
.
appproductDao
.
findOneByChannelItemCode
(
action_body
.
channelItemCode
,
req
.
app
.
id
);
//获取产品
if
(
!
productItem
)
{
if
(
!
productItem
)
{
return
;
return
system
.
getResult
(
null
,
"productItem is empty"
);
;
}
}
var
orderCount
=
await
this
.
dao
.
findCount
({
where
:
{
needNo
:
action_body
.
needNo
}
});
var
orderCount
=
await
this
.
dao
.
findCount
({
where
:
{
needNo
:
action_body
.
needNo
}
});
if
(
orderCount
>
0
)
{
if
(
orderCount
>
0
)
{
...
...
igirl-channel/app/base/service/impl/trademark/toolSve.js
View file @
00cafbfb
...
@@ -97,7 +97,7 @@ class ToolService {
...
@@ -97,7 +97,7 @@ class ToolService {
//加密信息
//加密信息
async
encryptStr
(
app
,
opStr
)
{
async
encryptStr
(
app
,
opStr
)
{
if
(
!
opStr
)
{
if
(
!
opStr
)
{
return
system
.
getResult
(
null
,
"opStr is
not
empty"
);
return
system
.
getResult
(
null
,
"opStr is empty"
);
}
}
let
keyHex
=
cryptoJS
.
enc
.
Utf8
.
parse
(
app
.
uappKey
);
let
keyHex
=
cryptoJS
.
enc
.
Utf8
.
parse
(
app
.
uappKey
);
let
ivHex
=
cryptoJS
.
enc
.
Utf8
.
parse
(
app
.
appSecret
.
substring
(
0
,
8
));
let
ivHex
=
cryptoJS
.
enc
.
Utf8
.
parse
(
app
.
appSecret
.
substring
(
0
,
8
));
...
@@ -107,7 +107,7 @@ class ToolService {
...
@@ -107,7 +107,7 @@ class ToolService {
//解密信息
//解密信息
async
decryptStr
(
app
,
opStr
)
{
async
decryptStr
(
app
,
opStr
)
{
if
(
!
opStr
)
{
if
(
!
opStr
)
{
return
system
.
getResult
(
null
,
"opStr is
not
empty"
);
return
system
.
getResult
(
null
,
"opStr is empty"
);
}
}
let
keyHex
=
cryptoJS
.
enc
.
Utf8
.
parse
(
app
.
uappKey
);
let
keyHex
=
cryptoJS
.
enc
.
Utf8
.
parse
(
app
.
uappKey
);
let
ivHex
=
cryptoJS
.
enc
.
Utf8
.
parse
(
app
.
appSecret
.
substring
(
0
,
8
));
let
ivHex
=
cryptoJS
.
enc
.
Utf8
.
parse
(
app
.
appSecret
.
substring
(
0
,
8
));
...
...
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