diff --git a/demo/src/main/java/com/example/demo/DemoApplication.java b/demo/src/main/java/com/example/demo/DemoApplication.java index d95cf7a..676325a 100644 --- a/demo/src/main/java/com/example/demo/DemoApplication.java +++ b/demo/src/main/java/com/example/demo/DemoApplication.java @@ -5,7 +5,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.web.servlet.ServletComponentScan; @SpringBootApplication -@ServletComponentScan("com.example.demo") +//@ServletComponentScan("com.example.demo") //@MapperScan("com.example.demo.Dao") public class DemoApplication { public static void main(String[] args) { diff --git a/demo/src/main/java/com/example/demo/circulator/controller/PayCirController.java b/demo/src/main/java/com/example/demo/circulator/controller/PayCirController.java index 1a9ec2a..a0fbc32 100644 --- a/demo/src/main/java/com/example/demo/circulator/controller/PayCirController.java +++ b/demo/src/main/java/com/example/demo/circulator/controller/PayCirController.java @@ -1,26 +1,43 @@ package com.example.demo.circulator.controller; +import com.alibaba.fastjson.JSONObject; +import com.example.demo.bean.User; import com.example.demo.circulator.service.PayCirService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.web.servlet.server.Session; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.PostMapping; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; +import java.util.HashMap; +import java.util.Map; + @Controller public class PayCirController { @Autowired PayCirService payCirService; @PostMapping("/pay") - public String payAmountCir(long checkNum,double pay){ - int result = payCirService.payAmountCirculator(checkNum,pay); + public void payAmountCir(HttpServletRequest request, HttpServletResponse response){ + long checkNum = Long.parseLong(request.getParameter("checkNum")); + double pay = Double.parseDouble(request.getParameter("amount")); + HttpSession session = request.getSession(); + User user = (User)session.getAttribute("user"); + long userNum = user.getUserNum(); + int result = payCirService.payAmountCirculator(checkNum,userNum,pay); + Map map = new HashMap(); + map.put("value",result); if(result==1){ - return "/还款成功!"; + + String json = JSONObject.toJSONString(map); }else if(result==-2){ - return"/未贷款该业务!"; + //return"/未贷款该业务!"; }else if(result==-3){ - return "/无此业务"; + //return "/无此业务"; } - return "/还款失败"; + //return "/还款失败"; } } diff --git a/demo/src/main/java/com/example/demo/circulator/controller/SumCirController.java b/demo/src/main/java/com/example/demo/circulator/controller/SumCirController.java index 541bdd3..c9e58f7 100644 --- a/demo/src/main/java/com/example/demo/circulator/controller/SumCirController.java +++ b/demo/src/main/java/com/example/demo/circulator/controller/SumCirController.java @@ -70,10 +70,10 @@ public class SumCirController { int equation = 0; Map map = new HashMap(); try{ + equation = Integer.parseInt(request.getParameter("equation")); amount = Double.parseDouble(request.getParameter("amount")); intrate = Float.parseFloat(request.getParameter("intrate")); year = Integer.parseInt(request.getParameter("year")); - equation = Integer.parseInt(request.getParameter("equation")); }catch (Exception e){ map.put("value",0); String json = JSONObject.toJSONString(map); @@ -83,15 +83,6 @@ public class SumCirController { }finally { } - - if(amount<0||intrate<0||year<0||equation<0){ - map.put("value",-1); - String json = JSONObject.toJSONString(map); - //System.out.println(json); - response.getWriter().print(json); - //return json; - } - double sum_principal_and_intrate = 0; switch (equation){ case 1: @@ -120,7 +111,7 @@ public class SumCirController { //System.out.println(sum_principal_and_intrate); map.put("value",sum_principal_and_intrate); String json = JSONObject.toJSONString(map); - System.out.println(json); + //System.out.println(json); response.getWriter().print(json); diff --git a/demo/src/main/java/com/example/demo/circulator/service/PayCirService.java b/demo/src/main/java/com/example/demo/circulator/service/PayCirService.java index 42a59b6..23f6bb7 100644 --- a/demo/src/main/java/com/example/demo/circulator/service/PayCirService.java +++ b/demo/src/main/java/com/example/demo/circulator/service/PayCirService.java @@ -23,16 +23,17 @@ public class PayCirService { private productMapper productMapper; - public int pay_EPR_AmountCirculator(long checkNum,double pay) { + public int pay_EPR_AmountCirculator(long checkNum,long userNum,double pay) { try { Repayment repayment = paymentMapper.selectPepaymentBycheckNum(checkNum); UsageDate usageDate = usageDateMapper.selectUsageDateByCheckNum(checkNum); double repamount = 0; long productNum = usageDate.getProductNum(); - long userNum = usageDate.getUserNum(); + long userNum2 = usageDate.getUserNum(); long bankNum = usageDate.getBankNum(); double amount = usageDate.getAmount(); + if(userNum2!=userNum)return -1; if (repayment != null) repamount = repayment.getRepAmount(); Product product = productMapper.selectProductByProductNum(productNum); @@ -60,7 +61,7 @@ public class PayCirService { return 0; } - public int pay_EPAIR_AmountCirculator(long checkNum,double pay){ + public int pay_EPAIR_AmountCirculator(long checkNum,long userNum,double pay){ try{ UsageDate usageDate = usageDateMapper.selectUsageDateByCheckNum(checkNum); int year = usageDate.getYear(); @@ -78,9 +79,10 @@ public class PayCirService { double rep = Math.pow((1+intrate),month)/(Math.pow((1+intrate),month)-1); double next_principal_and_interest = rep * intrate * amount; - long userNum = usageDate.getUserNum(); + long userNum2 = usageDate.getUserNum(); long bankNum = usageDate.getBankNum(); + if(userNum2!=userNum)return -1; Transaction transaction = new Transaction(checkNum,userNum,bankNum,next_principal_and_interest); transMapper.addTransaction(transaction); @@ -102,15 +104,15 @@ public class PayCirService { } - public int payAmountCirculator(long checkNum,double pay){ + public int payAmountCirculator(long checkNum,long userNum,double pay){ try{ UsageDate usageDate = usageDateMapper.selectUsageDateByCheckNum(checkNum); if(usageDate==null){return -2;} int equation = usageDate.getEquation(); if(equation == 1){ - return pay_EPAIR_AmountCirculator(checkNum,pay); + return pay_EPAIR_AmountCirculator(checkNum,userNum,pay); }else if(equation == 2){ - return pay_EPR_AmountCirculator(checkNum,pay); + return pay_EPR_AmountCirculator(checkNum,userNum,pay); } }catch (Exception e){ e.printStackTrace(); diff --git a/demo/src/main/java/com/example/demo/loanService/controller/messageController.java b/demo/src/main/java/com/example/demo/loanService/controller/messageController.java index 02e6017..e39f25b 100644 --- a/demo/src/main/java/com/example/demo/loanService/controller/messageController.java +++ b/demo/src/main/java/com/example/demo/loanService/controller/messageController.java @@ -20,12 +20,11 @@ import java.io.IOException; @Controller public class messageController extends HttpServlet { @Autowired - auditMapper auditMapper; - private nowTime nowTime=new nowTime(); - private messageService message=new messageService(); + private messageService message; @RequestMapping(value = "/loan",method = RequestMethod.POST)//填写贷款基本信息的界面 public void doPost(HttpServletResponse response, HttpServletRequest request)throws IOException { + nowTime nowTime=new nowTime(); HttpSession session=request.getSession(); User user=new User(); user=(User)session.getAttribute("user"); diff --git a/demo/src/main/java/com/example/demo/loanService/controller/startController.java b/demo/src/main/java/com/example/demo/loanService/controller/startController.java index b5e21a5..9a7626d 100644 --- a/demo/src/main/java/com/example/demo/loanService/controller/startController.java +++ b/demo/src/main/java/com/example/demo/loanService/controller/startController.java @@ -27,10 +27,13 @@ public class startController extends HttpServlet { short num=userMapper.selectIsId(user.getUserNum()); if(num==1){ response.sendRedirect("checkPhoneNum2.html"); - }if(num==0){ + return; + }else if(num==0){ response.sendRedirect("checkPhoneNum.html");//认证的界面 + return; }else{ - response.sendRedirect("");//页面出错的界面 + response.sendRedirect("Untitled-1.html");//页面出错的界面 + return; } } } diff --git a/demo/src/main/java/com/example/demo/loanService/service/messageService.java b/demo/src/main/java/com/example/demo/loanService/service/messageService.java index f640394..fc721bf 100644 --- a/demo/src/main/java/com/example/demo/loanService/service/messageService.java +++ b/demo/src/main/java/com/example/demo/loanService/service/messageService.java @@ -3,7 +3,9 @@ package com.example.demo.loanService.service; import com.example.demo.Dao.auditMapper; import com.example.demo.bean.Audit; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +@Service public class messageService { @Autowired auditMapper auditMapper; diff --git a/demo/src/main/java/com/example/demo/order/controller/showController.java b/demo/src/main/java/com/example/demo/order/controller/showController.java index db4c10f..37e451f 100644 --- a/demo/src/main/java/com/example/demo/order/controller/showController.java +++ b/demo/src/main/java/com/example/demo/order/controller/showController.java @@ -1,7 +1,9 @@ package com.example.demo.order.controller; +import com.example.demo.Dao.auditMapper; import com.example.demo.bean.Audit; import com.example.demo.bean.User; +import com.example.demo.order.service.impl.orderServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.PostMapping; @@ -19,14 +21,15 @@ import java.util.List; @Controller public class showController extends HttpServlet { @Autowired - com.example.demo.Dao.auditMapper auditMapper; + orderServiceImpl orderService; @PostMapping("/order")//订单浏览的界面 public List doPost(HttpServletResponse response, HttpServletRequest request){ HttpSession session=request.getSession(); User user=new User(); user=(User)session.getAttribute("user"); - List audits = auditMapper.selectAudByNum(user.getUserNum()); + long userNum = user.getUserNum(); + List audits = orderService.selectAuditByUserNum(userNum); return audits; } } diff --git a/demo/src/main/java/com/example/demo/order/service/impl/orderServiceImpl.java b/demo/src/main/java/com/example/demo/order/service/impl/orderServiceImpl.java index e9cb0e0..10a7e1c 100644 --- a/demo/src/main/java/com/example/demo/order/service/impl/orderServiceImpl.java +++ b/demo/src/main/java/com/example/demo/order/service/impl/orderServiceImpl.java @@ -15,4 +15,7 @@ public class orderServiceImpl implements orderService { public List selectAuditByUserNum(long userNum){ return auditMapper.selectAuditByUserNum(userNum); } + public List selectAudByName(long userNum){ + return auditMapper.selectAudByNum(userNum); + } } diff --git a/demo/src/main/java/com/example/demo/register/controller/bankCardController.java b/demo/src/main/java/com/example/demo/register/controller/bankCardController.java index cf1bcf5..b993b58 100644 --- a/demo/src/main/java/com/example/demo/register/controller/bankCardController.java +++ b/demo/src/main/java/com/example/demo/register/controller/bankCardController.java @@ -1,6 +1,7 @@ package com.example.demo.register.controller; +import com.alibaba.fastjson.JSONObject; import com.example.demo.Dao.userMapper; import com.example.demo.bean.User; import com.example.demo.bean.UserBankIdentify; @@ -14,11 +15,14 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import java.io.IOException; +import java.util.HashMap; +import java.util.Map; @Controller public class bankCardController extends HttpServlet { - private identify identify=new identify(); + @Autowired + private identify identify; @Autowired private userMapper userMapper; @@ -42,6 +46,10 @@ public class bankCardController extends HttpServlet { }catch (Exception e){ e.printStackTrace(); } - response.sendRedirect("index.html");//返回首页 + Map map = new HashMap(); + map.put("value","认证成功"); + String json = JSONObject.toJSONString(map); + response.getWriter().print(json); + //response.sendRedirect("index.html");//返回首页 } } diff --git a/demo/src/main/java/com/example/demo/register/identify.java b/demo/src/main/java/com/example/demo/register/identify.java index 0680dbc..a0b7562 100644 --- a/demo/src/main/java/com/example/demo/register/identify.java +++ b/demo/src/main/java/com/example/demo/register/identify.java @@ -3,7 +3,9 @@ package com.example.demo.register; import com.example.demo.Dao.userBankIdMapper; import com.example.demo.bean.UserBankIdentify; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +@Service public class identify { @Autowired userBankIdMapper userBankIdMapper; diff --git a/demo/src/main/resources/static/cardNumberBinding.html b/demo/src/main/resources/static/cardNumberBinding.html index 57f922b..f92a127 100644 --- a/demo/src/main/resources/static/cardNumberBinding.html +++ b/demo/src/main/resources/static/cardNumberBinding.html @@ -41,6 +41,7 @@
+
银行卡号
真实姓名
@@ -50,8 +51,8 @@
预留手机号
- - +
+ + + - diff --git a/demo/src/main/resources/static/countCenter.html b/demo/src/main/resources/static/countCenter.html index 528ec20..71ab71c 100644 --- a/demo/src/main/resources/static/countCenter.html +++ b/demo/src/main/resources/static/countCenter.html @@ -44,13 +44,11 @@ success: function (data) { var str = "应还款总金额为："+data.value+"元"; $("#sum").append(str); - - //console.log(data); //alert("结果为：" + data.value); }, error: function (msg) { - alert("提交失败" + msg); + alert("提交失败" ); } }); } diff --git a/demo/src/main/resources/static/index.html b/demo/src/main/resources/static/index.html index 4267df0..c34da6a 100644 --- a/demo/src/main/resources/static/index.html +++ b/demo/src/main/resources/static/index.html @@ -115,13 +115,13 @@
- +
- +
diff --git a/demo/src/main/resources/static/loan.html b/demo/src/main/resources/static/loan.html index 6b4c39a..b86495f 100644 --- a/demo/src/main/resources/static/loan.html +++ b/demo/src/main/resources/static/loan.html @@ -9,6 +9,66 @@ 输入贷款金额 + + + + + + @@ -20,23 +80,30 @@
-
+
+

借贷产品编号

+
+ +
+

还款金额

+
- + +
@@ -62,45 +129,6 @@
- - - + \ No newline at end of file diff --git a/demo/src/main/resources/static/loanInformation.html b/demo/src/main/resources/static/loanInformation.html index a911f2d..3725a89 100644 --- a/demo/src/main/resources/static/loanInformation.html +++ b/demo/src/main/resources/static/loanInformation.html @@ -220,11 +220,30 @@ box-shadow:inset 0px 1px 1px rgba(0,0,0,0.5);*/ } - + + + -
+
贷款金额 @@ -288,13 +307,12 @@ box-shadow:inset 0px 1px 1px rgba(0,0,0,0.5);*/
- + - + \ No newline at end of file diff --git a/demo/src/main/resources/static/myOrders.html b/demo/src/main/resources/static/myOrders.html index 3dc7851..b461da0 100644 --- a/demo/src/main/resources/static/myOrders.html +++ b/demo/src/main/resources/static/myOrders.html @@ -9,9 +9,9 @@ - +