Merge remote-tracking branch 'origin/master'

demo/src/main/java/com/example/demo/Dao/auditMapper.java

@@ -13,6 +13,9 @@ public interface auditMapper {
     @Select("select * from audit")
     public List<Audit> select();
 
+    @Select("select top 1 checkNum from audit order by checkNum DESC")
+    public Long selectBigCheckNum();
+
     @Insert("insert into audit(checkNum, userNum, productNum, " +
             "bankAccount, checkState, contractNum, " +
             "isSignContract, year, amount, applyTime)" +

demo/src/main/java/com/example/demo/Dao/bankMapper.java

@@ -12,7 +12,7 @@ import java.util.List;
 public interface bankMapper {
 
     @Select("select * from bank where bankNum = #{bankNum}")
-    public Bank selectBankByBankNum(int bankNum);
+    public Bank selectBankByBankNum(long bankNum);
 
     @Select("select * from bank where bankName = #{bankName}")
     public Bank selectBankByBankName(String bankName);
@@ -29,7 +29,7 @@ public interface bankMapper {
     public void updateBank(Bank banks);
 
 //    @Delete("delete from bank where bankNum=#{bankNum}")
-//    public void deleteBank(String bankNum);
+//    public void deleteBank(long bankNum);
 //
 //    @Delete("delete from bank where bankName=#{bankName}")
 //    public void deleteBanks(String bankName);

demo/src/main/java/com/example/demo/Dao/managerMapper.java

@@ -21,6 +21,6 @@ public interface managerMapper {
     public void updateManager(Manager managers);
 
 //    @Delete("delete from manager where managerNum=#{managerNum}")
-//    public void deleteManager(String managerNum);
+//    public void deleteManager(long managerNum);
 
 }

demo/src/main/java/com/example/demo/Dao/productHistroyMapper.java

@@ -30,5 +30,5 @@ public interface productHistroyMapper {
 //    public void updateProductHistroy(ProductHistroy productHistroys);
 
 //    @Delete("delete from producthistroy where productNum=#{productNum}")
-//    public void deleteProductHistroy(int productNum);
+//    public void deleteProductHistroy(long productNum);
 }

demo/src/main/java/com/example/demo/Dao/transMapper.java

@@ -25,5 +25,5 @@ public interface transMapper {
     public void updateTransaction(Transaction transactions);
 
     @Delete("delete from transaction where transactionNum=#{transactionNum}")
-    public void deleteTransaction(int transactionNum);
+    public void deleteTransaction(long transactionNum);
 }

demo/src/main/java/com/example/demo/bean/Audit.java

@@ -20,7 +20,7 @@ public class Audit {
     private  double amount;
     private  String applyTime;
     private String bankAccount;
-    private long checkState;
+    private int checkState;
     private long contractNum;
     private short isSignContract;
     private  long productNum;

demo/src/main/java/com/example/demo/bean/Bank.java

@@ -15,7 +15,7 @@ import javax.persistence.Id;
 public class Bank {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private int bankNum;
+    private long bankNum;
     private String bankName;
     private String contact;//联系方式
 

demo/src/main/java/com/example/demo/bean/Manager.java

@@ -23,11 +23,4 @@ public class Manager {
 
     public Manager(){};
 
-    public long getManagerNum() {
-        return managerNum;
-    }
-
-    public void setManagerNum(int managerNum) {
-        this.managerNum = managerNum;
-    }
 }

demo/src/main/java/com/example/demo/bean/Product.java

@@ -18,66 +18,12 @@ public class Product {
     private String productName;
     private String category;
     private float intrate;
-    private int bankNum;
+    private long bankNum;
     private String productDescription;
     private String pictureAddress;
 
     public Product(){};
 
-    public String getProductName() {
-        return productName;
-    }
 
-    public String getCategory() {
-        return category;
-    }
-
-    public void setCategory(String category) {
-        this.category = category;
-    }
-
-    public String getPictureAddress() {
-        return pictureAddress;
-    }
-
-    public void setPictureAddress(String pictureAddress) {
-        this.pictureAddress = pictureAddress;
-    }
-
-    public String getProductDescription() {
-        return productDescription;
-    }
-
-    public void setProductDescription(String productDescription) {
-        this.productDescription = productDescription;
-    }
-
-    public int getBankNum() {
-        return bankNum;
-    }
-
-    public void setBankNum(int bankNum) {
-        this.bankNum = bankNum;
-    }
-
-    public float getIntrate() {
-        return intrate;
-    }
-
-    public void setIntrate(float intrate) {
-        this.intrate = intrate;
-    }
-
-    public long getProductNum() {
-        return productNum;
-    }
-
-    public void setProductName(String productName) {
-        this.productName = productName;
-    }
-
-    public void setProductNum(long productNum) {
-        this.productNum = productNum;
-    }
 }
 

demo/src/main/java/com/example/demo/bean/ProductHistroy.java

@@ -16,7 +16,7 @@ public class ProductHistroy {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private long productNum;
-    private int bankNum;
+    private long bankNum;
     private long managerNum;
     private String productName;
     private String category;
@@ -28,84 +28,5 @@ public class ProductHistroy {
 
     public ProductHistroy(){};
 
-    public long getManagerNum() {
-        return managerNum;
-    }
 
-    public void setManagerNum(long managerNum) {
-        this.managerNum = managerNum;
-    }
-
-    public long getProductNum() {
-        return productNum;
-    }
-
-    public void setProductNum(long productNum) {
-        this.productNum = productNum;
-    }
-
-    public String getAlterTime() {
-        return alterTime;
-    }
-
-    public void setAlterTime(String alterTime) {
-        this.alterTime = alterTime;
-    }
-
-
-    public String getDeleteTime() {
-        return deleteTime;
-    }
-
-    public void setDeleteTime(String deleteTime) {
-        this.deleteTime = deleteTime;
-    }
-
-    public String getUpLoadTime() {
-        return upLoadTime;
-    }
-
-    public void setUpLoadTime(String upLoadTime) {
-        this.upLoadTime = upLoadTime;
-    }
-
-    public String getProductDescription() {
-        return productDescription;
-    }
-
-    public void setProductDescription(String productDescription) {
-        this.productDescription = productDescription;
-    }
-
-    public float getIntrate() {
-        return intrate;
-    }
-
-    public void setIntrate(float intrate) {
-        this.intrate = intrate;
-    }
-
-    public String getCategory() {
-        return category;
-    }
-
-    public void setCategory(String category) {
-        this.category = category;
-    }
-
-    public String getProductName() {
-        return productName;
-    }
-
-    public void setProductName(String productName) {
-        this.productName = productName;
-    }
-
-    public int getBankNum() {
-        return bankNum;
-    }
-
-    public void setBankNum(int bankNum) {
-        this.bankNum = bankNum;
-    }
 }

demo/src/main/java/com/example/demo/bean/Repayment.java

@@ -18,13 +18,5 @@ public class Repayment {
     private double repAmount;
     private double repSum;
 
-    public double getRepAmount() {
+public Repayment(){};
-        return 0;
-    }
-
-    public void setRepAmount(double repamount) {
-    }
-
-    public void setRepSum(double pay) {
-    }
 }

demo/src/main/java/com/example/demo/bean/Transaction.java

@@ -18,7 +18,7 @@ public class Transaction {
     private long payer;
     private long payee;
     private float transactionTime;
-    private float transactionAmount;
+    private double transactionAmount;
     private String note;
     private long checkNum;
 
@@ -27,7 +27,7 @@ public class Transaction {
         this.checkNum=checkNum;
         this.payer = payer;
         this.payee = payee;
-        this.transactionAmount=transactionNum;
+        this.transactionAmount=transationAmount;
 
     }
 }

demo/src/main/java/com/example/demo/bean/UsageDate.java

@@ -18,32 +18,13 @@ public class UsageDate {
     private long productNum;
     private long userNum;
     private String bankAccount;
-    private int bankNum;
+    private long bankNum;
     private int year;
-    private float amount;
+    private double amount;
     private String startTime;
-
-    public UsageDate(){}
     private int equation;
 
-    public int getYear() {
+    public UsageDate(){}
-        return 0;
-    }
-
-    public long getProductNum() {
-        return 0;
-    }
-
-    public double getAmount() {
-        return amount;
-    }
-
-    public long getUserNum() {
-        return userNum;
-    }
 
-    public int getBankNum() {
-        return bankNum;
-    }
 
 }

demo/src/main/java/com/example/demo/bean/User.java

@@ -19,33 +19,11 @@ public class User {
     private String userPwd;
     private String userRight;
     private String telephoneNum;
-    private String isIdentify;
+    private short isIdentify;
     private String address;
     private String registerTime;
 
-    public String getIsIdentify() {
-        return isIdentify;
-    }
-
-    public void setIsIdentify(String isIdentify) {
-        this.isIdentify = isIdentify;
-    }
-
     public User(){};
 
-    public String getUserPwd() {
-        return userPwd;
-    }
-
-    public void setUserPwd(String userPwd) {
-        this.userPwd = userPwd;
-    }
-
-    public String getUserName() {
-        return userName;
-    }
 
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
 }

demo/src/main/java/com/example/demo/loanService/controller/messageController.java

@@ -0,0 +1,38 @@
+package com.example.demo.loanService.controller;
+
+
+import com.example.demo.Dao.auditMapper;
+import com.example.demo.bean.Audit;
+import com.example.demo.loanService.service.message;
+import com.example.demo.util.nowTime;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@Controller
+public class messageController extends HttpServlet {
+    @Autowired
+    auditMapper auditMapper;
+    private nowTime nowTime=new nowTime();
+    private message message=new message();
+
+    @RequestMapping("")//填写贷款基本信息的界面
+    public String doPost(HttpServletResponse response, HttpServletRequest request){
+        long num=1;//从登陆那里得到登陆者的序号
+        Audit audit=new Audit();
+        audit.setUserNum(num);
+        audit.setAmount(Double.parseDouble(request.getParameter("amount")));
+        audit.setYear(Integer.parseInt(request.getParameter("year")));
+        audit.setBankAccount(request.getParameter("bankAccount"));
+        audit.setEquation(Integer.parseInt(request.getParameter("equation")));
+        audit.setApplyTime(nowTime.nowTime());
+        audit.setUserNum(Long.parseLong("d"));
+        message.message(audit);
+        return "";//审核界面
+    }
+
+}

demo/src/main/java/com/example/demo/loanService/controller/startController.java

@@ -21,9 +21,9 @@ public class startController extends HttpServlet {
         User user=new User();
         int num=1;//从登陆那里得到登陆者的序号
         user=userMapper.selectUserByuserNum(num);
-        if(user.getIsIdentify()=="1"){
+        if(user.getIsIdentify()==1){
             return "";//验证手机号的界面二号
-        }if(user.getIsIdentify()=="0"){
+        }if(user.getIsIdentify()==0){
             return "";//认证的界面
         }else{
             return "";//页面出错的界面

demo/src/main/java/com/example/demo/loanService/service/message.java

@@ -0,0 +1,21 @@
+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;
+
+public class message {
+    @Autowired
+    auditMapper auditMapper;
+
+    public void message(Audit audit){
+        long contractNum=0;
+        short isSignContrat=0;
+        int checkState=0;
+        audit.setContractNum(contractNum);
+        audit.setIsSignContract(isSignContrat);
+        audit.setCheckNum(auditMapper.selectBigCheckNum());
+        audit.setCheckState(checkState);
+        auditMapper.addAudit(audit);
+    }
+}

demo/src/main/java/com/example/demo/productService/service/addPro.java

@@ -4,12 +4,13 @@ import com.example.demo.Dao.productHistroyMapper;
 import com.example.demo.Dao.productMapper;
 import com.example.demo.bean.Product;
 import com.example.demo.bean.ProductHistroy;
+import com.example.demo.util.nowTime;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 @Service
 public class addPro {
-      private nowTime nowTime=new nowTime();
+      private com.example.demo.util.nowTime nowTime=new nowTime();
       @Autowired
       private productMapper productMapper;
       @Autowired

demo/src/main/java/com/example/demo/productService/service/deletePro.java

@@ -4,12 +4,13 @@ import com.example.demo.Dao.productHistroyMapper;
 import com.example.demo.Dao.productMapper;
 import com.example.demo.bean.Product;
 import com.example.demo.bean.ProductHistroy;
+import com.example.demo.util.nowTime;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 @Service
 public class deletePro {
-    private nowTime nowTime = new nowTime();
+    private com.example.demo.util.nowTime nowTime = new nowTime();
     @Autowired
     private productMapper productMapper;
     @Autowired

demo/src/main/java/com/example/demo/productService/service/updatePro.java

@@ -4,12 +4,13 @@ import com.example.demo.Dao.productHistroyMapper;
 import com.example.demo.Dao.productMapper;
 import com.example.demo.bean.Product;
 import com.example.demo.bean.ProductHistroy;
+import com.example.demo.util.nowTime;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 @Service
 public class updatePro {
-    private nowTime nowTime=new nowTime();
+    private com.example.demo.util.nowTime nowTime=new nowTime();
     @Autowired
     private productMapper productMapper;
     @Autowired

demo/src/main/java/com/example/demo/register/controller/bankCardController.java

@@ -1,9 +1,8 @@
 package com.example.demo.register.controller;
 
 
-import com.example.demo.Dao.userBankIdMapper;
 import com.example.demo.bean.UserBankIdentify;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.example.demo.register.identify;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 
@@ -14,20 +13,21 @@ import javax.servlet.http.HttpServletResponse;
 @Controller
 public class bankCardController extends HttpServlet {
 
-    @Autowired
+    private identify identify=new identify();
-    userBankIdMapper userBankIdMapper;
 
     @RequestMapping("/phone")//手机表单界面
     public String doPost(HttpServletResponse response, HttpServletRequest request){
         try{
             long num=1;//获取得到userNum
+            short result=0;
             UserBankIdentify userBankIdentify=new UserBankIdentify();
             userBankIdentify.setBankAccount(request.getParameter("mobile"));
             userBankIdentify.setTrueName(request.getParameter("realname"));
             userBankIdentify.setIdNum(request.getParameter("idNum"));
             userBankIdentify.setTelephoneNum(request.getParameter("phoneNum"));
             userBankIdentify.setUserNum(num);
-            userBankIdMapper.addUserBankIdentify(userBankIdentify);
+            userBankIdentify.setBankAccountIdentify(result);
+            identify.identify(userBankIdentify);
         }catch (Exception e){
             e.printStackTrace();
         }

demo/src/main/java/com/example/demo/register/identify.java

@@ -0,0 +1,15 @@
+package com.example.demo.register;
+
+import com.example.demo.Dao.userBankIdMapper;
+import com.example.demo.bean.UserBankIdentify;
+import org.springframework.beans.factory.annotation.Autowired;
+
+public class identify {
+    @Autowired
+    userBankIdMapper userBankIdMapper;
+
+    public void identify(UserBankIdentify userBankIdentify){
+        userBankIdMapper.addUserBankIdentify(userBankIdentify);
+        //调用银行的接口，将银行卡认证信息传过去
+    }
+}

demo/src/main/java/com/example/demo/util/nowTime.java

@@ -1,4 +1,4 @@
-package com.example.demo.productService.service;
+package com.example.demo.util;
 
 
 import java.text.SimpleDateFormat;