From 72b2f548d0119ea73a2a622c5d9ed8b42de80be4 Mon Sep 17 00:00:00 2001
From: yennanliu <f339339@gmail.com>
Date: Fri, 13 Oct 2023 10:07:08 +0800
Subject: [PATCH 01/11] add Order bean, mapper, service, impl, controller

---
 .../com/yen/springWarehouse/bean/Order.java   | 39 +++++++++++++
 .../controller/OrderController.java           | 55 +++++++++++++++++++
 .../springWarehouse/mapper/OrderMapper.java   | 17 ++++++
 .../springWarehouse/mapper/OrderMapper.xml    | 22 ++++++++
 .../springWarehouse/service/OrderService.java | 13 +++++
 .../service/impl/OrderServiceImpl.java        | 37 +++++++++++++
 .../util/OrderQueryHelper.java                |  9 +++
 7 files changed, 192 insertions(+)
 create mode 100644 springWarehouse/src/main/java/com/yen/springWarehouse/bean/Order.java
 create mode 100644 springWarehouse/src/main/java/com/yen/springWarehouse/controller/OrderController.java
 create mode 100644 springWarehouse/src/main/java/com/yen/springWarehouse/mapper/OrderMapper.java
 create mode 100644 springWarehouse/src/main/java/com/yen/springWarehouse/mapper/OrderMapper.xml
 create mode 100644 springWarehouse/src/main/java/com/yen/springWarehouse/service/OrderService.java
 create mode 100644 springWarehouse/src/main/java/com/yen/springWarehouse/service/impl/OrderServiceImpl.java
 create mode 100644 springWarehouse/src/main/java/com/yen/springWarehouse/util/OrderQueryHelper.java

diff --git a/springWarehouse/src/main/java/com/yen/springWarehouse/bean/Order.java b/springWarehouse/src/main/java/com/yen/springWarehouse/bean/Order.java
new file mode 100644
index 000000000..b3e34f47d
--- /dev/null
+++ b/springWarehouse/src/main/java/com/yen/springWarehouse/bean/Order.java
@@ -0,0 +1,39 @@
+package com.yen.springWarehouse.bean;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName("order")
+public class Order implements Serializable {
+
+    private static final long serialVersionUID = 58533333369667604L;
+
+    @TableId(type = IdType.AUTO)
+    private int id;
+
+    @TableField("merchant_id")
+    private int merchantId;
+
+    @TableField("product_id")
+    private int productId;
+
+    @TableField("amount")
+    private int amount;
+
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+}
diff --git a/springWarehouse/src/main/java/com/yen/springWarehouse/controller/OrderController.java b/springWarehouse/src/main/java/com/yen/springWarehouse/controller/OrderController.java
new file mode 100644
index 000000000..56a802df5
--- /dev/null
+++ b/springWarehouse/src/main/java/com/yen/springWarehouse/controller/OrderController.java
@@ -0,0 +1,55 @@
+package com.yen.springWarehouse.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.service.OrderService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.Map;
+
+@Slf4j
+@Controller
+@RequestMapping("/order")
+public class OrderController {
+
+    @Autowired
+    OrderService orderService;
+
+
+    @GetMapping("/list")
+    public String list(Map<String, Object> map, @RequestParam(value="pageNo", required=false, defaultValue="1") String pageNoStr) {
+
+        // TODO : refactor to pageUtil (a common method handle paging request)
+        int pageNo;
+
+        // check pageNo
+        pageNo = Integer.parseInt(pageNoStr);
+        if(pageNo < 1){
+            pageNo = 1;
+        }
+
+        /*
+         * 1st param：which page
+         * 2nd param : record count per page
+         */
+        log.info("pageNo = {}", pageNo);
+        Page<Order> page = new Page<>(pageNo,3);
+        QueryWrapper<Order> queryWrapper = new QueryWrapper<>();
+        IPage<Order> iPage = orderService.page(page,
+                new LambdaQueryWrapper<Order>()
+                        .orderByAsc(Order::getId)
+        );
+        log.info("iPage.total = {}, iPage.getPages = {} iPage = {}",  iPage.getTotal(), iPage.getPages(), iPage);
+        map.put("page", iPage);
+
+        return "order/list_order";
+    }
+}
diff --git a/springWarehouse/src/main/java/com/yen/springWarehouse/mapper/OrderMapper.java b/springWarehouse/src/main/java/com/yen/springWarehouse/mapper/OrderMapper.java
new file mode 100644
index 000000000..601005241
--- /dev/null
+++ b/springWarehouse/src/main/java/com/yen/springWarehouse/mapper/OrderMapper.java
@@ -0,0 +1,17 @@
+package com.yen.springWarehouse.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yen.springWarehouse.bean.Order;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface OrderMapper extends BaseMapper<Order> {
+
+    List<Order> getOrderList(Page<Order> orderPage, @Param("ew") Wrapper<Order> wrapper);
+
+}
diff --git a/springWarehouse/src/main/java/com/yen/springWarehouse/mapper/OrderMapper.xml b/springWarehouse/src/main/java/com/yen/springWarehouse/mapper/OrderMapper.xml
new file mode 100644
index 000000000..7a7cea663
--- /dev/null
+++ b/springWarehouse/src/main/java/com/yen/springWarehouse/mapper/OrderMapper.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!-- name space -->
+<mapper namespace="com.yen.springWarehouse.mapper.OrderMapper">
+
+    <!-- SQL -->
+
+    <!-- SQL query with paging, NOTE : if there is group type in Mybatis, only use element type in group -->
+    <select id="getOrderList" resultType="com.yen.springWarehouse.bean.Order">
+        select
+        *
+        from
+        order
+        <where>
+            ${ew.sqlSegment}
+        </where>
+
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/springWarehouse/src/main/java/com/yen/springWarehouse/service/OrderService.java b/springWarehouse/src/main/java/com/yen/springWarehouse/service/OrderService.java
new file mode 100644
index 000000000..e565f7bfe
--- /dev/null
+++ b/springWarehouse/src/main/java/com/yen/springWarehouse/service/OrderService.java
@@ -0,0 +1,13 @@
+package com.yen.springWarehouse.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yen.springWarehouse.bean.Order;
+import com.yen.springWarehouse.bean.Product;
+import com.yen.springWarehouse.util.OrderQueryHelper;
+import com.yen.springWarehouse.util.ProductQueryHelper;
+
+public interface OrderService extends IService<Order> {
+
+    Page<Order> getOrderPage(OrderQueryHelper helper, Integer pageNo, Integer pageSize);
+}
diff --git a/springWarehouse/src/main/java/com/yen/springWarehouse/service/impl/OrderServiceImpl.java b/springWarehouse/src/main/java/com/yen/springWarehouse/service/impl/OrderServiceImpl.java
new file mode 100644
index 000000000..692bb455a
--- /dev/null
+++ b/springWarehouse/src/main/java/com/yen/springWarehouse/service/impl/OrderServiceImpl.java
@@ -0,0 +1,37 @@
+package com.yen.springWarehouse.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yen.springWarehouse.bean.Order;
+import com.yen.springWarehouse.mapper.OrderMapper;
+import com.yen.springWarehouse.service.OrderService;
+import com.yen.springWarehouse.util.OrderQueryHelper;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements OrderService {
+
+    @Override
+    public Page<Order> getOrderPage(OrderQueryHelper helper, Integer pageNo, Integer pageSize) {
+
+
+        Page<Order> page = new Page<>(pageNo,pageSize);
+        QueryWrapper<Order> orderWrapper = new QueryWrapper<>();
+
+        List<Order> orderList = baseMapper.getOrderList(page, orderWrapper);
+
+        if(CollectionUtils.isNotEmpty(orderList)){
+            page.setRecords(orderList);
+            return page;
+        }
+
+        return new Page<>();
+    }
+
+}
diff --git a/springWarehouse/src/main/java/com/yen/springWarehouse/util/OrderQueryHelper.java b/springWarehouse/src/main/java/com/yen/springWarehouse/util/OrderQueryHelper.java
new file mode 100644
index 000000000..e38115b68
--- /dev/null
+++ b/springWarehouse/src/main/java/com/yen/springWarehouse/util/OrderQueryHelper.java
@@ -0,0 +1,9 @@
+package com.yen.springWarehouse.util;
+
+import java.io.Serializable;
+
+public class OrderQueryHelper implements Serializable {
+
+    private static final long serialVersionUID = -977444405069L;
+
+}

From ef08d87498f3c2fca2d08396d214e19bccda9a98 Mon Sep 17 00:00:00 2001
From: yennanliu <f339339@gmail.com>
Date: Fri, 13 Oct 2023 10:28:12 +0800
Subject: [PATCH 02/11] add order html, fix order id strategy, fix mapper,
 update url in main html

---
 .../com/yen/springWarehouse/bean/Order.java   |   7 +-
 .../controller/OrderController.java           |   1 +
 .../springWarehouse/mapper/OrderMapper.xml    |   2 +-
 .../src/main/resources/templates/main.html    |   7 +
 .../templates/order/input_order.html          |  25 ++++
 .../resources/templates/order/list_order.html | 122 ++++++++++++++++++
 .../templates/order/update_order.html         |  27 ++++
 7 files changed, 187 insertions(+), 4 deletions(-)
 create mode 100644 springWarehouse/src/main/resources/templates/order/input_order.html
 create mode 100644 springWarehouse/src/main/resources/templates/order/list_order.html
 create mode 100644 springWarehouse/src/main/resources/templates/order/update_order.html

diff --git a/springWarehouse/src/main/java/com/yen/springWarehouse/bean/Order.java b/springWarehouse/src/main/java/com/yen/springWarehouse/bean/Order.java
index b3e34f47d..598461f11 100644
--- a/springWarehouse/src/main/java/com/yen/springWarehouse/bean/Order.java
+++ b/springWarehouse/src/main/java/com/yen/springWarehouse/bean/Order.java
@@ -14,13 +14,14 @@
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@TableName("order")
+@TableName("orders")
 public class Order implements Serializable {
 
     private static final long serialVersionUID = 58533333369667604L;
 
-    @TableId(type = IdType.AUTO)
-    private int id;
+    // https://www.cnblogs.com/mark5/p/14268122.html
+    @TableId(type = IdType.ASSIGN_UUID)
+    private String id;
 
     @TableField("merchant_id")
     private int merchantId;
diff --git a/springWarehouse/src/main/java/com/yen/springWarehouse/controller/OrderController.java b/springWarehouse/src/main/java/com/yen/springWarehouse/controller/OrderController.java
index 56a802df5..f01b7b784 100644
--- a/springWarehouse/src/main/java/com/yen/springWarehouse/controller/OrderController.java
+++ b/springWarehouse/src/main/java/com/yen/springWarehouse/controller/OrderController.java
@@ -52,4 +52,5 @@ public String list(Map<String, Object> map, @RequestParam(value="pageNo", requir
 
         return "order/list_order";
     }
+
 }
diff --git a/springWarehouse/src/main/java/com/yen/springWarehouse/mapper/OrderMapper.xml b/springWarehouse/src/main/java/com/yen/springWarehouse/mapper/OrderMapper.xml
index 7a7cea663..515b4e3a0 100644
--- a/springWarehouse/src/main/java/com/yen/springWarehouse/mapper/OrderMapper.xml
+++ b/springWarehouse/src/main/java/com/yen/springWarehouse/mapper/OrderMapper.xml
@@ -12,7 +12,7 @@
         select
         *
         from
-        order
+        orders
         <where>
             ${ew.sqlSegment}
         </where>
diff --git a/springWarehouse/src/main/resources/templates/main.html b/springWarehouse/src/main/resources/templates/main.html
index dd87cd4d1..4d7657541 100644
--- a/springWarehouse/src/main/resources/templates/main.html
+++ b/springWarehouse/src/main/resources/templates/main.html
@@ -32,6 +32,13 @@
         <div class="menuitem">
             <a th:href="@{/merchant/list}" target="contentFrame">Merchant Update</a>
         </div>
+        <div class="seperator"></div>
+        <div class="menuitem">
+            <a th:href="@{/order/toInput}"  target="contentFrame">New Order</a>
+        </div>
+        <div class="menuitem">
+            <a th:href="@{/order/list}" target="contentFrame">Order Update</a>
+        </div>
     </div>
     <div id="content">
         <iframe id="contentFrame" width="100%" scrolling="no" height="480px" frameborder="0" name="contentFrame" allowtransparency="true" th:src="@{/welcome.html}">
diff --git a/springWarehouse/src/main/resources/templates/order/input_order.html b/springWarehouse/src/main/resources/templates/order/input_order.html
new file mode 100644
index 000000000..57c31f4b4
--- /dev/null
+++ b/springWarehouse/src/main/resources/templates/order/input_order.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
+<head>
+    <meta charset="UTF-8">
+    <title>Add New Merchant</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">Add New Merchant</h3>
+<form th:action="@{/merchant/create}" method="post" th:object="${Merchant}">
+    <div>
+        <span>Merchant Name:</span>
+        <input type="text" name="name" placeholder="Merchant Name">
+    </div>
+    <div>
+        <span>Merchant city:</span>
+        <input type="text" name="city" placeholder="Merchant city">
+    </div>
+    <div>
+        <input type="submit" value=" confirm "/>
+    </div>
+</form>
+</body>
+</html>
\ No newline at end of file
diff --git a/springWarehouse/src/main/resources/templates/order/list_order.html b/springWarehouse/src/main/resources/templates/order/list_order.html
new file mode 100644
index 000000000..d69aa27c0
--- /dev/null
+++ b/springWarehouse/src/main/resources/templates/order/list_order.html
@@ -0,0 +1,122 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
+<head>
+    <meta charset="UTF-8">
+    <title>Order Management</title>
+    <link rel="stylesheet" type="text/css" th:href="@{/css/style.css}" />
+</head>
+<body style="padding:8px;">
+<h3 class="title">Order Management</h3>
+
+<form action="" method="POST">
+    <input type="hidden" name="_method" value="DELETE"/>
+</form>
+
+<table border="0" cellspacing="0">
+    <tr>
+        <th>Id</th>
+        <th>Merchant Id</th>
+        <th>Amount</th>
+    </tr>
+    <tr class="type" th:each="order : ${page.records}">
+        <td th:text="${order.id}" nowrap></td>
+        <td id="merchant" th:text="${order.merchantId}" nowrap></td>
+        <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>
+        </td>
+    </tr>
+
+</table>
+
+<div id="pageInfo">
+    共[[${page.total}]]条,
+    <span th:if="${ ( page.current - 1 ) * page.size + 1 == page.total }">
+			当前显示第[[${page.total}]]条,
+	</span>
+    <span th:if="${ ( page.current - 1 ) * page.size + 1 != page.total }">
+        <span th:if="${ page.current * page.size >= page.total }">
+			当前显示[[${( page.current - 1 ) * page.size + 1}]]-[[${page.total}]]条,
+	    </span>
+		<span th:if="${ page.current * page.size < page.total }">
+			当前显示[[${( page.current - 1 ) * page.size + 1}]]-[[${page.current * page.size}]]条,
+	    </span>
+	</span>
+    第[[${page.current}]]/[[${(page.total % page.size == 0) ? (page.total / page.size) : (page.total / page.size + 1)}]]页
+    |
+    <a href="#" th:if="${page.current > 1}"><span class="linkspan" id="one">首页</span>&nbsp;</a>
+    <a href="#" th:if="${page.current > 1}"><span class="linkspan" id="two">上一页</span>&nbsp;</a>
+    <a href="#" th:if="${page.current < ((page.total % page.size == 0) ? (page.total / page.size) : (page.total / page.size + 1))}">
+        <span class="linkspan" id="three">下一页</span>&nbsp;
+    </a>
+    <a href="#" th:if="${page.current != ((page.total % page.size == 0) ? (page.total / page.size) : (page.total / page.size + 1))}">
+        <span class="linkspan" id="four">末页</span>&nbsp;
+    </a>
+    |
+    到 <input type="text" id="pageNo" size=4 style="text-align:right;"/> 页
+    <button class="linkspan" id="five" style="color:black;text-decoration:none;"> 跳 转 </button>
+</div>
+<script type="text/javascript" th:src="@{/js/jquery-3.1.1.min.js}"></script>
+<script th:inline="javascript">
+
+    $(function() {
+        //删除操作
+        $(".delete").click(function () {
+            var href = $(this).attr("href");
+            if (confirm("确定要删除吗?")) {
+                $("form:eq(0)").attr("action", href).submit();
+                return false;
+            }
+
+        });
+
+        $(".update").click(function () {
+            var href = $(this).attr("href");
+            $(location).attr("href", href);
+        });
+
+        //分页操作
+        $(".linkspan").click(function () {
+
+            var pageNo = [[${page.current}]];
+            var totalPageNum = [[${(page.total % page.size == 0) ? (page.total / page.size) : (page.total / page.size + 1)}]];
+            var re = /^[0-9]+.?[0-9]*$/;
+
+            if (String($(this).attr("id")) == String("one"))
+                pageNo = 1;
+
+            if (String($(this).attr("id")) == String("two"))
+                pageNo = pageNo - 1;
+
+            if (String($(this).attr("id")) == String("three"))
+                pageNo = pageNo + 1;
+
+            if (String($(this).attr("id")) == String("four"))
+                pageNo = totalPageNum;
+
+            if (String($(this).attr("id")) == String("five")) {
+                var num = $.trim($("#pageNo").val());
+
+                if (!re.test(num)) {
+                    alert("输入的不是数字!");
+                    return;
+                }
+                pageNo = parseInt(num);
+                if (pageNo < 1 || pageNo > totalPageNum) {
+                    alert("页号超出范围，有效范围：[1-" + totalPageNum + "]!");
+                    return;
+                }
+
+            }
+
+            var href = "?pageNo=" + pageNo;
+            $(location).attr("href", href);
+            return false;
+
+        });
+    });
+
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/springWarehouse/src/main/resources/templates/order/update_order.html b/springWarehouse/src/main/resources/templates/order/update_order.html
new file mode 100644
index 000000000..01db94aec
--- /dev/null
+++ b/springWarehouse/src/main/resources/templates/order/update_order.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
+<head>
+    <meta charset="UTF-8">
+    <title>modify merchant</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}">
+    <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">
+    </div>
+    <div>
+        <input type="submit" value=" 确定 "/>
+    </div>
+</form>
+</body>
+</html>
\ No newline at end of file

From d73644edf1193bc4d48f3c36e3577fdeb8ea3153 Mon Sep 17 00:00:00 2001
From: yennanliu <f339339@gmail.com>
Date: Fri, 13 Oct 2023 11:05:58 +0800
Subject: [PATCH 03/11] fix order ddl, get productList, merchantList in order
 input, fix list order html

---
 springWarehouse/sql/ddl/order.sql             |  4 +-
 .../controller/OrderController.java           | 47 +++++++++++++++++--
 .../templates/order/input_order.html          | 27 ++++++++---
 .../resources/templates/order/list_order.html |  2 +
 4 files changed, 68 insertions(+), 12 deletions(-)

diff --git a/springWarehouse/sql/ddl/order.sql b/springWarehouse/sql/ddl/order.sql
index 778376487..cfde3e875 100644
--- a/springWarehouse/sql/ddl/order.sql
+++ b/springWarehouse/sql/ddl/order.sql
@@ -15,6 +15,6 @@ CREATE TABLE IF NOT EXISTS orders (
 
 INSERT INTO orders(id, merchant_id, product_id, amount, create_time, update_time)
 VALUES
-(uuid(), 1, 1, 1, now(), now()),
-(uuid(), 2, 2, 1, now(), now()),
+("213ac245-7a2a-453b-a4a7-149426b13f84", 1, 1, 1, now(), now()),
+("d42b3224-b715-46af-9294-3b2ecc6ccc7a", 2, 2, 1, now(), now()),
 (uuid(), 1, 3, 1, now(), now());
\ No newline at end of file
diff --git a/springWarehouse/src/main/java/com/yen/springWarehouse/controller/OrderController.java b/springWarehouse/src/main/java/com/yen/springWarehouse/controller/OrderController.java
index f01b7b784..c6b046cc9 100644
--- a/springWarehouse/src/main/java/com/yen/springWarehouse/controller/OrderController.java
+++ b/springWarehouse/src/main/java/com/yen/springWarehouse/controller/OrderController.java
@@ -5,13 +5,15 @@
 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;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.Map;
 
@@ -23,6 +25,28 @@ public class OrderController {
     @Autowired
     OrderService orderService;
 
+    @Autowired
+    MerchantService merchantService;
+
+    @Autowired
+    ProductService productService;
+
+    @GetMapping("/toInput")
+    public String input(Map<String, Object> map) {
+
+        map.put("merchantList", merchantService.list());
+        map.put("productList", productService.list());
+        map.put("Order", new Order()); // TODO : check necessary ?
+        return "order/input_order";
+    }
+
+    @PostMapping("/create")
+    public String create(Order order) {
+
+        log.info("(OrderController.create) Create new order : " + order.toString());
+        orderService.save(order);
+        return "redirect:/order/list";
+    }
 
     @GetMapping("/list")
     public String list(Map<String, Object> map, @RequestParam(value="pageNo", required=false, defaultValue="1") String pageNoStr) {
@@ -53,4 +77,21 @@ public String list(Map<String, Object> map, @RequestParam(value="pageNo", requir
         return "order/list_order";
     }
 
+    @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";
+    }
+
+    @PostMapping(value="/update")
+    public String update(Order order) {
+
+        log.info("update order as {}", order);
+        orderService.updateById(order);
+        return "redirect:/order/list";
+    }
+
 }
diff --git a/springWarehouse/src/main/resources/templates/order/input_order.html b/springWarehouse/src/main/resources/templates/order/input_order.html
index 57c31f4b4..d80f1b8f1 100644
--- a/springWarehouse/src/main/resources/templates/order/input_order.html
+++ b/springWarehouse/src/main/resources/templates/order/input_order.html
@@ -2,20 +2,33 @@
 <html lang="en" xmlns:th="http://www.thymeleaf.org">
 <head>
     <meta charset="UTF-8">
-    <title>Add New Merchant</title>
+    <title>Add New 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">Add New Merchant</h3>
-<form th:action="@{/merchant/create}" method="post" th:object="${Merchant}">
+<h3 class="title">Add New Order</h3>
+<form th:action="@{/order/create}" method="post" th:object="${Order}">
+
     <div>
-        <span>Merchant Name:</span>
-        <input type="text" name="name" placeholder="Merchant Name">
+        <span>merchant:</span>
+        <select name="merchantId">
+            <option>=Select merchant name=</option>
+            <option th:each="list:${merchantList}" th:value="${list.id}" th:text="${list.name}"></option>
+        </select>
     </div>
+
     <div>
-        <span>Merchant city:</span>
-        <input type="text" name="city" placeholder="Merchant city">
+        <span>Product:</span>
+        <select name="productId">
+            <option>=Select product name=</option>
+            <option th:each="list:${productList}" th:value="${list.id}" th:text="${list.name}"></option>
+        </select>
+    </div>
+
+    <div>
+        <span>Amount:</span>
+        <input type="text" name="amount" >
     </div>
     <div>
         <input type="submit" value=" confirm "/>
diff --git a/springWarehouse/src/main/resources/templates/order/list_order.html b/springWarehouse/src/main/resources/templates/order/list_order.html
index d69aa27c0..0fe88fbc0 100644
--- a/springWarehouse/src/main/resources/templates/order/list_order.html
+++ b/springWarehouse/src/main/resources/templates/order/list_order.html
@@ -16,11 +16,13 @@ <h3 class="title">Order Management</h3>
     <tr>
         <th>Id</th>
         <th>Merchant Id</th>
+        <th>Product Id</th>
         <th>Amount</th>
     </tr>
     <tr class="type" th:each="order : ${page.records}">
         <td th:text="${order.id}" nowrap></td>
         <td id="merchant" th:text="${order.merchantId}" nowrap></td>
+        <td id="product" th:text="${order.productId}" nowrap></td>
         <td id="amount" th:text="${order.amount}" nowrap></td>
         <td nowrap>
             <button class="update" th:href="@{/order/preUpdate/{id}(id=${order.id})}" >修改</button>

From 1337dd8f1385f517211743369129836ee40bb66b Mon Sep 17 00:00:00 2001
From: yennanliu <f339339@gmail.com>
Date: Fri, 13 Oct 2023 11:21:11 +0800
Subject: [PATCH 04/11] fix order update html, update orderController,  update
 list order html

---
 .../controller/OrderController.java            | 13 ++++++++++---
 .../resources/templates/order/list_order.html  |  2 +-
 .../templates/order/update_order.html          | 18 +++++++++---------
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/springWarehouse/src/main/java/com/yen/springWarehouse/controller/OrderController.java b/springWarehouse/src/main/java/com/yen/springWarehouse/controller/OrderController.java
index c6b046cc9..8b8b7d173 100644
--- a/springWarehouse/src/main/java/com/yen/springWarehouse/controller/OrderController.java
+++ b/springWarehouse/src/main/java/com/yen/springWarehouse/controller/OrderController.java
@@ -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;
@@ -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")
diff --git a/springWarehouse/src/main/resources/templates/order/list_order.html b/springWarehouse/src/main/resources/templates/order/list_order.html
index 0fe88fbc0..45c10c24d 100644
--- a/springWarehouse/src/main/resources/templates/order/list_order.html
+++ b/springWarehouse/src/main/resources/templates/order/list_order.html
@@ -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>
 
diff --git a/springWarehouse/src/main/resources/templates/order/update_order.html b/springWarehouse/src/main/resources/templates/order/update_order.html
index 01db94aec..e19dea553 100644
--- a/springWarehouse/src/main/resources/templates/order/update_order.html
+++ b/springWarehouse/src/main/resources/templates/order/update_order.html
@@ -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>

From 1276485bf9cc640c272b12677f090d4abce9dd1c Mon Sep 17 00:00:00 2001
From: yennanliu <f339339@gmail.com>
Date: Sat, 14 Oct 2023 21:42:11 +0800
Subject: [PATCH 05/11] add status to order bean, html, add amount default
 value, fix ddl

---
 springWarehouse/sql/ddl/order.sql             |  9 +++---
 .../com/yen/springWarehouse/bean/Order.java   |  3 ++
 .../controller/OrderController.java           |  2 ++
 .../springWarehouse/enums/OrderStatus.java    | 28 +++++++++++++++++++
 .../templates/order/input_order.html          |  2 +-
 .../resources/templates/order/list_order.html |  2 ++
 6 files changed, 41 insertions(+), 5 deletions(-)
 create mode 100644 springWarehouse/src/main/java/com/yen/springWarehouse/enums/OrderStatus.java

diff --git a/springWarehouse/sql/ddl/order.sql b/springWarehouse/sql/ddl/order.sql
index cfde3e875..a4003ce95 100644
--- a/springWarehouse/sql/ddl/order.sql
+++ b/springWarehouse/sql/ddl/order.sql
@@ -8,13 +8,14 @@ CREATE TABLE IF NOT EXISTS orders (
     merchant_id int,
     product_id int,
     amount int,
+    status varchar(10),
     create_time datetime,
     update_time datetime
 );
 
 
-INSERT INTO orders(id, merchant_id, product_id, amount, create_time, update_time)
+INSERT INTO orders(id, merchant_id, product_id, amount, status, create_time, update_time)
 VALUES
-("213ac245-7a2a-453b-a4a7-149426b13f84", 1, 1, 1, now(), now()),
-("d42b3224-b715-46af-9294-3b2ecc6ccc7a", 2, 2, 1, now(), now()),
-(uuid(), 1, 3, 1, now(), now());
\ No newline at end of file
+("213ac245-7a2a-453b-a4a7-149426b13f84", 1, 1, 1, "completed", now(), now()),
+("d42b3224-b715-46af-9294-3b2ecc6ccc7a", 2, 2, 1, "cancelled", now(), now()),
+(uuid(), 1, 3, 1, "pending", now(), now());
\ No newline at end of file
diff --git a/springWarehouse/src/main/java/com/yen/springWarehouse/bean/Order.java b/springWarehouse/src/main/java/com/yen/springWarehouse/bean/Order.java
index 598461f11..cd5b56b73 100644
--- a/springWarehouse/src/main/java/com/yen/springWarehouse/bean/Order.java
+++ b/springWarehouse/src/main/java/com/yen/springWarehouse/bean/Order.java
@@ -32,6 +32,9 @@ public class Order implements Serializable {
     @TableField("amount")
     private int amount;
 
+    @TableField("status")
+    private String status;
+
     @TableField("create_time")
     private LocalDateTime createTime;
 
diff --git a/springWarehouse/src/main/java/com/yen/springWarehouse/controller/OrderController.java b/springWarehouse/src/main/java/com/yen/springWarehouse/controller/OrderController.java
index 8b8b7d173..d3f4b62b2 100644
--- a/springWarehouse/src/main/java/com/yen/springWarehouse/controller/OrderController.java
+++ b/springWarehouse/src/main/java/com/yen/springWarehouse/controller/OrderController.java
@@ -5,6 +5,7 @@
 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.enums.OrderStatus;
 import com.yen.springWarehouse.service.MerchantService;
 import com.yen.springWarehouse.service.OrderService;
 import com.yen.springWarehouse.service.ProductService;
@@ -41,6 +42,7 @@ public String input(Map<String, Object> map) {
     @PostMapping("/create")
     public String create(Order order) {
 
+        order.setStatus(OrderStatus.Pending.getMsg());
         log.info("(OrderController.create) Create new order : " + order.toString());
         orderService.save(order);
         return "redirect:/order/list";
diff --git a/springWarehouse/src/main/java/com/yen/springWarehouse/enums/OrderStatus.java b/springWarehouse/src/main/java/com/yen/springWarehouse/enums/OrderStatus.java
new file mode 100644
index 000000000..e0f237a75
--- /dev/null
+++ b/springWarehouse/src/main/java/com/yen/springWarehouse/enums/OrderStatus.java
@@ -0,0 +1,28 @@
+package com.yen.springWarehouse.enums;
+
+public enum OrderStatus {
+
+    Completed(10000, "completed"),
+
+    Pending(10001, "pending"),
+
+    Cancelled(10002, "cancelled");
+
+
+    private int code;
+    private String msg;
+
+    OrderStatus(int code, String msg){
+        this.code = code;
+        this.msg = msg;
+    }
+
+    public int getCode(){
+        return this.code;
+    }
+
+    public String getMsg(){
+        return this.msg;
+    }
+
+}
diff --git a/springWarehouse/src/main/resources/templates/order/input_order.html b/springWarehouse/src/main/resources/templates/order/input_order.html
index d80f1b8f1..f0e088d0f 100644
--- a/springWarehouse/src/main/resources/templates/order/input_order.html
+++ b/springWarehouse/src/main/resources/templates/order/input_order.html
@@ -28,7 +28,7 @@ <h3 class="title">Add New Order</h3>
 
     <div>
         <span>Amount:</span>
-        <input type="text" name="amount" >
+        <input type="value" value="0" name="amount" >
     </div>
     <div>
         <input type="submit" value=" confirm "/>
diff --git a/springWarehouse/src/main/resources/templates/order/list_order.html b/springWarehouse/src/main/resources/templates/order/list_order.html
index 45c10c24d..efd534e03 100644
--- a/springWarehouse/src/main/resources/templates/order/list_order.html
+++ b/springWarehouse/src/main/resources/templates/order/list_order.html
@@ -18,12 +18,14 @@ <h3 class="title">Order Management</h3>
         <th>Merchant Id</th>
         <th>Product Id</th>
         <th>Amount</th>
+        <th>Status</th>
     </tr>
     <tr class="type" th:each="order : ${page.records}">
         <td th:text="${order.id}" nowrap></td>
         <td id="merchant" th:text="${order.merchantId}" nowrap></td>
         <td id="product" th:text="${order.productId}" nowrap></td>
         <td id="amount" th:text="${order.amount}" nowrap></td>
+        <td id="status" th:text="${order.status}" 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})}">Cancel Order</button>

From 3c077546e22d9c3475b3cb0d4f8c661c1afacb58 Mon Sep 17 00:00:00 2001
From: yennanliu <f339339@gmail.com>
Date: Sat, 14 Oct 2023 22:32:44 +0800
Subject: [PATCH 06/11] add update productWithOrder, fix bean int type, update
 controller

---
 .../com/yen/springWarehouse/bean/Order.java   |  6 +--
 .../controller/OrderController.java           |  9 +++-
 .../springWarehouse/service/OrderService.java |  2 +
 .../service/impl/OrderServiceImpl.java        | 43 +++++++++++++++++++
 4 files changed, 56 insertions(+), 4 deletions(-)

diff --git a/springWarehouse/src/main/java/com/yen/springWarehouse/bean/Order.java b/springWarehouse/src/main/java/com/yen/springWarehouse/bean/Order.java
index cd5b56b73..084880e29 100644
--- a/springWarehouse/src/main/java/com/yen/springWarehouse/bean/Order.java
+++ b/springWarehouse/src/main/java/com/yen/springWarehouse/bean/Order.java
@@ -24,13 +24,13 @@ public class Order implements Serializable {
     private String id;
 
     @TableField("merchant_id")
-    private int merchantId;
+    private Integer merchantId;
 
     @TableField("product_id")
-    private int productId;
+    private Integer productId;
 
     @TableField("amount")
-    private int amount;
+    private Integer amount;
 
     @TableField("status")
     private String status;
diff --git a/springWarehouse/src/main/java/com/yen/springWarehouse/controller/OrderController.java b/springWarehouse/src/main/java/com/yen/springWarehouse/controller/OrderController.java
index d3f4b62b2..d4e877f77 100644
--- a/springWarehouse/src/main/java/com/yen/springWarehouse/controller/OrderController.java
+++ b/springWarehouse/src/main/java/com/yen/springWarehouse/controller/OrderController.java
@@ -4,7 +4,9 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yen.springWarehouse.bean.Merchant;
 import com.yen.springWarehouse.bean.Order;
+import com.yen.springWarehouse.bean.Product;
 import com.yen.springWarehouse.enums.OrderStatus;
 import com.yen.springWarehouse.service.MerchantService;
 import com.yen.springWarehouse.service.OrderService;
@@ -35,13 +37,18 @@ public String input(Map<String, Object> map) {
 
         map.put("merchantList", merchantService.list());
         map.put("productList", productService.list());
-        map.put("Order", new Order()); // TODO : check necessary ?
+        //map.put("Order", new Order()); // TODO : check necessary ?
         return "order/input_order";
     }
 
     @PostMapping("/create")
     public String create(Order order) {
 
+        if (!orderService.updateProductWithOrder(order)){
+            log.error("order create failed");
+            return "redirect:/order/list";
+        }
+
         order.setStatus(OrderStatus.Pending.getMsg());
         log.info("(OrderController.create) Create new order : " + order.toString());
         orderService.save(order);
diff --git a/springWarehouse/src/main/java/com/yen/springWarehouse/service/OrderService.java b/springWarehouse/src/main/java/com/yen/springWarehouse/service/OrderService.java
index e565f7bfe..e5d337f12 100644
--- a/springWarehouse/src/main/java/com/yen/springWarehouse/service/OrderService.java
+++ b/springWarehouse/src/main/java/com/yen/springWarehouse/service/OrderService.java
@@ -10,4 +10,6 @@
 public interface OrderService extends IService<Order> {
 
     Page<Order> getOrderPage(OrderQueryHelper helper, Integer pageNo, Integer pageSize);
+
+    Boolean updateProductWithOrder(Order order);
 }
diff --git a/springWarehouse/src/main/java/com/yen/springWarehouse/service/impl/OrderServiceImpl.java b/springWarehouse/src/main/java/com/yen/springWarehouse/service/impl/OrderServiceImpl.java
index 692bb455a..a7addadda 100644
--- a/springWarehouse/src/main/java/com/yen/springWarehouse/service/impl/OrderServiceImpl.java
+++ b/springWarehouse/src/main/java/com/yen/springWarehouse/service/impl/OrderServiceImpl.java
@@ -4,10 +4,15 @@
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yen.springWarehouse.bean.Merchant;
 import com.yen.springWarehouse.bean.Order;
+import com.yen.springWarehouse.bean.Product;
 import com.yen.springWarehouse.mapper.OrderMapper;
+import com.yen.springWarehouse.service.MerchantService;
 import com.yen.springWarehouse.service.OrderService;
+import com.yen.springWarehouse.service.ProductService;
 import com.yen.springWarehouse.util.OrderQueryHelper;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -17,6 +22,13 @@
 @Transactional(rollbackFor = Exception.class)
 public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements OrderService {
 
+    @Autowired
+    MerchantService merchantService;
+
+    @Autowired
+    ProductService productService;
+
+
     @Override
     public Page<Order> getOrderPage(OrderQueryHelper helper, Integer pageNo, Integer pageSize) {
 
@@ -34,4 +46,35 @@ public Page<Order> getOrderPage(OrderQueryHelper helper, Integer pageNo, Integer
         return new Page<>();
     }
 
+    @Override
+    public Boolean updateProductWithOrder(Order order) {
+
+        if (order.getMerchantId() == null || order.getProductId() == null){
+            log.error("merchantId or ProductId is null");
+            return false;
+        }
+
+        Product product = productService.getById(order.getProductId());
+        Merchant merchant = merchantService.getById(order.getMerchantId());
+
+        // TODO : optimize below
+        // TODO : send error msg to FE
+        // merchant doesn't own product
+        if (product.getMerchantId() != merchant.getId()){
+            log.error("merchant doesn't own product");
+            return false;
+        }
+
+        int diff = product.getAmount() - order.getAmount();
+        if (diff < 0){
+            log.error("product amount less than order amount");
+            return false;
+        }
+
+        // update product
+        product.setAmount(diff);
+        productService.updateById(product);
+        return true;
+    }
+
 }

From 29d9c2b7c932998b036a69d879dbd062653b6da9 Mon Sep 17 00:00:00 2001
From: yennanliu <f339339@gmail.com>
Date: Sat, 14 Oct 2023 23:02:39 +0800
Subject: [PATCH 07/11] add getProductDtoListFromProductList method

---
 .../controller/ProductController.java         |  1 +
 .../yen/springWarehouse/dto/ProductDto.java   | 29 +++++++++++++++++
 .../service/ProductService.java               |  6 ++++
 .../service/impl/ProductServiceImpl.java      | 32 +++++++++++++++++++
 4 files changed, 68 insertions(+)
 create mode 100644 springWarehouse/src/main/java/com/yen/springWarehouse/dto/ProductDto.java

diff --git a/springWarehouse/src/main/java/com/yen/springWarehouse/controller/ProductController.java b/springWarehouse/src/main/java/com/yen/springWarehouse/controller/ProductController.java
index a5a69ab3b..a090508ea 100644
--- a/springWarehouse/src/main/java/com/yen/springWarehouse/controller/ProductController.java
+++ b/springWarehouse/src/main/java/com/yen/springWarehouse/controller/ProductController.java
@@ -79,6 +79,7 @@ public String list(@RequestParam(value="pageNo", required=false, defaultValue="1
 
         Page<Product> page = productService.getProductPage(helper, pageNo, PAGE_SIZE);
         map.put("productTypeList", productTypeService.list());
+        map.put("merchantList", merchantService.list());
         map.put("page", page);
         map.put("helper", helper);
         log.info("(ProductController list) map = {}", map);
diff --git a/springWarehouse/src/main/java/com/yen/springWarehouse/dto/ProductDto.java b/springWarehouse/src/main/java/com/yen/springWarehouse/dto/ProductDto.java
new file mode 100644
index 000000000..3f63ec6d5
--- /dev/null
+++ b/springWarehouse/src/main/java/com/yen/springWarehouse/dto/ProductDto.java
@@ -0,0 +1,29 @@
+package com.yen.springWarehouse.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ProductDto {
+
+    private int id;
+
+    private String name;
+
+    private int typeId;
+
+    private int price;
+
+    private int merchantId;
+
+    private String productStatus;
+
+    private int amount;
+
+    private String productTypeName;
+
+    private String merchantName;
+}
diff --git a/springWarehouse/src/main/java/com/yen/springWarehouse/service/ProductService.java b/springWarehouse/src/main/java/com/yen/springWarehouse/service/ProductService.java
index 7c2c8f8a5..376e32fb8 100644
--- a/springWarehouse/src/main/java/com/yen/springWarehouse/service/ProductService.java
+++ b/springWarehouse/src/main/java/com/yen/springWarehouse/service/ProductService.java
@@ -3,10 +3,16 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yen.springWarehouse.bean.Product;
+import com.yen.springWarehouse.dto.ProductDto;
 import com.yen.springWarehouse.util.ProductQueryHelper;
 
+import java.util.List;
+
 public interface ProductService extends IService<Product> {
 
     /** Pagination */
     Page<Product> getProductPage(ProductQueryHelper helper, Integer pageNo, Integer pageSize);
+
+    List<ProductDto> getProductDtoListFromProductList(List<Product> productList);
+
 }
diff --git a/springWarehouse/src/main/java/com/yen/springWarehouse/service/impl/ProductServiceImpl.java b/springWarehouse/src/main/java/com/yen/springWarehouse/service/impl/ProductServiceImpl.java
index 5e907d77c..13e3e9ac3 100644
--- a/springWarehouse/src/main/java/com/yen/springWarehouse/service/impl/ProductServiceImpl.java
+++ b/springWarehouse/src/main/java/com/yen/springWarehouse/service/impl/ProductServiceImpl.java
@@ -4,17 +4,24 @@
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yen.springWarehouse.bean.Merchant;
 import com.yen.springWarehouse.bean.Product;
+import com.yen.springWarehouse.bean.ProductType;
+import com.yen.springWarehouse.dto.ProductDto;
 import com.yen.springWarehouse.mapper.ProductMapper;
 import com.yen.springWarehouse.mapper.ProductTypeMapper;
+import com.yen.springWarehouse.service.MerchantService;
 import com.yen.springWarehouse.service.ProductService;
+import com.yen.springWarehouse.service.ProductTypeService;
 import com.yen.springWarehouse.util.ProductQueryHelper;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.beans.BeanUtils;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 @Transactional(rollbackFor = Exception.class)
@@ -23,6 +30,12 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
     @Autowired
     ProductTypeMapper productTypeMapper;
 
+    @Autowired
+    MerchantService merchantService;
+
+    @Autowired
+    ProductTypeService productTypeService;
+
     @Override
     public Page<Product> getProductPage(ProductQueryHelper helper, Integer pageNo, Integer pageSize) {
 
@@ -54,6 +67,7 @@ public Page<Product> getProductPage(ProductQueryHelper helper, Integer pageNo, I
 //        );
 
         if(CollectionUtils.isNotEmpty(productList)){
+            //List<ProductDto> productDtoList = getProductDtoListFromProductList(productList);
             page.setRecords(productList);
             return page;
         }
@@ -62,4 +76,22 @@ public Page<Product> getProductPage(ProductQueryHelper helper, Integer pageNo, I
 
     }
 
+    @Override
+    public List<ProductDto> getProductDtoListFromProductList(List<Product> productList) {
+
+        List<ProductDto> productDtoList = productList.stream().map(
+                product -> {
+                    ProductDto productDto = new ProductDto();
+                    Merchant merchant = merchantService.getById(product.getMerchantId());
+                    ProductType productType = productTypeService.getById(product.getTypeId());
+                    BeanUtils.copyProperties(productDto, product);
+                    productDto.setMerchantName(merchant.getName());
+                    productDto.setProductTypeName(productType.getTypeName());
+                    return productDto;
+                }
+        ).collect(Collectors.toList());
+
+        return productDtoList;
+    }
+
 }

From b4ea5e6a5e373aabd011b5b7268f3ef6dbdd98c0 Mon Sep 17 00:00:00 2001
From: yennanliu <f339339@gmail.com>
Date: Sun, 15 Oct 2023 16:02:52 +0800
Subject: [PATCH 08/11] fix ddl, modify createTime when new order, show
 createdTime]

---
 springWarehouse/sql/ddl/product.sql                       | 8 ++++----
 .../yen/springWarehouse/controller/OrderController.java   | 2 ++
 .../src/main/resources/templates/order/list_order.html    | 2 ++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/springWarehouse/sql/ddl/product.sql b/springWarehouse/sql/ddl/product.sql
index 6313df28e..dbfe476d7 100644
--- a/springWarehouse/sql/ddl/product.sql
+++ b/springWarehouse/sql/ddl/product.sql
@@ -15,8 +15,8 @@ CREATE TABLE IF NOT EXISTS product(
 );
 
 -- DML
-INSERT INTO product(name, type_id, price, merchant_id, product_status)
+INSERT INTO product(name, type_id, price, merchant_id, amount, product_status)
 VALUES
-("i-phone", 2, 300, 1, "0"),
-("cookie2", 4, 10, 2, "0"),
-("soap", 1, 50, 1, "0");
\ No newline at end of file
+("i-phone", 2, 300, 1, 3, "0"),
+("cookie2", 4, 10, 2, 2, "0"),
+("soap", 1, 50, 1, 1, "0");
\ No newline at end of file
diff --git a/springWarehouse/src/main/java/com/yen/springWarehouse/controller/OrderController.java b/springWarehouse/src/main/java/com/yen/springWarehouse/controller/OrderController.java
index d4e877f77..b803601e8 100644
--- a/springWarehouse/src/main/java/com/yen/springWarehouse/controller/OrderController.java
+++ b/springWarehouse/src/main/java/com/yen/springWarehouse/controller/OrderController.java
@@ -16,6 +16,7 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
+import java.time.LocalDateTime;
 import java.util.Map;
 
 @Slf4j
@@ -50,6 +51,7 @@ public String create(Order order) {
         }
 
         order.setStatus(OrderStatus.Pending.getMsg());
+        order.setCreateTime(LocalDateTime.now());
         log.info("(OrderController.create) Create new order : " + order.toString());
         orderService.save(order);
         return "redirect:/order/list";
diff --git a/springWarehouse/src/main/resources/templates/order/list_order.html b/springWarehouse/src/main/resources/templates/order/list_order.html
index efd534e03..aa8c4d6e7 100644
--- a/springWarehouse/src/main/resources/templates/order/list_order.html
+++ b/springWarehouse/src/main/resources/templates/order/list_order.html
@@ -19,6 +19,7 @@ <h3 class="title">Order Management</h3>
         <th>Product Id</th>
         <th>Amount</th>
         <th>Status</th>
+        <th>Created time</th>
     </tr>
     <tr class="type" th:each="order : ${page.records}">
         <td th:text="${order.id}" nowrap></td>
@@ -26,6 +27,7 @@ <h3 class="title">Order Management</h3>
         <td id="product" th:text="${order.productId}" nowrap></td>
         <td id="amount" th:text="${order.amount}" nowrap></td>
         <td id="status" th:text="${order.status}" nowrap></td>
+        <td id="createTime" th:text="${order.createTime}" 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})}">Cancel Order</button>

From a5fb15c51e8edaf53854ffa98fa5da855e04a6e3 Mon Sep 17 00:00:00 2001
From: yennanliu <f339339@gmail.com>
Date: Sun, 15 Oct 2023 16:16:14 +0800
Subject: [PATCH 09/11] fix product input status, show status, add enum, fix
 ddl

---
 springWarehouse/sql/ddl/product.sql           |  8 +++---
 .../springWarehouse/enums/ProductStatus.java  | 25 +++++++++++++++++++
 .../templates/product/input_product.html      |  6 ++---
 .../templates/product/list_product.html       |  7 +++---
 4 files changed, 36 insertions(+), 10 deletions(-)
 create mode 100644 springWarehouse/src/main/java/com/yen/springWarehouse/enums/ProductStatus.java

diff --git a/springWarehouse/sql/ddl/product.sql b/springWarehouse/sql/ddl/product.sql
index dbfe476d7..a066db6c9 100644
--- a/springWarehouse/sql/ddl/product.sql
+++ b/springWarehouse/sql/ddl/product.sql
@@ -9,7 +9,7 @@ CREATE TABLE IF NOT EXISTS product(
     type_id int not null,
     price int not null,
     merchant_id varchar(100),
-    product_status varchar(1) not null,
+    product_status  varchar(10),
     amount int DEFAULT 0,
     constraint FK_PRODUCT_TYPE FOREIGN KEY (type_id) references product_type(type_id)
 );
@@ -17,6 +17,6 @@ CREATE TABLE IF NOT EXISTS product(
 -- DML
 INSERT INTO product(name, type_id, price, merchant_id, amount, product_status)
 VALUES
-("i-phone", 2, 300, 1, 3, "0"),
-("cookie2", 4, 10, 2, 2, "0"),
-("soap", 1, 50, 1, 1, "0");
\ No newline at end of file
+("i-phone", 2, 300, 1, 3, "on_board"),
+("cookie2", 4, 10, 2, 2, "new"),
+("soap", 1, 50, 1, 1, "off_board");
\ No newline at end of file
diff --git a/springWarehouse/src/main/java/com/yen/springWarehouse/enums/ProductStatus.java b/springWarehouse/src/main/java/com/yen/springWarehouse/enums/ProductStatus.java
new file mode 100644
index 000000000..952d5b184
--- /dev/null
+++ b/springWarehouse/src/main/java/com/yen/springWarehouse/enums/ProductStatus.java
@@ -0,0 +1,25 @@
+package com.yen.springWarehouse.enums;
+
+public enum ProductStatus {
+
+    New(20000, "new"),
+    onBoard(20001, "on_board"),
+    offBoard(20002, "off_board");
+
+    private int code;
+    private String msg;
+
+    ProductStatus(int code, String msg){
+        this.code = code;
+        this.msg = msg;
+    }
+
+    public int getCode(){
+        return this.code;
+    }
+
+    public String getMsg(){
+        return this.msg;
+    }
+
+}
diff --git a/springWarehouse/src/main/resources/templates/product/input_product.html b/springWarehouse/src/main/resources/templates/product/input_product.html
index 40feb6f91..8b1b8bc48 100644
--- a/springWarehouse/src/main/resources/templates/product/input_product.html
+++ b/springWarehouse/src/main/resources/templates/product/input_product.html
@@ -40,9 +40,9 @@ <h3 class="title">New product Type</h3>
     </div>
     <div>
         <span>product Status:</span>
-        <input type="radio" name="productStatus" th:value="O" checked>New&nbsp;&nbsp;
-        <input type="radio" name="productStatus" th:value="Z">on board&nbsp;&nbsp;
-        <input type="radio" name="productStatus" th:value="C">off board
+        <input type="radio" name="productStatus" th:value="new" checked>New&nbsp;&nbsp;
+        <input type="radio" name="productStatus" th:value="on_board">on board&nbsp;&nbsp;
+        <input type="radio" name="productStatus" th:value="off_board">off board
     </div>
     <div>
         <span>product amount:</span>
diff --git a/springWarehouse/src/main/resources/templates/product/list_product.html b/springWarehouse/src/main/resources/templates/product/list_product.html
index a728a4a61..3b2f5762d 100644
--- a/springWarehouse/src/main/resources/templates/product/list_product.html
+++ b/springWarehouse/src/main/resources/templates/product/list_product.html
@@ -16,19 +16,20 @@ <h3 class="title">Product List</h3>
     <tr>
         <th>Id</th>
         <th>Name</th>
+        <th>Merchant Id</th>
         <th>Type Id</th>
         <th>Price</th>
         <th>Amount</th>
-        <th>Merchant Id</th>
+        <th>Status</th>
     </tr>
     <tr class="type" th:each="Product : ${page.records}">
         <td th:text="${Product.id}" nowrap></td>
-        <!-- TODO : fix this -->
         <td id="name" th:text="${Product.name}" nowrap></td>
+        <td id="merchant_id" th:text="${Product.merchantId}" nowrap></td>
         <td id="id" th:text="${Product.typeId}" nowrap></td>
         <td id="price" th:text="${Product.price}" nowrap></td>
         <td id="amount" th:text="${Product.amount}" nowrap></td>
-        <td id="merchant_id" th:text="${Product.merchantId}" nowrap></td>
+        <td id="status" th:text="${Product.productStatus}" nowrap></td>
         <td nowrap>
             <button class="update" th:href="@{/product/preUpdate/{id}(id=${Product.id})}" >修改</button>
             <button class="delete" th:href="@{/product/remove/{id}(id=${Product.id})}">删除</button>

From 508fc1cdfc16c1f4cbcb588f11e52bb11d27eae1 Mon Sep 17 00:00:00 2001
From: yennanliu <f339339@gmail.com>
Date: Sun, 15 Oct 2023 16:52:43 +0800
Subject: [PATCH 10/11] update mapper, add csvUtil, update unit test

---
 springWarehouse/my_csv.csv                    |  2 +
 .../controller/OrderController.java           | 11 ++++
 .../springWarehouse/mapper/OrderMapper.java   |  1 +
 .../springWarehouse/mapper/OrderMapper.xml    |  8 ++-
 .../springWarehouse/service/OrderService.java |  4 ++
 .../service/impl/OrderServiceImpl.java        |  8 +++
 .../com/yen/springWarehouse/util/csvUtil.java | 24 ++++++++
 .../yen/springWarehouse/util/csvUtilTest.java | 57 +++++++++++++++++++
 8 files changed, 113 insertions(+), 2 deletions(-)
 create mode 100644 springWarehouse/my_csv.csv
 create mode 100644 springWarehouse/src/main/java/com/yen/springWarehouse/util/csvUtil.java
 create mode 100644 springWarehouse/src/test/java/com/yen/springWarehouse/util/csvUtilTest.java

diff --git a/springWarehouse/my_csv.csv b/springWarehouse/my_csv.csv
new file mode 100644
index 000000000..939efa4fc
--- /dev/null
+++ b/springWarehouse/my_csv.csv
@@ -0,0 +1,2 @@
+John,Doe,38,Comment Data Another line of comment data
+Jane,"Doe, Jr.",19,"She said ""I'm being quoted"""
diff --git a/springWarehouse/src/main/java/com/yen/springWarehouse/controller/OrderController.java b/springWarehouse/src/main/java/com/yen/springWarehouse/controller/OrderController.java
index b803601e8..18b82ccbf 100644
--- a/springWarehouse/src/main/java/com/yen/springWarehouse/controller/OrderController.java
+++ b/springWarehouse/src/main/java/com/yen/springWarehouse/controller/OrderController.java
@@ -17,6 +17,7 @@
 import org.springframework.web.bind.annotation.*;
 
 import java.time.LocalDateTime;
+import java.util.List;
 import java.util.Map;
 
 @Slf4j
@@ -112,4 +113,14 @@ public String update(Order order) {
         return "redirect:/order/list";
     }
 
+    // TODO : fix below
+    /**
+     *  download order data as csv
+     *  https://pdai.tech/md/spring/springboot/springboot-x-file-upload-download.html
+     */
+    @GetMapping(value="/download")
+    public void download(){
+        List<Order> orders = orderService.getAllOrders();
+    }
+
 }
diff --git a/springWarehouse/src/main/java/com/yen/springWarehouse/mapper/OrderMapper.java b/springWarehouse/src/main/java/com/yen/springWarehouse/mapper/OrderMapper.java
index 601005241..ee994f759 100644
--- a/springWarehouse/src/main/java/com/yen/springWarehouse/mapper/OrderMapper.java
+++ b/springWarehouse/src/main/java/com/yen/springWarehouse/mapper/OrderMapper.java
@@ -14,4 +14,5 @@ public interface OrderMapper extends BaseMapper<Order> {
 
     List<Order> getOrderList(Page<Order> orderPage, @Param("ew") Wrapper<Order> wrapper);
 
+    List<Order> getAllOrders();
 }
diff --git a/springWarehouse/src/main/java/com/yen/springWarehouse/mapper/OrderMapper.xml b/springWarehouse/src/main/java/com/yen/springWarehouse/mapper/OrderMapper.xml
index 515b4e3a0..50e5bf6fb 100644
--- a/springWarehouse/src/main/java/com/yen/springWarehouse/mapper/OrderMapper.xml
+++ b/springWarehouse/src/main/java/com/yen/springWarehouse/mapper/OrderMapper.xml
@@ -9,14 +9,18 @@
 
     <!-- SQL query with paging, NOTE : if there is group type in Mybatis, only use element type in group -->
     <select id="getOrderList" resultType="com.yen.springWarehouse.bean.Order">
-        select
+        SELECT
         *
-        from
+        FROM
         orders
         <where>
             ${ew.sqlSegment}
         </where>
+    </select>
 
+    <!--  List<Order> getAllOrders(); -->
+    <select id="getAllOrders" resultType="com.yen.springWarehouse.bean.Order">
+        SELECT * FROM orders
     </select>
 
 </mapper>
\ No newline at end of file
diff --git a/springWarehouse/src/main/java/com/yen/springWarehouse/service/OrderService.java b/springWarehouse/src/main/java/com/yen/springWarehouse/service/OrderService.java
index e5d337f12..3a5525698 100644
--- a/springWarehouse/src/main/java/com/yen/springWarehouse/service/OrderService.java
+++ b/springWarehouse/src/main/java/com/yen/springWarehouse/service/OrderService.java
@@ -7,9 +7,13 @@
 import com.yen.springWarehouse.util.OrderQueryHelper;
 import com.yen.springWarehouse.util.ProductQueryHelper;
 
+import java.util.List;
+
 public interface OrderService extends IService<Order> {
 
     Page<Order> getOrderPage(OrderQueryHelper helper, Integer pageNo, Integer pageSize);
 
     Boolean updateProductWithOrder(Order order);
+
+    List<Order> getAllOrders();
 }
diff --git a/springWarehouse/src/main/java/com/yen/springWarehouse/service/impl/OrderServiceImpl.java b/springWarehouse/src/main/java/com/yen/springWarehouse/service/impl/OrderServiceImpl.java
index a7addadda..3807bd076 100644
--- a/springWarehouse/src/main/java/com/yen/springWarehouse/service/impl/OrderServiceImpl.java
+++ b/springWarehouse/src/main/java/com/yen/springWarehouse/service/impl/OrderServiceImpl.java
@@ -28,6 +28,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
     @Autowired
     ProductService productService;
 
+    @Autowired
+    OrderMapper orderMapper;
+
 
     @Override
     public Page<Order> getOrderPage(OrderQueryHelper helper, Integer pageNo, Integer pageSize) {
@@ -77,4 +80,9 @@ public Boolean updateProductWithOrder(Order order) {
         return true;
     }
 
+    @Override
+    public List<Order> getAllOrders() {
+        return orderMapper.getAllOrders();
+    }
+
 }
diff --git a/springWarehouse/src/main/java/com/yen/springWarehouse/util/csvUtil.java b/springWarehouse/src/main/java/com/yen/springWarehouse/util/csvUtil.java
new file mode 100644
index 000000000..94cc037a0
--- /dev/null
+++ b/springWarehouse/src/main/java/com/yen/springWarehouse/util/csvUtil.java
@@ -0,0 +1,24 @@
+package com.yen.springWarehouse.util;
+
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+public class csvUtil {
+
+    // https://www.baeldung.com/java-csv
+    public String covertArrayToCSV(String[] data){
+        return Stream.of(data)
+                .map(this::escapeSpecialCharacters)
+                .collect(Collectors.joining(","));
+    }
+
+    private String escapeSpecialCharacters(String data) {
+        String escapedData = data.replaceAll("\\R", " ");
+        if (data.contains(",") || data.contains("\"") || data.contains("'")) {
+            data = data.replace("\"", "\"\"");
+            escapedData = "\"" + data + "\"";
+        }
+        return escapedData;
+    }
+
+}
diff --git a/springWarehouse/src/test/java/com/yen/springWarehouse/util/csvUtilTest.java b/springWarehouse/src/test/java/com/yen/springWarehouse/util/csvUtilTest.java
new file mode 100644
index 000000000..5a5bc8274
--- /dev/null
+++ b/springWarehouse/src/test/java/com/yen/springWarehouse/util/csvUtilTest.java
@@ -0,0 +1,57 @@
+package com.yen.springWarehouse.util;
+
+import com.yen.springWarehouse.bean.Order;
+import org.junit.jupiter.api.Test;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.PrintWriter;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+import static java.time.LocalTime.now;
+
+
+class csvUtilTest {
+
+    csvUtil csv_util = new csvUtil();
+
+    @Test
+    public void testOrderToCSV(){
+
+        Order o1 = new Order("some_id", 1, 2, 1, "some_status", LocalDateTime.now(), LocalDateTime.now());
+        System.out.println("o1 = " + o1.toString());
+
+        List<String[]> dataLines = new ArrayList<>();
+
+        String[] o1_str = o1.toString().split(",");
+        dataLines.add(o1_str);
+        //dataLines.add(new String[]{ "John", "Doe", "38", "Comment Data\nAnother line of comment data" });
+        //String[] o1_array = csv_util.covertArrayToCSV(o1_str);
+        //System.out.println("dataLines = " + dataLines);
+
+    }
+
+    @Test
+    public void testArrayToCSV() throws FileNotFoundException {
+
+        // https://www.baeldung.com/java-csv
+
+        String CSV_FILE_NAME = "my_csv.csv";
+
+        List<String[]> dataLines = new ArrayList<>();
+        dataLines.add(new String[]
+                { "John", "Doe", "38", "Comment Data\nAnother line of comment data" });
+        dataLines.add(new String[]
+                { "Jane", "Doe, Jr.", "19", "She said \"I'm being quoted\"" });
+
+        File csvOutputFile = new File(CSV_FILE_NAME);
+        try (PrintWriter pw = new PrintWriter(csvOutputFile)) {
+            dataLines.stream()
+                    .map(csv_util::covertArrayToCSV)
+                    .forEach(pw::println);
+        }
+    }
+
+}
\ No newline at end of file

From 399ea88258914346f6c77bfbabb2333e819b8dc4 Mon Sep 17 00:00:00 2001
From: yennanliu <f339339@gmail.com>
Date: Sun, 15 Oct 2023 17:34:57 +0800
Subject: [PATCH 11/11] update saveAssignment method, progress, readme, remove
 log

---
 springAssignmentSystem/README.md              |  1 +
 springAssignmentSystem/doc/progress.txt       |  6 +++++-
 .../frontend_app/src/AssignmentView/index.js  | 19 +++++++++++++++----
 .../src/CodeReviewAssignmentView/index.js     | 12 ++++++------
 4 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/springAssignmentSystem/README.md b/springAssignmentSystem/README.md
index da7e458c7..1f0ccdce4 100644
--- a/springAssignmentSystem/README.md
+++ b/springAssignmentSystem/README.md
@@ -56,6 +56,7 @@
 	- Part 30 : https://youtu.be/iYchh7v7P1Q?si=mDFJUFlhijuH83CN
 	- Part 31 : https://youtu.be/SOyfQCsOvO4?si=HsjKAdQBiflZHORp
 	- Part 32 : https://youtu.be/d_YH4TnLuhk?si=BmgFG1gWJvDLp5kO
+	- Part 33 : https://youtu.be/TbhJBqAiMGE?si=nIKaQMjUnpGcRjgw
 
 
 - Spring JWT
diff --git a/springAssignmentSystem/doc/progress.txt b/springAssignmentSystem/doc/progress.txt
index 76e386fb4..4b9b36ac8 100644
--- a/springAssignmentSystem/doc/progress.txt
+++ b/springAssignmentSystem/doc/progress.txt
@@ -103,4 +103,8 @@
 
 - 20231012
 		- https://youtu.be/d_YH4TnLuhk?si=BmgFG1gWJvDLp5kO
-			- progress : 16:22
\ No newline at end of file
+			- progress : 16:22
+
+- 20231015
+		- https://youtu.be/d_YH4TnLuhk?si=BmgFG1gWJvDLp5kO
+		- https://youtu.be/TbhJBqAiMGE?si=nIKaQMjUnpGcRjgw
\ No newline at end of file
diff --git a/springAssignmentSystem/frontend/frontend_app/src/AssignmentView/index.js b/springAssignmentSystem/frontend/frontend_app/src/AssignmentView/index.js
index 053a38559..33cbeb470 100644
--- a/springAssignmentSystem/frontend/frontend_app/src/AssignmentView/index.js
+++ b/springAssignmentSystem/frontend/frontend_app/src/AssignmentView/index.js
@@ -40,12 +40,21 @@ const AssignmentView = () => {
     console.log(assignment);
   }
 
-  function saveAssignment() {
+  function saveAssignment(status) {
     // call BE API save assignment
     // https://youtu.be/2XRQzR4y2yM?si=aiNeLhS3SXsU18HE&t=833
     // means when submit an assignment at the first time
-    if (assignment.status === assignmentStatuses[0].status) {
-      updateAssignment("status", assignmentStatuses[1].status);
+
+    // https://youtu.be/d_YH4TnLuhk?si=eYDtONFyA5U5hVZM&t=1134
+    // if (assignment.status === assignmentStatuses[0].status) {
+    //   updateAssignment("status", assignmentStatuses[1].status);
+    // } else {
+    //   // https://youtu.be/2XRQzR4y2yM?si=RDbtHpdUnVs8j7JE&t=1109
+    //   persist();
+    // }
+
+    if (status && assignment.status != status) {
+      updateAssignment("status", status);
     } else {
       // https://youtu.be/2XRQzR4y2yM?si=RDbtHpdUnVs8j7JE&t=1109
       persist();
@@ -216,7 +225,9 @@ const AssignmentView = () => {
             </Col>
           </Form.Group>
 
-          <Button onClick={() => saveAssignment()}>Submit Assignment</Button>
+          <Button onClick={() => saveAssignment("Submitted")}>
+            Submit Assignment
+          </Button>
         </>
       ) : (
         <></>
diff --git a/springAssignmentSystem/frontend/frontend_app/src/CodeReviewAssignmentView/index.js b/springAssignmentSystem/frontend/frontend_app/src/CodeReviewAssignmentView/index.js
index 866b17b25..72e791fe9 100644
--- a/springAssignmentSystem/frontend/frontend_app/src/CodeReviewAssignmentView/index.js
+++ b/springAssignmentSystem/frontend/frontend_app/src/CodeReviewAssignmentView/index.js
@@ -51,12 +51,12 @@ const CodeReviewerAssignmentView = () => {
     // means when submit an assignment at the first time
     // https://youtu.be/SOyfQCsOvO4?si=Eu1z9CWZO0c-e3Zq&t=816
 
-    console.log(
-      "(saveAssignment) status =  " +
-        status +
-        ",  assignment = " +
-        JSON.stringify(assignment)
-    );
+    // console.log(
+    //   "(saveAssignment) status =  " +
+    //     status +
+    //     ",  assignment = " +
+    //     JSON.stringify(assignment)
+    // );
 
     if (status && assignment.status !== status) {
       updateAssignment("status", status);