Skip to content

Commit be50ed4

Browse files
committed
fix issues for order component.
1 parent 0e9de81 commit be50ed4

File tree

3 files changed

+14
-9
lines changed

3 files changed

+14
-9
lines changed

code/backend/src/main/java/edu/bu/cs673/secondhand/controller/FavoriteController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public ResultVo addFavorite(@CookieValue("shUserId")
3636
return ResultVo.fail(ErrorMsg.FAVORITE_EXIT);
3737
}
3838

39-
@GetMapping("/delete")
39+
@DeleteMapping("/delete")
4040
public ResultVo deleteFavorite(@CookieValue("shUserId")
4141
@NotNull(message = "Login Fail, try again")
4242
@NotEmpty(message = "Login Fail, try again") String shUserId,

code/backend/src/main/java/edu/bu/cs673/secondhand/controller/ItemController.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,10 +145,11 @@ public ResultVo removeItem(@CookieValue("shUserId")
145145
public ResultVo updateItem(@CookieValue("shUserId")
146146
@NotNull(message = "Login fail, try again!")
147147
@NotEmpty(message = "Login fail, try again!")
148-
String userId,
148+
String shUserId,
149149
@RequestBody(required = true) IdleItem item) {
150150
// TODO: allow admin to update item
151-
if (item.getUserId().toString().equals(userId)) {
151+
item.setUserId(Long.valueOf(shUserId));
152+
if (item.getUserId().toString().equals(shUserId)) {
152153
if(itemService.updateItem(item)) {
153154
return ResultVo.success(item);
154155
}

code/backend/src/main/java/edu/bu/cs673/secondhand/domain/Order.java

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ public class Order {
1212

1313
private Long idleId;
1414

15+
private IdleItem idleItem;
16+
1517
private BigDecimal orderPrice;
1618

1719
private Byte paymentStatus;
@@ -62,6 +64,14 @@ public BigDecimal getOrderPrice() {
6264
return orderPrice;
6365
}
6466

67+
public IdleItem getIdleItem() {
68+
return idleItem;
69+
}
70+
71+
public void setIdleItem(IdleItem idleItem) {
72+
this.idleItem = idleItem;
73+
}
74+
6575
public void setOrderPrice(BigDecimal orderPrice) {
6676
this.orderPrice = orderPrice;
6777
}
@@ -113,10 +123,4 @@ public Byte getIsDeleted() {
113123
public void setIsDeleted(Byte isDeleted) {
114124
this.isDeleted = isDeleted;
115125
}
116-
117-
public Order getIdleItem() {
118-
return null;
119-
}
120-
121-
public void setIdleItem(IdleItem idleItem) {}
122126
}

0 commit comments

Comments
 (0)