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
a674b557
Commit
a674b557
authored
Jul 10, 2020
by
宋毅
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tj
parent
817658d3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
56 additions
and
5 deletions
+56
-5
brg-user-center/app/base/api/api.base.js
+26
-1
brg-user-center/app/base/service/impl/order/orderInfoSve.js
+5
-4
brg-user-center/app/base/system.js
+25
-0
No files found.
brg-user-center/app/base/api/api.base.js
View file @
a674b557
...
...
@@ -28,6 +28,19 @@ class APIBase {
"RefuseSolution"
:
"refusalSolution"
,
"SendVerificationCode"
:
"sendVerificationCode"
,
"CheckBusinessNameList"
:
"checkBusinessNameList"
,
"DescribeOverviewInfoByUser"
:
"getOverviewInfoByUser"
,
"DescribeOrderList"
:
"getOrderList"
,
"DescribeQualificationCertificateOrderList"
:
"getQcOrderList"
,
"DescribeQcOrderList"
:
"getQcOrderList"
,
"DescribeOrderDetail"
:
"getOrderDetail"
,
"DescribeApplyListByUserAndType"
:
"getApplyListByUserAndType"
,
"DescribeApplyAndSolutionInfo"
:
"getApplyAndSolutionInfo"
,
"DescribeNeedList"
:
"needList"
,
"DescribeNeedDetail"
:
"needDetail"
,
"DescribeOrderListByStatus"
:
"getOrderListByStatus"
,
"DescribeQualificationCertificateListByUserAndType"
:
"getQualificationCertificateListByUserAndType"
,
"DescribeQualificationCertificateDetail"
:
"getQualificationCertificateDetail"
,
};
this
.
queryAction
=
[
"GetOrderList"
,
"getOrderList"
,
"GetOverviewInfoByUser"
,
"getOverviewInfoByUser"
,
"GetOrderList"
,
"getOrderList"
,
...
...
@@ -35,7 +48,19 @@ class APIBase {
"GetApplyListByUserAndType"
,
"getApplyListByUserAndType"
,
"GetApplyAndSolutionInfo"
,
"getApplyAndSolutionInfo"
,
"GetPriceDetail"
,
"getPriceDetail"
,
"GetNeedList"
,
"getNeedList"
,
"GetNeedDetail"
,
"getNeedDetail"
,
"GetOrderListByStatus"
,
"getOrderListByStatus"
,
"GetQualificationCertificateListByUserAndType"
,
"getQualificationCertificateListByUserAndType"
,
"GetQualificationCertificateDetail"
,
"getQualificationCertificateDetail"
"GetQualificationCertificateDetail"
,
"getQualificationCertificateDetail"
,
"DescribeOverviewInfoByUser"
,
"DescribeOrderList"
,
"DescribeQualificationCertificateOrderList"
,
"DescribeQcOrderList"
,
"DescribeOrderDetail"
,
"DescribeApplyListByUserAndType"
,
"DescribeApplyAndSolutionInfo"
,
"DescribeNeedList"
,
"DescribeNeedDetail"
,
"DescribeOrderListByStatus"
,
"DescribeQualificationCertificateListByUserAndType"
,
"DescribeQualificationCertificateDetail"
,
];
}
...
...
brg-user-center/app/base/service/impl/order/orderInfoSve.js
View file @
a674b557
...
...
@@ -160,7 +160,8 @@ class OrderInfoService extends ServiceBase {
}
var
txorderdetail
=
txorder
.
data
.
deals
[
0
];
console
.
log
(
txorderdetail
.
goodsDetail
,
"....txorderdetail.goodsDetail.....1"
);
txorderdetail
.
goodsDetail
=
JSON
.
parse
(
txorderdetail
.
goodsDetail
);
txorderdetail
.
goodsDetail
=
JSON
.
parse
(
txorderdetail
.
goodsDetail
);
txorderdetail
.
goodsPrice
=
JSON
.
parse
(
txorderdetail
.
goodsPrice
);
var
self
=
this
;
var
isoldsolutionorder
=
false
;
var
ispush
=
true
;
...
...
@@ -709,7 +710,7 @@ class OrderInfoService extends ServiceBase {
totalCost
:
rtn
.
data
.
data
[
0
].
totalCost
,
realTotalCost
:
rtn
.
data
.
data
[
0
].
realTotalCost
,
product
:
{
categoryid
:
txprice
[
0
].
categoryid
,
categoryid
:
txprice
[
0
].
categoryid
,
productIcon
:
txproductinfo
.
data
.
product_icon
,
productType
:
pobj
.
actionBody
.
PathCode
,
productTypeName
:
txproductinfo
.
data
.
product_type_name
,
...
...
@@ -772,7 +773,7 @@ class OrderInfoService extends ServiceBase {
so
.
itemDetails
.
raw_goodsData
.
push
(
goodsinfo
);
if
(
pobj
.
actionBody
.
Info
.
length
>=
2
)
{
var
newgoodsinfo
=
JSON
.
parse
(
JSON
.
stringify
(
goodsinfo
));
newgoodsinfo
.
goodsCategoryId
=
pobj
.
actionBody
.
Info
[
1
].
product
.
categoryid
;
newgoodsinfo
.
goodsCategoryId
=
pobj
.
actionBody
.
Info
[
1
].
product
.
categoryid
;
newgoodsinfo
.
goodsDetail
=
pobj
.
actionBody
.
Info
[
1
].
productSnapshot
;
newgoodsinfo
.
goodsDetail
.
product
=
pobj
.
actionBody
.
Info
[
1
].
product
;
newgoodsinfo
.
goodsDetail
.
productInfo
=
pobj
.
actionBody
.
Info
[
1
].
showInfo
;
...
...
@@ -781,7 +782,7 @@ class OrderInfoService extends ServiceBase {
}
if
(
pobj
.
actionBody
.
Info
.
length
==
3
)
{
var
newgoodsinfo1
=
JSON
.
parse
(
JSON
.
stringify
(
goodsinfo
));
newgoodsinfo
.
goodsCategoryId
=
pobj
.
actionBody
.
Info
[
2
].
product
.
categoryid
;
newgoodsinfo
.
goodsCategoryId
=
pobj
.
actionBody
.
Info
[
2
].
product
.
categoryid
;
newgoodsinfo1
.
goodsDetail
=
pobj
.
actionBody
.
Info
[
2
].
productSnapshot
;
newgoodsinfo1
.
goodsDetail
.
product
=
pobj
.
actionBody
.
Info
[
2
].
product
;
newgoodsinfo1
.
goodsDetail
.
productInfo
=
pobj
.
actionBody
.
Info
[
2
].
showInfo
;
...
...
brg-user-center/app/base/system.js
View file @
a674b557
...
...
@@ -168,6 +168,31 @@ class System {
};
}
/**
* 请求返回成功--控制台接口
* @param {*} data 操作成功返回的数据
* @param {*} okmsg 操作成功的描述
*/
static
getConsoleResultSuccess
(
data
,
okmsg
=
"ok"
)
{
return
{
"returnCode"
:
0
,
// 0成功,非0失败
"returnMessage"
:
okmsg
,
// 接口失败时返回失败信息
"data"
:
data
,
};
}
/**
* 请求返回失败-控制台
* @param {*} status 操作失败状态,默认为-1
* @param {*} errmsg 操作失败的描述,默认为fail
* @param {*} data 操作失败返回的数据
*/
static
getConsoleResultFail
(
status
=
-
1
,
errmsg
=
"fail"
,
data
=
null
)
{
return
{
"returnCode"
:
status
,
// 0成功,非0失败
"returnMessage"
:
errmsg
,
// 接口失败时返回失败信息
"data"
:
data
,
};
}
/**
* 请求返回失败
* @param {*} status 操作失败状态,默认为-1
* @param {*} errmsg 操作失败的描述,默认为fail
...
...
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