Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
R
rs-cloud-platform
Project
Project
Details
Activity
Releases
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
周健威
rs-cloud-platform
Commits
1ebf31a1
Commit
1ebf31a1
authored
Jan 21, 2021
by
周健威
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改排序时间
parent
df11cb3f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
8 deletions
+16
-8
OrderItem.java
...java/com/upyuns/platform/rs/website/entity/OrderItem.java
+6
-2
ShoppingCartInfo.java
...m/upyuns/platform/rs/website/entity/ShoppingCartInfo.java
+6
-2
OrderInfoBiz.java
...java/com/upyuns/platform/rs/website/biz/OrderInfoBiz.java
+3
-3
ShoppingCartInfoBiz.java
...m/upyuns/platform/rs/website/biz/ShoppingCartInfoBiz.java
+1
-1
No files found.
rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/entity/OrderItem.java
View file @
1ebf31a1
...
...
@@ -41,8 +41,12 @@ public class OrderItem implements Serializable {
@Column
(
name
=
"name"
)
@ApiModelProperty
(
value
=
"商品名称"
)
private
String
name
;
/**
public
void
setName
(
String
name
)
{
this
.
name
=
name
;
}
/**
* 详情id
*/
@Column
(
name
=
"detail_id"
)
...
...
rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/entity/ShoppingCartInfo.java
View file @
1ebf31a1
...
...
@@ -34,8 +34,12 @@ public class ShoppingCartInfo implements Serializable {
@Column
(
name
=
"name"
)
@ApiModelProperty
(
value
=
"订单名称"
)
private
String
name
;
/**
public
void
setName
(
String
name
)
{
this
.
name
=
name
;
}
/**
* 详情id
*/
@Column
(
name
=
"detail_id"
)
...
...
rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/biz/OrderInfoBiz.java
View file @
1ebf31a1
...
...
@@ -339,7 +339,7 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
orderItem
.
setTotalAmount
(
imageInfoRelation
.
getPrice
().
multiply
(
new
BigDecimal
(
itemInfoDto
.
getNumber
())));
orderItem
.
setPrice
(
imageInfoRelation
.
getPrice
());
orderItem
.
setNumber
(
itemInfoDto
.
getNumber
());
orderItem
.
setName
(
imageImgStorage
.
getName
());
orderItem
.
setName
(
imageImgStorage
.
getName
()
+
" ("
+
imageInfoRelation
.
getFileWidth
()+
")"
);
orderItem
.
setItemPic
(
imageImgStorage
.
getCoverImg
());
orderItem
.
setDetailJson
(
JSONObject
.
toJSONString
(
imageImgStorage
));
orderItem
.
setDetailId
(
Long
.
valueOf
(
imageImgStorage
.
getId
()));
...
...
@@ -885,7 +885,7 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
orderItem
.
setTotalAmount
(
imageInfoRelation
.
getPrice
().
multiply
(
new
BigDecimal
(
itemInfoDto
.
getNumber
())));
orderItem
.
setPrice
(
imageInfoRelation
.
getPrice
());
orderItem
.
setNumber
(
itemInfoDto
.
getNumber
());
orderItem
.
setName
(
imageImgStorage
.
getName
());
orderItem
.
setName
(
imageImgStorage
.
getName
()
+
" ("
+
imageInfoRelation
.
getFileWidth
()+
")"
);
orderItem
.
setItemPic
(
imageImgStorage
.
getCoverImg
());
orderItem
.
setDetailJson
(
JSONObject
.
toJSONString
(
imageImgStorage
));
orderItem
.
setDetailId
(
Long
.
valueOf
(
imageInfoRelation
.
getId
()));
...
...
@@ -978,7 +978,7 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
if
(
imageInfoRelationList
!=
null
&&
imageInfoRelationList
.
size
()
>
0
)
{
imageInfoRelationList
.
stream
().
forEach
(
imageInfoRelation
->
{
ItemInfoVo
itemInfoVo
=
new
ItemInfoVo
();
itemInfoVo
.
setName
(
imageImgStorage
.
getName
()
+
"
尺寸:
("
+
imageInfoRelation
.
getFileWidth
()+
")"
);
itemInfoVo
.
setName
(
imageImgStorage
.
getName
()
+
" ("
+
imageInfoRelation
.
getFileWidth
()+
")"
);
itemInfoVo
.
setId
(
Long
.
parseLong
(
String
.
valueOf
(
imageInfoRelation
.
getId
())));
itemInfoVo
.
setType
(
ItemTypeEnum
.
IMAGE_STORAGE
.
getType
());
itemInfoVoList
.
add
(
itemInfoVo
);
...
...
rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/biz/ShoppingCartInfoBiz.java
View file @
1ebf31a1
...
...
@@ -175,7 +175,7 @@ public class ShoppingCartInfoBiz extends BaseBiz<ShoppingCartInfoMapper, Shoppin
shoppingCartInfo
.
setFilePath
(
orderInfoDto
.
getFilePath
());
shoppingCartInfo
.
setNumber
(
orderInfoDto
.
getNumber
());
shoppingCartInfo
.
setItemPic
(
imageImgStorage
.
getCoverImg
());
shoppingCartInfo
.
setName
(
imageImgStorage
.
getName
());
shoppingCartInfo
.
setName
(
imageImgStorage
.
getName
()
+
" ("
+
imageInfoRelation
.
getFileWidth
()+
")"
);
shoppingCartInfo
.
setTotalAmount
(
orderInfoDto
.
getPrice
().
multiply
(
new
BigDecimal
(
orderInfoDto
.
getNumber
())));
shoppingCartInfo
.
setType
(
orderInfoDto
.
getType
());
//添加用户信息
...
...
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