From 1f91165b65c584c2d01d9826ef5a297d16ce9cf5 Mon Sep 17 00:00:00 2001 From: Bosen Date: Sun, 30 May 2021 22:52:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jieyue.sql | 7 +- .../controller/AdminLoginController.java | 29 +++--- .../admin/service/AdminLoginService.java | 6 +- .../jieyue/common/mapper/SysOrderMapper.java | 2 +- .../controller/MerchantHomeController.java | 5 +- .../controller/MerchantLoginController.java | 26 +++--- .../service/MerchantLoginService.java | 2 +- .../user/controller/UserLoginController.java | 25 ++---- src/main/resources/application.yml | 2 +- .../static/image/user/home/logo/logo.png | Bin 2523 -> 5349 bytes .../static/mapping/SysOrderMapping.xml | 4 +- .../static/mapping/SysUserMapping.xml | 2 +- .../templates/admin/login/index.html | 84 ++++++++++++++++-- .../templates/admin/merchant/index.html | 20 ++--- .../templates/admin/notice/index.html | 6 +- .../resources/templates/admin/user/index.html | 20 +++-- .../templates/merchant/login/index.html | 72 +++++++++++---- .../templates/merchant/ui/index.html | 18 ++-- .../templates/merchant/user/index.html | 6 +- .../resources/templates/user/cart/index.html | 12 +-- .../resources/templates/user/login/index.html | 61 +++++++++++-- .../templates/user/notice/index.html | 21 +++-- .../resources/templates/user/order/index.html | 4 +- 23 files changed, 302 insertions(+), 132 deletions(-) diff --git a/jieyue.sql b/jieyue.sql index 38d7cde..5b9a6bd 100644 --- a/jieyue.sql +++ b/jieyue.sql @@ -11,7 +11,7 @@ Target Server Version : 50716 File Encoding : 65001 - Date: 22/04/2021 14:57:16 + Date: 30/05/2021 17:25:45 */ SET NAMES utf8mb4; @@ -119,6 +119,7 @@ INSERT INTO `sys_comment` VALUES (19, 1, 44, 8, '测试测试测试测试测试 INSERT INTO `sys_comment` VALUES (20, 1, 44, 8, '测试测试测试测试测试测试测试测试测试测试测试测试测试', 1610247780833); INSERT INTO `sys_comment` VALUES (21, 1, 44, 8, '测试测试测试测试测试测试测试测试测试测试测试测试测试', 1610247784508); INSERT INTO `sys_comment` VALUES (22, 1, 44, 8, '测试测试测试测试测试测试测试测试测试测试测试测试测试', 1610247789686); + -- ---------------------------- -- Table structure for sys_goods -- ---------------------------- @@ -285,7 +286,7 @@ CREATE TABLE `sys_order` ( `merchant_ratio` float(11, 1) NOT NULL DEFAULT 1.0 COMMENT '订单创建时商户的费率', PRIMARY KEY (`id`) USING BTREE, UNIQUE INDEX `order_id`(`order_id`) USING BTREE COMMENT '订单号唯一' -) ENGINE = InnoDB AUTO_INCREMENT = 95 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; +) ENGINE = InnoDB AUTO_INCREMENT = 94 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; -- ---------------------------- -- Records of sys_order @@ -384,6 +385,6 @@ CREATE TABLE `sys_user` ( INSERT INTO `sys_user` VALUES (1, 'test', 'e10adc3949ba59abbe56e057f20f883e', 'bosen_once@163.com', 1, '/data/header/user/1.jpg'); INSERT INTO `sys_user` VALUES (3, 'bosen_once@qq.com', 'e10adc3949ba59abbe56e057f20f883e', 'bosen_once@qq.com', 1, '/data/header/user/default.jpg'); INSERT INTO `sys_user` VALUES (4, 'test111', 'e10adc3949ba59abbe56e057f20f883e', '806317173@qq.com', 0, '/data/header/user/default.jpg'); -INSERT INTO `sys_user` VALUES (5, 'lalalal', 'e10adc3949ba59abbe56e057f20f883e', '2390025289@qq.com', 0, '/data/header/user/default.jpg'); +INSERT INTO `sys_user` VALUES (5, 'lalalal', 'e10adc3949ba59abbe56e057f20f883e', '2390025288@qq.com', 0, '/data/header/user/default.jpg'); SET FOREIGN_KEY_CHECKS = 1; diff --git a/src/main/java/com/example/jieyue/admin/controller/AdminLoginController.java b/src/main/java/com/example/jieyue/admin/controller/AdminLoginController.java index 3a99292..36fb110 100644 --- a/src/main/java/com/example/jieyue/admin/controller/AdminLoginController.java +++ b/src/main/java/com/example/jieyue/admin/controller/AdminLoginController.java @@ -67,34 +67,27 @@ public class AdminLoginController { * 注册请求 */ @RequestMapping("sign-up") - public ModelAndView signUp(ModelAndView modelAndView,String name,String email,String password){ - int result = service.singup(email,email,password); + public String signUp(String name,String email,String password){ + int result = service.singup(email,name,password); if (result==0){ - // 必填信息不能为空！ - modelAndView.addObject("msg","必填信息不能为空！"); + return "必填信息不能为空！"; } if (result==4){ - // 该邮箱已被注册 - modelAndView.addObject("msg","该邮箱已被注册"); + return "该邮箱已被注册"; } if (result==3){ - // 邮箱格式不正确 - modelAndView.addObject("msg","邮箱格式不正确"); + return "邮箱格式不正确"; } if (result==2){ - // 两次密码输入不一致 - modelAndView.addObject("msg","两次密码输入不一致"); + return "两次密码输入不一致"; } if (result==1){ - // 验证邮件已发送，请留意您的邮箱 - modelAndView.addObject("msg","验证邮件已发送，请留意您的邮箱"); + return "验证邮件已发送，请留意您的邮箱"; } if (result==-1){ - // 验证邮件发送失败，请重试 - modelAndView.addObject("msg","注册超时，请重试"); + return "注册超时，请重试"; } - modelAndView.setViewName("redirect:login"); - return modelAndView; + return null; } /* @@ -107,11 +100,11 @@ public class AdminLoginController { modelAndView.setViewName("redirect:/error"); } if (res==0){ - modelAndView.addObject("网络超时请重试"); + modelAndView.addObject("msg", "网络超时请重试"); modelAndView.setViewName("redirect:login"); } if (res==1){ - modelAndView.addObject("msg","注册成功"); + modelAndView.addObject("msg","注册成功，请完成登录！"); modelAndView.setViewName("redirect:login"); } return modelAndView; diff --git a/src/main/java/com/example/jieyue/admin/service/AdminLoginService.java b/src/main/java/com/example/jieyue/admin/service/AdminLoginService.java index 6fa145a..dbaf4a0 100644 --- a/src/main/java/com/example/jieyue/admin/service/AdminLoginService.java +++ b/src/main/java/com/example/jieyue/admin/service/AdminLoginService.java @@ -107,7 +107,7 @@ public class AdminLoginService { } } // 发送注册验证邮件 - boolean res = mailService.sendHtmlMail(email,"捷阅网管理员注册验证","点击此链接完成注册验证"); + boolean res = mailService.sendHtmlMail(email,"捷阅网管理员注册验证","点击此链接完成注册验证"); if (res){ return 1; }else{ @@ -129,11 +129,11 @@ public class AdminLoginService { int res1 = adminMapper.updateMark(1,email); if (res1==1){ // 设置用户角色,设置失败则回滚 - if (adminRoleMapper.updateStatus(1,admin.getId()) != 1){ + /*if (adminRoleMapper.updateStatus(1,admin.getId()) != 1){ // 执行回滚 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); return 0; - } + }*/ return 1; }else{ return 0; diff --git a/src/main/java/com/example/jieyue/common/mapper/SysOrderMapper.java b/src/main/java/com/example/jieyue/common/mapper/SysOrderMapper.java index 00f8d91..565a700 100644 --- a/src/main/java/com/example/jieyue/common/mapper/SysOrderMapper.java +++ b/src/main/java/com/example/jieyue/common/mapper/SysOrderMapper.java @@ -50,5 +50,5 @@ public interface SysOrderMapper { // 收益 float websiteProfitCount(); - float merchantProfitCount(int merchantId); + Float merchantProfitCount(int merchantId); } diff --git a/src/main/java/com/example/jieyue/merchant/controller/MerchantHomeController.java b/src/main/java/com/example/jieyue/merchant/controller/MerchantHomeController.java index 3b1f907..98fe95c 100644 --- a/src/main/java/com/example/jieyue/merchant/controller/MerchantHomeController.java +++ b/src/main/java/com/example/jieyue/merchant/controller/MerchantHomeController.java @@ -29,7 +29,10 @@ public class MerchantHomeController { int commentCount = homeService.getCommandCount(merchant.getId()); int userCount = homeService.getUserCount(merchant.getId()); int orderCount = homeService.getOrderCount(merchant.getId()); - float profit = orderMapper.merchantProfitCount(merchant.getId()); + float profit = 0; + if (orderMapper.merchantProfitCount(merchant.getId()) != null) { + profit = orderMapper.merchantProfitCount(merchant.getId()); + } modelAndView.addObject("commentCount",commentCount); modelAndView.addObject("profit",profit); diff --git a/src/main/java/com/example/jieyue/merchant/controller/MerchantLoginController.java b/src/main/java/com/example/jieyue/merchant/controller/MerchantLoginController.java index 4dbafae..2e07a14 100644 --- a/src/main/java/com/example/jieyue/merchant/controller/MerchantLoginController.java +++ b/src/main/java/com/example/jieyue/merchant/controller/MerchantLoginController.java @@ -45,6 +45,10 @@ public class MerchantLoginController { case 1: // 登陆成功 SysMt merchant = loginService.getMerchantInfo(email); + if (merchant.getState() == 0) { + modelAndView.addObject("msg","您的账号处于停用状态，请等待管理员处理"); + break; + } session.setAttribute("merchant",merchant); break; } @@ -65,27 +69,21 @@ public class MerchantLoginController { * 注册 */ @RequestMapping("sign-up") - public ModelAndView signUp(ModelAndView modelAndView,String email,String name,String password){ - modelAndView.setViewName("redirect:/merchant/login"); + public String signUp(String email,String name,String password){ int serviceRes = loginService.signUp(email,name,password); switch (serviceRes){ case -1: - modelAndView.addObject("msg","验证邮件发送失败，请重试"); - break; + return "验证邮件发送失败，请重试"; case 0: - modelAndView.addObject("msg","必填信息不能为空"); - break; + return "必填信息不能为空"; case 1: - modelAndView.addObject("msg","验证信息已发送至邮箱，请留意接收"); - break; + return "验证信息已发送至邮箱，请留意接收"; case 2: - modelAndView.addObject("msg","该邮箱已被注册"); - break; + return "该邮箱已被注册"; case 3: - modelAndView.addObject("msg","邮箱格式不正确"); - break; + return "邮箱格式不正确"; } - return modelAndView; + return null; } /* @@ -104,7 +102,7 @@ public class MerchantLoginController { break; case 1: modelAndView.setViewName("redirect:/merchant/login"); - modelAndView.addObject("msg","注册成功"); + modelAndView.addObject("msg","注册成功，请等待管理员的审核"); break; } return modelAndView; diff --git a/src/main/java/com/example/jieyue/merchant/service/MerchantLoginService.java b/src/main/java/com/example/jieyue/merchant/service/MerchantLoginService.java index 33357ea..0e9f0e6 100644 --- a/src/main/java/com/example/jieyue/merchant/service/MerchantLoginService.java +++ b/src/main/java/com/example/jieyue/merchant/service/MerchantLoginService.java @@ -83,7 +83,7 @@ public class MerchantLoginService { } } // 发送注册验证邮件 - boolean res = mailService.sendHtmlMail(email,"捷阅网商户注册验证","点击此链接完成注册验证"); + boolean res = mailService.sendHtmlMail(email,"捷阅网商户注册验证","点击此链接完成注册验证"); if (res){ return 1; }else{ diff --git a/src/main/java/com/example/jieyue/user/controller/UserLoginController.java b/src/main/java/com/example/jieyue/user/controller/UserLoginController.java index fdab3ac..f995681 100644 --- a/src/main/java/com/example/jieyue/user/controller/UserLoginController.java +++ b/src/main/java/com/example/jieyue/user/controller/UserLoginController.java @@ -68,34 +68,27 @@ public class UserLoginController { * 注册请求 */ @RequestMapping("sign-up") - public ModelAndView signUp(ModelAndView modelAndView,String email,String username,String password,String repwd){ + public String signUp(String email,String username,String password,String repwd){ int result = service.singup(email,username,password,repwd); if (result==0){ - // 必填信息不能为空！ - modelAndView.addObject("msg","必填信息不能为空！"); + return "必填信息不能为空！"; } if (result==4){ - // 该邮箱已被注册 - modelAndView.addObject("msg","该邮箱已被注册"); + return "该邮箱已被注册"; } if (result==3){ - // 邮箱格式不正确 - modelAndView.addObject("msg","邮箱格式不正确"); + return "邮箱格式不正确"; } if (result==2){ - // 两次密码输入不一致 - modelAndView.addObject("msg","两次密码输入不一致"); + return "两次密码输入不一致"; } if (result==1){ - // 验证邮件已发送，请留意您的邮箱 - modelAndView.addObject("msg","验证邮件已发送，请留意您的邮箱"); + return "验证邮件已发送，请留意您的邮箱"; } if (result==-1){ - // 验证邮件发送失败，请重试 - modelAndView.addObject("msg","注册超时，请重试"); + return "注册超时，请重试"; } - modelAndView.setViewName("redirect:login"); - return modelAndView; + return "网络出现错误！！"; } /* @@ -112,7 +105,7 @@ public class UserLoginController { modelAndView.setViewName("redirect:login"); } if (res==1){ - modelAndView.addObject("msg","注册成功"); + modelAndView.addObject("msg","注册成功，请完成登录"); modelAndView.setViewName("redirect:login"); } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 73315ff..82b1939 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,4 +1,4 @@ -site-url: 47.115.118.34 +site-url: 127.0.0.1 server: port: 80 tomcat: diff --git a/src/main/resources/static/image/user/home/logo/logo.png b/src/main/resources/static/image/user/home/logo/logo.png index 9c8e10ab05eed9666c1e0d57d050ba2456e47692..aa18c5e5a1959e4735d671ffded09a0204c32fba 100644 GIT binary patch literal 5349 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 delta 1894 zcmV-s2buWgDcci}BqkYjMObuGZ)S9NVRB^vL1b@YWgtmyVP|DhWnpA_ami&o0009N zkvftgF)<)FIW93ZI5RReEFdy4F*PqRIWI9VEif@UF)%tZFp=%tlL!JOljH&rlZpc^ zlQRPs2r@DJYQHwp_2 z3juI4a1$;8Fi$uom2A$=ZHU_og$4i+8UR3O0PyUgXWfGqa617gG;m@RdRCMV*$e;* z4S>)9aN-HQL~)+t62nfNV1Z;$4n{!<&xlp&z5zq_~sI+U51jT;|Ud zHHyzO^3cxq<6RCY^rWazTws3{ew9glABXw-HQx3q#Y4CaK%N!4z_y}H@f;J{hUY0> z;e8*5LIZgv^f`))6koIY4r7S_6~!4=^lcCtm=vcxl=%oRKMLY=#Ae&aOz3kH5PGU0 zL6}Eg>`;XKcax%(*M=60Mel^Zjh9yw?7Pp)+jBt7IxX5Gb~Bx>Yl43+WFLBXat4L- z3NtR)FbYN;U;~!}gq|lfKheEA~96OF`$G zwf=3c==}s`d|-bDUwn*&$xq)J9KG0-3z$J6XEk(Yqmyw}C0?#^hb{;ul6Ci39ix3# zl)^UD&6k#`Afm~!KEh_LhLVLtLRmU{YHm?Ol;qY!v4+JeOZJVkT|Y;m~G zqr>I)MLjLYIHIc5d|lPoS7ik;emYxXc05(esuOh*oL@C%-MyIWk_n-I@Nh%-R2_N2 zHmmZYM>2oA5T@LJAXK*{NEEUyh%yd!Pi-8e7)XZ`bg zqwU`$GleDtVJ1<2@<0yrF7>r3d+4<2GAT;JpJx3dI8FAulBlj};Ar-*EQo9C1WAaM z25Wz!jZw#L$J7~@$FGgZ$h5NZ&}P!ZOsxD!@vjGRn2us*AkD@jY;guddiH3#HwxkxPognJ*pwrgIuA_gAHdHJs+zM`-6}^seKazcv;tProDW32| z4)aaoZxr;na_X2 zLj%X5(BD!#KygQK{~2tc6$Aa4qd|2rFiLIVH@4FDiC0K|J}WHSIL gGyvoY{|PVv*3iAYc}>^~00000Nks-uM6N<$f(WK-#Q*>R diff --git a/src/main/resources/static/mapping/SysOrderMapping.xml b/src/main/resources/static/mapping/SysOrderMapping.xml index 5922b41..a6f654e 100644 --- a/src/main/resources/static/mapping/SysOrderMapping.xml +++ b/src/main/resources/static/mapping/SysOrderMapping.xml @@ -69,11 +69,11 @@ select * from sys_order where order_mark = #{orderMark}; - select sum((order_price-merchant_ratio*order_price)/1) from sys_order where order_merchant = #{merchantId} and order_state = 1; - select sum((merchant_ratio*order_price)/1) from sys_order where order_state = 1; diff --git a/src/main/resources/static/mapping/SysUserMapping.xml b/src/main/resources/static/mapping/SysUserMapping.xml index 0773c15..22728b3 100644 --- a/src/main/resources/static/mapping/SysUserMapping.xml +++ b/src/main/resources/static/mapping/SysUserMapping.xml @@ -16,7 +16,7 @@ - - - +
+ + + +
+
注册 +

已注册账号? 登录

+ + diff --git a/src/main/resources/templates/admin/merchant/index.html b/src/main/resources/templates/admin/merchant/index.html index 1d6fc47..3ef6656 100644 --- a/src/main/resources/templates/admin/merchant/index.html +++ b/src/main/resources/templates/admin/merchant/index.html @@ -23,7 +23,7 @@ color: grey; height: 35px; width: 80px; - font-size: 16px; + font-size: 12px; border-radius: 10px; } form input:hover{ @@ -65,7 +65,7 @@ 这里还没有任何商户信息！！ - +
@@ -77,14 +77,14 @@ - - - + + diff --git a/src/main/resources/templates/admin/notice/index.html b/src/main/resources/templates/admin/notice/index.html index d4b37f1..a99f139 100644 --- a/src/main/resources/templates/admin/notice/index.html +++ b/src/main/resources/templates/admin/notice/index.html @@ -32,13 +32,13 @@ - + + + + - - - -
商户logo ID
- + + [[${mt.getId()}]] [[${mt.getName()}]] [[${mt.getEmail()}]]已启用未启用已启用未启用

@@ -99,12 +99,12 @@
-
- +
-
- +
会员标记
- + + + + [[${user.getId()}]] + + [[${user.getUsername()}]] + + [[${user.getEmail()}]] + + [[${user.getMark()}]]
diff --git a/src/main/resources/templates/merchant/login/index.html b/src/main/resources/templates/merchant/login/index.html index 243c62f..6ded740 100644 --- a/src/main/resources/templates/merchant/login/index.html +++ b/src/main/resources/templates/merchant/login/index.html @@ -33,18 +33,16 @@

商户注册

请使用您的电子邮箱进行注册

-
-
- -
-
- -
-
- -
- -
+
+ +
+
+ +
+
+ +
+
@@ -60,7 +58,6 @@
-

忘记密码?

@@ -70,10 +67,55 @@ - - + diff --git a/src/main/resources/templates/user/notice/index.html b/src/main/resources/templates/user/notice/index.html index becbb76..1ca1a70 100644 --- a/src/main/resources/templates/user/notice/index.html +++ b/src/main/resources/templates/user/notice/index.html @@ -80,12 +80,16 @@