From 93a1329ad07bfd08add1675d18bd99fc1fd9a957 Mon Sep 17 00:00:00 2001 From: peihaoyu <617594538@qq.com> Date: Fri, 20 Mar 2020 16:36:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../phy/ebuy/controller/EbuyController.java | 7 ++ .../java/com/phy/ebuy/dao/EbuyMapper.java | 5 + .../com/phy/ebuy/dao/mapping/EbuyMapper.xml | 5 + .../com/phy/ebuy/service/EbuyService.java | 5 + .../ebuy/service/impl/EbuyServiceImpl.java | 6 ++ src/main/java/com/phy/ebuy/util/Listw.java | 19 ++++ .../WEB-INF/view/account/accountSettings.html | 42 +++++++- .../account/personalHomepage/allOrder.html | 1 + .../personalHomepage/pendingPayment.html | 1 + .../personalHomepage/toBeEvaluated.html | 1 + .../personalHomepage/toBeReceived.html | 1 + .../account/personalHomepage/toBeShipped.html | 1 + src/main/webapp/WEB-INF/view/cart.html | 3 +- src/main/webapp/WEB-INF/view/commodity.html | 5 + src/main/webapp/WEB-INF/view/middle.html | 8 +- .../webapp/static/css/accountSettings.css | 35 ++++++- src/main/webapp/static/css/commodity.css | 6 +- .../webapp/static/css/noSuchCommodity.css | 14 +++ src/main/webapp/static/css/public.css | 15 +-- src/main/webapp/static/img/noLogo.png | Bin 0 -> 5629 bytes src/main/webapp/static/js/account.js | 77 ++++++++------- src/main/webapp/static/js/allOrder.js | 40 +++++--- src/main/webapp/static/js/cart.js | 37 ++++--- src/main/webapp/static/js/commodity.js | 90 +++++++++++------- src/main/webapp/static/js/middle.js | 35 ++++++- src/main/webapp/static/js/pendingPayment.js | 18 +++- src/main/webapp/static/js/personalHomepage.js | 24 +++++ src/main/webapp/static/js/toBeEvaluated.js | 25 +++-- src/main/webapp/static/js/toBeRecevied.js | 20 +++- src/main/webapp/static/js/toBeShipped.js | 20 +++- 30 files changed, 424 insertions(+), 142 deletions(-) create mode 100644 src/main/java/com/phy/ebuy/util/Listw.java create mode 100644 src/main/webapp/static/css/noSuchCommodity.css create mode 100644 src/main/webapp/static/img/noLogo.png diff --git a/src/main/java/com/phy/ebuy/controller/EbuyController.java b/src/main/java/com/phy/ebuy/controller/EbuyController.java index 19ab7c4..5c05772 100644 --- a/src/main/java/com/phy/ebuy/controller/EbuyController.java +++ b/src/main/java/com/phy/ebuy/controller/EbuyController.java @@ -183,4 +183,11 @@ public class EbuyController { return result; } + //查询各状态订单数量 + @RequestMapping("/orderNumber") + @ResponseBody + public List> orderNumber(@RequestParam("userId")String userId) { + List> result = ebuyService.orderNumber(userId); + return result; + } } diff --git a/src/main/java/com/phy/ebuy/dao/EbuyMapper.java b/src/main/java/com/phy/ebuy/dao/EbuyMapper.java index 2bed63a..9cc6d03 100644 --- a/src/main/java/com/phy/ebuy/dao/EbuyMapper.java +++ b/src/main/java/com/phy/ebuy/dao/EbuyMapper.java @@ -43,4 +43,9 @@ public interface EbuyMapper { * 获取商品列表 */ List> commodityInfo(String keyword); + + /** + * 查询各状态订单数量 + */ + List> orderNumber(String userId); } diff --git a/src/main/java/com/phy/ebuy/dao/mapping/EbuyMapper.xml b/src/main/java/com/phy/ebuy/dao/mapping/EbuyMapper.xml index 0bba8c4..aa87483 100644 --- a/src/main/java/com/phy/ebuy/dao/mapping/EbuyMapper.xml +++ b/src/main/java/com/phy/ebuy/dao/mapping/EbuyMapper.xml @@ -130,4 +130,9 @@ inner join ebuy_commodity_attribute ca on c.commodity_id = ca.commodity_id ORDER BY c.commodity_type ,c.commodity_type_details + + + \ No newline at end of file diff --git a/src/main/java/com/phy/ebuy/service/EbuyService.java b/src/main/java/com/phy/ebuy/service/EbuyService.java index 1189dd0..67e8427 100644 --- a/src/main/java/com/phy/ebuy/service/EbuyService.java +++ b/src/main/java/com/phy/ebuy/service/EbuyService.java @@ -34,4 +34,9 @@ public interface EbuyService { * 获取商品列表 */ List> commodityInfo(String keyword); + + /** + * 查询各状态订单数量 + */ + List> orderNumber(String userId); } \ No newline at end of file diff --git a/src/main/java/com/phy/ebuy/service/impl/EbuyServiceImpl.java b/src/main/java/com/phy/ebuy/service/impl/EbuyServiceImpl.java index 7295e2f..33d0293 100644 --- a/src/main/java/com/phy/ebuy/service/impl/EbuyServiceImpl.java +++ b/src/main/java/com/phy/ebuy/service/impl/EbuyServiceImpl.java @@ -89,4 +89,10 @@ public class EbuyServiceImpl implements EbuyService { List> result = ebuyMapper.commodityInfo(keyword); return result; } + + @Override + public List> orderNumber(String userId) { + List> result = ebuyMapper.orderNumber(userId); + return result; + } } diff --git a/src/main/java/com/phy/ebuy/util/Listw.java b/src/main/java/com/phy/ebuy/util/Listw.java new file mode 100644 index 0000000..c8d5ec3 --- /dev/null +++ b/src/main/java/com/phy/ebuy/util/Listw.java @@ -0,0 +1,19 @@ +package com.phy.ebuy.util; + + +import java.util.ArrayList; +import java.util.List; + +public class Listw { + public static void main(String[] args) { + List list1=new ArrayList(); + + list1.add("xxx"); + + List list2=new ArrayList(); + list2.add("yyy"); + list2.add("yyy"); + list1.addAll(list2); + System.out.println(list1); + } +} diff --git a/src/main/webapp/WEB-INF/view/account/accountSettings.html b/src/main/webapp/WEB-INF/view/account/accountSettings.html index 6026131..3bd9ce7 100644 --- a/src/main/webapp/WEB-INF/view/account/accountSettings.html +++ b/src/main/webapp/WEB-INF/view/account/accountSettings.html @@ -6,11 +6,47 @@ - + + -
-

账户设置

+
+
+ 账号管理 +
+ +
+

您的安全设置

+
+
+
会员名
+
帅气的布里茨
+
+
+
登 录 邮 箱：
+
您尚未设置登录邮箱
+
添加邮箱
+
修改邮箱
+
+
+
绑 定 手 机：
+
15006732580
+
修改手机
+
+
+
+
+ +
+
+ +
diff --git a/src/main/webapp/WEB-INF/view/account/personalHomepage/allOrder.html b/src/main/webapp/WEB-INF/view/account/personalHomepage/allOrder.html index e583ec1..fe24728 100644 --- a/src/main/webapp/WEB-INF/view/account/personalHomepage/allOrder.html +++ b/src/main/webapp/WEB-INF/view/account/personalHomepage/allOrder.html @@ -6,6 +6,7 @@ + diff --git a/src/main/webapp/WEB-INF/view/account/personalHomepage/pendingPayment.html b/src/main/webapp/WEB-INF/view/account/personalHomepage/pendingPayment.html index abce185..845e20c 100644 --- a/src/main/webapp/WEB-INF/view/account/personalHomepage/pendingPayment.html +++ b/src/main/webapp/WEB-INF/view/account/personalHomepage/pendingPayment.html @@ -6,6 +6,7 @@ + diff --git a/src/main/webapp/WEB-INF/view/account/personalHomepage/toBeEvaluated.html b/src/main/webapp/WEB-INF/view/account/personalHomepage/toBeEvaluated.html index e74731d..f4c76b4 100644 --- a/src/main/webapp/WEB-INF/view/account/personalHomepage/toBeEvaluated.html +++ b/src/main/webapp/WEB-INF/view/account/personalHomepage/toBeEvaluated.html @@ -6,6 +6,7 @@ + diff --git a/src/main/webapp/WEB-INF/view/account/personalHomepage/toBeReceived.html b/src/main/webapp/WEB-INF/view/account/personalHomepage/toBeReceived.html index 3755ef0..7cd62d8 100644 --- a/src/main/webapp/WEB-INF/view/account/personalHomepage/toBeReceived.html +++ b/src/main/webapp/WEB-INF/view/account/personalHomepage/toBeReceived.html @@ -6,6 +6,7 @@ + diff --git a/src/main/webapp/WEB-INF/view/account/personalHomepage/toBeShipped.html b/src/main/webapp/WEB-INF/view/account/personalHomepage/toBeShipped.html index c13cd42..a63bcf1 100644 --- a/src/main/webapp/WEB-INF/view/account/personalHomepage/toBeShipped.html +++ b/src/main/webapp/WEB-INF/view/account/personalHomepage/toBeShipped.html @@ -6,6 +6,7 @@ + diff --git a/src/main/webapp/WEB-INF/view/cart.html b/src/main/webapp/WEB-INF/view/cart.html index 005ea2b..cf548fd 100644 --- a/src/main/webapp/WEB-INF/view/cart.html +++ b/src/main/webapp/WEB-INF/view/cart.html @@ -6,8 +6,9 @@ - + + diff --git a/src/main/webapp/WEB-INF/view/commodity.html b/src/main/webapp/WEB-INF/view/commodity.html index 745ac65..3fce70c 100644 --- a/src/main/webapp/WEB-INF/view/commodity.html +++ b/src/main/webapp/WEB-INF/view/commodity.html @@ -8,6 +8,7 @@ + @@ -28,6 +29,10 @@
+