Merge remote-tracking branch 'origin/master'

master
jyx 7 years ago
commit 720aa0ae56

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -7,8 +7,9 @@ import java.util.List;
@Mapper
public interface auditMapper {
@Select("select * from audit where checkNum = #{checkNum}")
public Audit selectAudioByCheckNum(long checkNum);
// @Select("select * from audit where checkNum = #{checkNum}")
// public Audit selectAudioByCheckNum(long checkNum);
@Select("select * from audit where userNum = #{userNum}")
public List<Audit> selectAuditByUserNum(long userNum);
@ -24,7 +25,11 @@ public interface auditMapper {
@Select("select * from audit where userNum = #{userNum} and checkState=1" +
"order by applyTime")
public List<Audit> selectByNum(long userNum);
public List<Audit> selectByNumFinshed(long userNum);
@Select("select * from audit where userNum = #{userNum} and checkState=0" +
"order by applyTime")
public List<Audit> selectByNumUnfinshed(long userNum);
@Insert("insert into audit(checkNum, userNum, productNum, " +
"bankAccount, checkState, contractNum, " +
@ -33,12 +38,12 @@ public interface auditMapper {
"#{contractNum},#{isSignContract},#{year},#{amount},#{applyTime})")
public void addAudit(Audit audits);
@Update("update audit set checkNum=#{checkNum},userNum=#{userNum}" +
",productNum=#{productNum},checkState=#{checkState},contractNum=#{contractNum}," +
"isSignContract=#{isSignContract},year=#{year},amount=#{amount}," +
"applyTime=#{applyTime}where checkNum=#{checkNum}")
public void updateAudit(Audit audits);
// @Update("update audit set checkNum=#{checkNum},userNum=#{userNum}" +
// ",productNum=#{productNum},checkState=#{checkState},contractNum=#{contractNum}," +
// "isSignContract=#{isSignContract},year=#{year},amount=#{amount}," +
// "applyTime=#{applyTime}where checkNum=#{checkNum}")
// public void updateAudit(Audit audits);
@Delete("delete from audit where checkNum=#{checkNum}")
public void deleteAudit(long checkNum);
// @Delete("delete from audit where checkNum=#{checkNum}")
// public void deleteAudit(long checkNum);
}

@ -10,8 +10,8 @@ public interface userMapper {
@Select("select * from user where userNum = #{userNum}")
public User selectUserByuserNum(long userNum);
@Select("select * from user where userName = #{userName}")
public User selectUserByuserName(String userName);
@Select("select userNum from user where userName = #{userName}")
public long selectUserByuserName(String userName);
@Select("select * from user where telephoneNum = #{telephoneNum}")
public User selectUserBytelephoneNum(String telephoneNum);

@ -1,7 +1,7 @@
package com.example.demo.productService.controller;
package com.example.demo.back.productService.controller;
import com.example.demo.bean.Product;
import com.example.demo.productService.service.addPro;
import com.example.demo.back.productService.service.addPro;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;

@ -1,8 +1,8 @@
package com.example.demo.productService.controller;
package com.example.demo.back.productService.controller;
import com.example.demo.bean.Product;
import com.example.demo.productService.service.deletePro;
import com.example.demo.back.productService.service.deletePro;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;

@ -1,7 +1,7 @@
package com.example.demo.productService.controller;
package com.example.demo.back.productService.controller;
import com.example.demo.bean.Product;
import com.example.demo.productService.service.updatePro;
import com.example.demo.back.productService.service.updatePro;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;

@ -1,4 +1,4 @@
package com.example.demo.productService.service;
package com.example.demo.back.productService.service;
import com.example.demo.Dao.productHistroyMapper;
import com.example.demo.Dao.productMapper;

@ -1,4 +1,4 @@
package com.example.demo.productService.service;
package com.example.demo.back.productService.service;
import com.example.demo.Dao.productHistroyMapper;
import com.example.demo.Dao.productMapper;

@ -1,4 +1,4 @@
package com.example.demo.productService.service;
package com.example.demo.back.productService.service;
import com.example.demo.Dao.productHistroyMapper;
import com.example.demo.Dao.productMapper;

@ -5,7 +5,7 @@ import org.springframework.stereotype.Service;
@Service
public abstract class UserService {
public User selectUserByuserName(String userName){return null;}
public long selectUserByuserName(String userName){return 0;}
public User selectUserBytelephoneNum(String telephoneNum){return null;}
public void addUser(User users){}
public long count(){return 0;}

@ -13,7 +13,7 @@ public class UserServiceImpl extends UserService{
private userMapper UserMapper;
@Transactional(propagation=Propagation.REQUIRED,readOnly = true)
public User selectUserByuserName(String userName){
public long selectUserByuserName(String userName){
return this.UserMapper.selectUserByuserName(userName);
}
@Transactional(propagation=Propagation.REQUIRED,readOnly = true)

@ -1,5 +1,6 @@
package com.example.demo.loginService;
import com.example.demo.Dao.userMapper;
import com.example.demo.bean.User;
import com.example.demo.loginService.API.impl.UserServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
@ -20,6 +21,8 @@ import java.util.Date;
public class UserController extends HttpServlet {
@Autowired
private UserServiceImpl userServiceImpl;
@Autowired
private userMapper userMapper;
@PostMapping("/login")
//@ResponseBody
@ -27,12 +30,12 @@ public class UserController extends HttpServlet {
//System.out.println("_______________");
String userName = request.getParameter("userName");
String userPwd = request.getParameter("userPwd");
User user = this.userServiceImpl.selectUserByuserName(userName);
long usernum = this.userServiceImpl.selectUserByuserName(userName);
int result = 0;
if(user!=null){
if(user.getUserPwd().equals(userPwd)){
if(usernum!=1){
if(userMapper.selectPwd(usernum,userPwd)==1){
HttpSession session=request.getSession();
session.setAttribute("user",user);
session.setAttribute("user",usernum);
result = 1;
} else{
result = 2;
@ -51,10 +54,11 @@ public class UserController extends HttpServlet {
String userName = request.getParameter("userName");
String userPwd = request.getParameter("userPwd");
String userPwd1=request.getParameter("userPwd1");
User user = this.userServiceImpl.selectUserByuserName(userName);
long usernum = this.userServiceImpl.selectUserByuserName(userName);
User user=new User();
long count = 0;
int result = 0;
if(user!=null){
if(usernum!=1){
result = 2;
}else if(userPwd.equals(userPwd1)){
count = this.userServiceImpl.count()+1;

@ -5,22 +5,25 @@ import com.example.demo.bean.User;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import java.util.List;
@Controller
//@Controller
@RestController
public class compController {
@Autowired
com.example.demo.Dao.auditMapper auditMapper;
@RequestMapping("/finished")//已经完成的订单浏览的界面
@RequestMapping(value="/finished",method = RequestMethod.POST)//已经完成的订单浏览的界面
public List<Audit> doPost(HttpServletResponse response, HttpServletRequest request){
HttpSession session=request.getSession();
User user=new User();
user=(User)session.getAttribute("user");
return auditMapper.selectByNum(user.getUserNum());
return auditMapper.selectByNumFinshed(user.getUserNum());
}
}

@ -8,6 +8,8 @@ import com.example.demo.order.service.orderService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
@ -17,12 +19,12 @@ import javax.servlet.http.HttpSession;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
@RestController
public class orderController extends HttpServlet {
@Autowired
private orderServiceImpl orderService;
@PostMapping("/orderlist")
@RequestMapping(value = "/orderlist",method = RequestMethod.POST)
public void orderList(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
response.setContentType("text/html;charset=utf-8");
HttpSession session = request.getSession();

@ -6,6 +6,8 @@ import com.example.demo.bean.User;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
@ -17,12 +19,13 @@ import java.util.List;
*/
@Controller
//@Controller
@RestController
public class showController extends HttpServlet {
@Autowired
com.example.demo.Dao.auditMapper auditMapper;
@RequestMapping("/order")//订单浏览的界面
@RequestMapping(value="/order",method = RequestMethod.POST)//订单浏览的界面
public List<Audit> doPost(HttpServletResponse response, HttpServletRequest request){
HttpSession session=request.getSession();
User user=new User();

@ -0,0 +1,27 @@
package com.example.demo.order.controller;
import com.example.demo.bean.Audit;
import com.example.demo.bean.User;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import java.util.List;
@RestController
public class unCompController {
@Autowired
com.example.demo.Dao.auditMapper auditMapper;
@RequestMapping(value="/unfinished",method = RequestMethod.POST)//已经完成的订单浏览的界面
public List<Audit> doPost(HttpServletResponse response, HttpServletRequest request){
HttpSession session=request.getSession();
User user=new User();
user=(User)session.getAttribute("user");
return auditMapper.selectByNumUnfinshed(user.getUserNum());
}
}

@ -21,17 +21,15 @@ public class bankCardController extends HttpServlet {
@RequestMapping("/binding")//卡号绑定界面
public void doPost(HttpServletResponse response, HttpServletRequest request)throws IOException {
HttpSession session=request.getSession();
User user=new User();
user=(User)session.getAttribute("user");
long userNum=(long)session.getAttribute("user");
try{
long num=user.getUserNum();
short result=0;
UserBankIdentify userBankIdentify=new UserBankIdentify();
userBankIdentify.setBankAccount(request.getParameter("bankAccount"));
userBankIdentify.setTrueName(request.getParameter("realname"));
userBankIdentify.setIdNum(request.getParameter("idNum"));
userBankIdentify.setTelephoneNum(request.getParameter("phoneNum"));
userBankIdentify.setUserNum(num);
userBankIdentify.setUserNum(userNum);
userBankIdentify.setBankAccountIdentify(result);
identify.identify(userBankIdentify);
}catch (Exception e){

@ -19,10 +19,9 @@ public class pwdController extends HttpServlet {
@RequestMapping("/pwd")//再一次确认密码界面
public String doPost(HttpServletResponse response, HttpServletRequest request){
HttpSession session=request.getSession();
User user=new User();
user=(User)session.getAttribute("user");
long userNum=(long)session.getAttribute("user");
String pwd=request.getParameter("userPwd");
if(userMapper.selectPwd(user.getUserNum(),pwd)==1){
if(userMapper.selectPwd(userNum,pwd)==1){
return "";//银行卡验证的界面
}else{
return "";//登陆失败

@ -0,0 +1,40 @@
<!doctype html>
<html lang="en-US">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Light Theme</title>
<link href="css/singlePageTemplate.css" rel="stylesheet" type="text/css">
<!--The following script tag downloads a font from the Adobe Edge Web Fonts server for use within the web page. We recommend that you do not modify it.-->
<script>var __adobewebfontsappname__="dreamweaver"</script>
<!--<script src="http://use.edgefonts.net/source-sans-pro:n2:default.js" type="text/javascript"></script>-->
<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
</head>
<body>
<!-- Main Container -->
<div class="container">
<!-- Navigation -->
<!-- Hero Section -->
<!-- About Section -->
<!-- Stats Gallery Section -->
<!-- Parallax Section -->
<!-- More Info Section -->
<footer>
<article class="footer_column"> </article>
</footer>
<!-- Footer Section -->
<section class="footer_banner" id="contact">
<h2 class="hidden">Footer Banner Section </h2>
<p class="hero_header">页面显示错误!</p>
<div class="button" onclick="window.location=''">回到首页</div>
</section>
<!-- Copyrights Section --></div>
<!-- Main Container Ends -->
</body>
</html>

@ -0,0 +1,479 @@
@charset "UTF-8";
/* Body */
body {
font-family: source-sans-pro;
background-color: #f2f2f2;
margin-top: 0px;
margin-right: 0px;
margin-bottom: 0px;
margin-left: 0px;
font-style: normal;
font-weight: 200;
}
/* Container */
.container {
width: 90%;
margin-left: auto;
margin-right: auto;
height: 1000px;
background-color: #FFFFFF;
}
/* Navigation */
header {
width: 100%;
height: 5%;
background-color: #52bad5;
border-bottom: 1px solid #2C9AB7;
}
.logo {
color: #fff;
font-weight: bold;
text-align: undefined;
width: 10%;
float: left;
margin-top: 15px;
margin-left: 25px;
letter-spacing: 4px;
}
nav {
float: right;
width: 50%;
text-align: right;
margin-right: 25px;
}
header nav ul {
list-style: none;
float: right;
}
nav ul li {
float: left;
color: #FFFFFF;
font-size: 14px;
text-align: left;
margin-right: 25px;
letter-spacing: 2px;
font-weight: bold;
transition: all 0.3s linear;
}
ul li a {
color: #FFFFFF;
text-decoration: none;
}
ul li:hover a {
color: #2C9AB7;
}
.hero_header {
color: #FFFFFF;
text-align: center;
margin-top: 0px;
margin-right: 0px;
margin-bottom: 0px;
margin-left: 0px;
letter-spacing: 4px;
}
/* Hero Section */
.hero {
background-color: #B3B3B3;
padding-top: 150px;
padding-bottom: 150px;
}
.light {
font-weight: bold;
color: #717070;
}
.tagline {
text-align: center;
color: #FFFFFF;
margin-top: 4px;
font-weight: lighter;
text-transform: uppercase;
letter-spacing: 1px;
}
/* About Section */
.text_column {
width: 29%;
text-align: justify;
font-weight: lighter;
line-height: 25px;
float: left;
padding-left: 20px;
padding-right: 20px;
color: #A3A3A3;
}
.about {
padding-left: 25px;
padding-right: 25px;
padding-top: 35px;
display: inline-block;
background-color: #FFFFFF;
margin-top: 0px;
}
/* Stats Gallery */
.stats {
color: #717070;
margin-bottom: 5px;
}
.gallery {
clear: both;
display: inline-block;
width: 100%;
background-color: #FFFFFF;
/* [disabled]min-width: 400px;
*/
padding-bottom: 35px;
padding-top: 0px;
margin-top: -5px;
margin-bottom: 0px;
}
.thumbnail {
width: 25%;
text-align: center;
float: left;
margin-top: 35px;
}
.gallery .thumbnail h4 {
margin-top: 5px;
margin-right: 5px;
margin-bottom: 5px;
margin-left: 5px;
color: #52BAD5;
}
.gallery .thumbnail p {
margin-top: 0px;
margin-right: 0px;
margin-bottom: 0px;
margin-left: 0px;
color: #A3A3A3;
}
/* Parallax Section */
.banner {
background-color: #2D9AB7;
background-image: url(../images/parallax.png);
height: 400px;
background-attachment: fixed;
background-size: cover;
background-repeat: no-repeat;
}
.parallax {
color: #FFFFFF;
text-align: right;
padding-right: 100px;
padding-top: 110px;
letter-spacing: 2px;
margin-top: 0px;
}
.parallax_description {
color: #FFFFFF;
text-align: right;
padding-right: 100px;
width: 30%;
float: right;
font-weight: lighter;
line-height: 23px;
margin-top: 0px;
margin-right: 0px;
margin-bottom: 0px;
margin-left: 0px;
}
/* More info */
footer {
background-color: #FFFFFF;
padding-bottom: 35px;
}
.footer_column {
width: 50%;
text-align: center;
padding-top: 30px;
float: left;
}
footer .footer_column h3 {
color: #B3B3B3;
text-align: center;
}
footer .footer_column p {
color: #717070;
background-color: #FFFFFF;
}
.cards {
width: 100%;
height: auto;
max-width: 400px;
max-height: 200px;
}
footer .footer_column p {
padding-left: 30px;
padding-right: 30px;
text-align: justify;
line-height: 25px;
font-weight: lighter;
margin-left: 20px;
margin-right: 20px;
}
.button {
width: 200px;
margin-top: 40px;
margin-right: auto;
margin-bottom: auto;
margin-left: auto;
padding-top: 20px;
padding-right: 10px;
padding-bottom: 20px;
padding-left: 10px;
text-align: center;
vertical-align: middle;
border-radius: 0px;
text-transform: uppercase;
font-weight: bold;
letter-spacing: 2px;
border: 3px solid #FFFFFF;
color: #FFFFFF;
transition: all 0.3s linear;
}
.button:hover {
background-color: #FEFEFE;
color: #C4C4C4;
cursor: pointer;
}
.copyright {
text-align: center;
padding-top: 20px;
padding-bottom: 20px;
background-color: #717070;
color: #FFFFFF;
text-transform: uppercase;
font-weight: lighter;
letter-spacing: 2px;
border-top-width: 2px;
}
.footer_banner {
background-color: #B3B3B3;
padding-top: 60px;
padding-bottom: 60PX;
margin-bottom: 0px;
background-image: url(../images/pattern.png);
background-repeat: repeat;
}
footer {
display: inline-block;
}
.hidden {
display: none;
}
/* Mobile */
@media (max-width: 320px) {
.logo {
width: 100%;
text-align: center;
margin-top: 13px;
margin-right: 0px;
margin-bottom: 0px;
margin-left: 0px;
}
.container header nav {
margin-top: 0px;
margin-right: 0px;
margin-bottom: 0px;
margin-left: 0px;
width: 100%;
float: none;
display: none;
}
header nav ul {
}
nav ul li {
margin-top: 0px;
margin-right: 0px;
margin-bottom: 0px;
margin-left: 0px;
width: 100%;
text-align: center;
}
.text_column {
width: 100%;
text-align: justify;
padding-top: 0px;
padding-right: 0px;
padding-bottom: 0px;
padding-left: 0px;
}
.thumbnail {
width: 100%;
}
.footer_column {
width: 100%;
margin-top: 0px;
}
.parallax {
text-align: center;
margin-top: 0px;
margin-right: 0px;
margin-bottom: 0px;
margin-left: 0px;
padding-top: 40%;
padding-right: 0px;
padding-bottom: 0px;
padding-left: 0px;
width: 100%;
font-size: 18px;
}
.parallax_description {
padding-top: 0px;
padding-right: 0px;
padding-bottom: 0px;
padding-left: 0px;
width: 90%;
margin-top: 25px;
margin-right: 0px;
margin-bottom: 0px;
margin-left: 12px;
float: none;
text-align: center;
}
.banner {
background-color: #2D9AB7;
background-image: none;
}
.tagline {
margin-top: 20px;
line-height: 22px;
}
.hero_header {
padding-left: 10px;
padding-right: 10px;
line-height: 22px;
text-align: center;
}
}
/* Small Tablets */
@media (min-width: 321px)and (max-width: 767px) {
.logo {
width: 100%;
text-align: center;
margin-top: 13px;
margin-right: 0px;
margin-bottom: 0px;
margin-left: 0px;
color: #043745;
}
.container header nav {
margin-top: 0px;
margin-right: 0px;
margin-bottom: 0px;
margin-left: 0px;
width: 100%;
float: none;
overflow: auto;
display: inline-block;
background: #52bad5;
}
header nav ul {
padding: 0px;
float: none;
}
nav ul li {
margin-top: 0px;
margin-right: 0px;
margin-bottom: 0px;
margin-left: 0px;
width: 100%;
text-align: center;
padding-top: 8px;
padding-bottom: 8px;
}
.text_column {
width: 100%;
text-align: left;
padding-top: 0px;
padding-right: 0px;
padding-bottom: 0px;
padding-left: 0px;
}
.thumbnail {
width: 100%;
}
.footer_column {
width: 100%;
margin-top: 0px;
}
.parallax {
text-align: center;
margin-top: 0px;
margin-right: 0px;
margin-bottom: 0px;
margin-left: 0px;
padding-top: 40%;
padding-right: 0px;
padding-bottom: 0px;
padding-left: 0px;
width: 100%;
font-size: 18px;
}
.parallax_description {
padding-top: 0px;
padding-right: 0px;
padding-bottom: 0px;
padding-left: 0px;
margin-top: 30%;
margin-right: 0px;
margin-bottom: 0px;
margin-left: 0px;
float: none;
width: 100%;
text-align: center;
}
.thumbnail {
width: 50%;
}
.parallax {
margin-top: 0px;
margin-right: 0px;
margin-bottom: 0px;
margin-left: 0px;
padding-right: 0px;
padding-bottom: 0px;
padding-left: 0px;
padding-top: 20%;
}
.parallax_description {
margin-top: 0px;
margin-right: 0px;
margin-bottom: 0px;
margin-left: 0px;
width: 100%;
padding-top: 30px;
}
.banner {
padding-left: 20px;
padding-right: 20px;
}
.footer_column {
width: 100%;
}
}
/* Small Desktops */
@media (min-width: 768px) and (max-width: 1096px) {
.text_column {
width: 100%;
}
.thumbnail {
width: 50%;
}
.text_column {
width: 100%;
margin-top: 0px;
margin-right: 0px;
margin-bottom: 0px;
margin-left: 0px;
padding-top: 0px;
padding-right: 0px;
padding-bottom: 0px;
padding-left: 0px;
}
.banner {
margin-top: 0px;
padding-top: 0px;
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save