Skip to content

assignment-dev-08-FE-refactor : FE code refactor #107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yennanliu wants to merge 11 commits into
base: main
Choose a base branch
from
Open

assignment-dev-08-FE-refactor : FE code refactor #107

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
72b2f54
add Order bean, mapper, service, impl, controller
yennanliu Oct 13, 2023
ef08d87
add order html, fix order id strategy, fix mapper, update url in main…
yennanliu Oct 13, 2023
d73644e
fix order ddl, get productList, merchantList in order input, fix list…
yennanliu Oct 13, 2023
1337dd8
fix order update html, update orderController, update list order html
yennanliu Oct 13, 2023
1276485
add status to order bean, html, add amount default value, fix ddl
yennanliu Oct 14, 2023
3c07754
add update productWithOrder, fix bean int type, update controller
yennanliu Oct 14, 2023
29d9c2b
add getProductDtoListFromProductList method
yennanliu Oct 14, 2023
b4ea5e6
fix ddl, modify createTime when new order, show createdTime]
yennanliu Oct 15, 2023
a5fb15c
fix product input status, show status, add enum, fix ddl
yennanliu Oct 15, 2023
508fc1c
update mapper, add csvUtil, update unit test
yennanliu Oct 15, 2023
399ea88
update saveAssignment method, progress, readme, remove log
yennanliu Oct 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix order update html, update orderController, update list order html
  • Loading branch information
@yennanliu
yennanliu committed Oct 15, 2023
commit 1337dd8f1385f517211743369129836ee40bb66b
13 changes: 10 additions & 3 deletions springWarehouse/src/main/java/com/yen/springWarehouse/controller/OrderController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yen.springWarehouse.bean.Order;
import com.yen.springWarehouse.bean.Product;
import com.yen.springWarehouse.bean.ProductType;
import com.yen.springWarehouse.service.MerchantService;
import com.yen.springWarehouse.service.OrderService;
import com.yen.springWarehouse.service.ProductService;
Expand Down Expand Up @@ -77,13 +75,22 @@ public String list(Map<String, Object> map, @RequestParam(value="pageNo", requir
return "order/list_order";
}

// TODO : only allow cancel if order status is "uncompleted"
@PostMapping(value="/remove/{orderNo}")
public String remove(@PathVariable("orderNo") String orderNo) {

orderService.removeById(orderNo);
return "redirect:/order/list";
}

// TODO : only allow update if order status is "uncompleted"
@GetMapping(value="/preUpdate/{orderNo}")
public String preUpdate(@PathVariable("orderNo") String orderNo, Map<String, Object> map) {

Order order = orderService.getById(orderNo);
map.put("order" , order);
map.put("orderList", orderService.list());
return "product/update_order";
return "order/update_order";
}

@PostMapping(value="/update")
Expand Down
2 changes: 1 addition & 1 deletion springWarehouse/src/main/resources/templates/order/list_order.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ <h3 class="title">Order Management</h3>
<td id="amount" th:text="${order.amount}" nowrap></td>
<td nowrap>
<button class="update" th:href="@{/order/preUpdate/{id}(id=${order.id})}" >修改</button>
<button class="delete" th:href="@{/order/remove/{id}(id=${order.id})}">删除</button>
<button class="delete" th:href="@{/order/remove/{id}(id=${order.id})}">Cancel Order</button>
</td>
</tr>

Expand Down
18 changes: 9 additions & 9 deletions springWarehouse/src/main/resources/templates/order/update_order.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,23 @@
<html lang="en" xmlns:th="http://www.thymeleaf.org">
<head>
<meta charset="UTF-8">
<title>modify merchant</title>
<title>modify order</title>
<link rel="stylesheet" type="text/css" th:href="@{/css/style.css}" />
<script type="text/javascript" th:src="@{/js/jquery-3.1.1.min.js}"></script>
</head>
<body style="padding:8px;">
<h3 class="title">modify merchant</h3>
<form th:action="@{/merchant/update}" method="post" th:object="${merchant}">
<h3 class="title">modify order</h3>
<form th:action="@{/order/update}" method="post" th:object="${order}">
<input type="hidden" name="_method" value="PUT"/>
<input type="hidden" name="id" th:value="*{id}">
<div>
<span>Merchant name:</span>
<input type="text" name="name" th:value="*{name}" placeholder="Merchant name">
</div>
<div>
<span>Merchant city:</span>
<input type="text" name="city" th:value="*{city}" placeholder="Merchant city">
<span>Order merchantId:</span>
<input type="text" name="merchantId" th:value="*{merchantId}" placeholder="merchantId">
</div>
<!-- <div>
<span>Order city:</span>
<input type="text" name="city" th:value="*{city}" placeholder="Order city">
</div> -->
<div>
<input type="submit" value=" 确定 "/>
</div>
Expand Down