From 19ff05d487ccd969023230c923fe718e15e8208d Mon Sep 17 00:00:00 2001
From: lihang19980418 <30917713+lihang19980418@users.noreply.github.com>
Date: Wed, 4 Sep 2019 22:52:28 +0800
Subject: [PATCH] finished pay

---
 .../neumall/controller/SettleController.java  |  6 ++
 .../neu/neumall/service/SettleService.java    |  4 +-
 src/main/resources/templates/settle.html      | 73 ++++++++++++-------
 .../resources/templates/settleSuccess.html    |  5 +-
 4 files changed, 60 insertions(+), 28 deletions(-)

diff --git a/src/main/java/edu/neu/neumall/controller/SettleController.java b/src/main/java/edu/neu/neumall/controller/SettleController.java
index d59ec88..2c676c4 100644
--- a/src/main/java/edu/neu/neumall/controller/SettleController.java
+++ b/src/main/java/edu/neu/neumall/controller/SettleController.java
@@ -46,6 +46,12 @@ public class SettleController {
     public String processSettle(@RequestParam("purchaseList[]") List<Long> purchaseItem,
                                 @RequestParam("addressID") int addressID,
                                 @AuthenticationPrincipal User user) {
+        if (purchaseItem != null) {
+            for (var cartID : purchaseItem) {
+                System.out.println(cartID);
+            }
+        }
+        System.out.println("addr id: "+addressID);
         settleService.ProcessPurchase(user, purchaseItem, addressID);
         return "settleSuccess.html";
     }
diff --git a/src/main/java/edu/neu/neumall/service/SettleService.java b/src/main/java/edu/neu/neumall/service/SettleService.java
index c77d102..8ec59f1 100644
--- a/src/main/java/edu/neu/neumall/service/SettleService.java
+++ b/src/main/java/edu/neu/neumall/service/SettleService.java
@@ -36,7 +36,6 @@ public class SettleService {
         if (!canPurchase(shoppingCart)) {
             return false;
         }
-        ArrayList<Product> products = new ArrayList<>();
         for (var item : shoppingCart) {
             var targetProductID = item.getProduct().getID();
             var productOptional = productService.getProductByID(targetProductID);
@@ -49,6 +48,9 @@ public class SettleService {
             productService.save(product);
             var address = shippingAddrRepository.findById(addressID).get();
 
+            //clear shopping-cart
+            shoppingCartService.deleteCartByID(item.getCartID(), user);
+
             // add a order record
             Order record = new Order();
             record.setCount(item.getCount());
diff --git a/src/main/resources/templates/settle.html b/src/main/resources/templates/settle.html
index 7d64d95..1209343 100644
--- a/src/main/resources/templates/settle.html
+++ b/src/main/resources/templates/settle.html
@@ -10,9 +10,9 @@
 <head lang="en">
     <meta charset="utf-8" />
     <title>order</title>
-    <link rel="stylesheet" type="text/css" href="css/public.css"/>
-    <link rel="stylesheet" type="text/css" href="css/proList.css" />
-    <link rel="stylesheet" type="text/css" href="css/mygxin.css" />
+    <link rel="stylesheet" type="text/css" href="/css/public.css"/>
+    <link rel="stylesheet" type="text/css" href="/css/proList.css" />
+    <link rel="stylesheet" type="text/css" href="/css/mygxin.css" />
 </head>
 <body>
 <div class="order cart mt">
@@ -20,7 +20,7 @@
     <div class="site">
         <p class="wrapper clearfix">
             <span class="fl">订单确认</span>
-            <img class="top" src="img/temp/cartTop02.png">
+            <img class="top" src="/img/temp/cartTop02.png">
         </p>
     </div>
     <!-----------------orderCon------------------->
@@ -33,6 +33,10 @@
             <div th:each="addr:${shippingAddrList}" class="addres clearfix">
                 <div class="addre fl on"  >
                     <div class="tit clearfix">
+                        <label class="fl">
+                            <input type="radio" name="rad" th:value="${addr.getID()}" >
+                            <span></span>
+                        </label>
                         <p th:text="${addr.getReceiverName()}" class="fl">
                             <span class="default">[默认地址]</span>
                         </p>
@@ -65,31 +69,20 @@
                 <span>中通快递</span>
             </div>
         </div>
+        <!--/*@thymesVar id="productList" type="java.util.Set<edu.neu.neumall.entity.ShoppingCart>"*/-->
         <div class="orderR fr">
             <div class="msg">
                 <h3>订单内容<a href="cart" class="fr">返回购物车</a></h3>
                 <!--------ul---------------->
-                <ul class="clearfix">
+                <ul  th:each="product:${productList}" class="clearfix">
                     <li class="fl">
-                        <img src="img/temp/order01.jpg">
+                        <img th:src="${product.getProduct().main_img}" height="92" width="92">
                     </li>
                     <li class="fl">
-                        <p>创意现代简约干花花瓶摆件</p>
-                        <p>颜色分类：烟灰色玻璃瓶</p>
-                        <p>数量：1</p>
+                        <p th:text="${product.getProduct().name}"></p>
+                        <p th:text="'数量'+${product.getCount()}"></pth:text>
                     </li>
-                    <li class="fr">￥69.90</li>
-                </ul>
-                <ul class="clearfix">
-                    <li class="fl">
-                        <img src="img/temp/order02.jpg">
-                    </li>
-                    <li class="fl">
-                        <p>创意现代简约干花花瓶摆件</p>
-                        <p>颜色分类：烟灰色玻璃瓶</p>
-                        <p>数量：1</p>
-                    </li>
-                    <li class="fr">￥69.90</li>
+                    <li th:text="'￥'+${product.getProduct().price}" class="fr"></li>
                 </ul>
             </div>
             <!--------tips---------------->
@@ -103,7 +96,7 @@
                 <p><span class="fl">合计：</span><span class="fr">￥139.80</span></p>
             </div>
             <!--<input type="button" name="" value="去支付"> -->
-            <a href="ok.html" class="pay">去支付</a>
+            <a onclick="processSubmit()" class="pay">去支付</a>
         </div>
     </div>
 </div>
@@ -157,9 +150,37 @@
         </dl>
     </a>
 </div>
-<script src="js/jquery-1.12.4.min.js" type="text/javascript" charset="utf-8"></script>
-<script src="js/public.js" type="text/javascript" charset="utf-8"></script>
-<script src="js/pro.js" type="text/javascript" charset="utf-8"></script>
-<script src="js/user.js" type="text/javascript" charset="utf-8"></script>
+<form id="submit-form" action="/settle/process" method="post">
+    <!--/*@thymesVar id="productList" type="java.util.List<edu.neu.neumall.entity.ShoppingCart>"*/-->
+    <input type="hidden" th:each="product:${productList}" th:value="${product.getCartID()}" name="purchaseList[]">
+</form>
+<script src="/js/jquery-1.12.4.min.js" type="text/javascript" charset="utf-8"></script>
+<script src="/js/public.js" type="text/javascript" charset="utf-8"></script>
+<script src="/js/pro.js" type="text/javascript" charset="utf-8"></script>
+<script src="/js/user.js" type="text/javascript" charset="utf-8"></script>
+<script>
+
+    function processSubmit() {
+        var radios = document.getElementsByName("rad");
+        for(var i=0; i<radios.length; i++){
+            if(radios[i].checked){
+                addAddrInput(radios[i].value);
+                $('form#submit-form').submit();
+                return;
+            }
+        }
+    }
+    
+    function addAddrInput(addr_id) {
+        $('<input>').attr({
+            type: 'hiden',
+            id: addr_id,
+            name: 'addressID',
+            value: addr_id
+        }).appendTo('#submit-form');
+    }
+
+
+</script>
 </body>
 </html>
diff --git a/src/main/resources/templates/settleSuccess.html b/src/main/resources/templates/settleSuccess.html
index 288db49..bd7abad 100644
--- a/src/main/resources/templates/settleSuccess.html
+++ b/src/main/resources/templates/settleSuccess.html
@@ -5,6 +5,9 @@
     <title>支付成功</title>
 </head>
 <body>
-
+<h1>支付成功</h1>
+<h1>支付成功</h1>
+<h1>支付成功</h1>
+<h1>支付成功</h1>
 </body>
 </html>
\ No newline at end of file