diff --git a/demo/src/main/java/com/example/demo/Dao/paymentMapper.java b/demo/src/main/java/com/example/demo/Dao/paymentMapper.java index 205c52c..c7a3f56 100644 --- a/demo/src/main/java/com/example/demo/Dao/paymentMapper.java +++ b/demo/src/main/java/com/example/demo/Dao/paymentMapper.java @@ -1,6 +1,8 @@ package com.example.demo.Dao; +import com.example.demo.bean.Manager; import com.example.demo.bean.Repayment; +import org.apache.ibatis.annotations.Insert; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; @@ -10,7 +12,10 @@ public interface paymentMapper { @Select("select * from repayment where checkNum =#{checkNum}") public Repayment selectPepaymentBycheckNum(long checkNum); - @Update("update repayment set repAmount = {#repAmount} ,repSum = {#repSum} where checkNum = #{checkNum}") + @Update("update repayment set repAmount = {#repAmount} ,repSum = #{repSum} where checkNum = #{checkNum}") public void updateRepayment(Repayment repayment); + @Insert("insert into repayment(checkNum,repAmount,repSum) values (#{checkNum},#{repAmount}," + + "#{repSum})") + public void addRepayment(Repayment repayment); } diff --git a/demo/src/main/java/com/example/demo/Dao/productHistroyMapper.java b/demo/src/main/java/com/example/demo/Dao/productHistroyMapper.java index 18f6b7c..ffe7cc4 100644 --- a/demo/src/main/java/com/example/demo/Dao/productHistroyMapper.java +++ b/demo/src/main/java/com/example/demo/Dao/productHistroyMapper.java @@ -17,7 +17,7 @@ public interface productHistroyMapper { public List select(); @Insert("insert into productHistroy(productNum, productName, category, " + - "intrate, bankNum, productDescription, uploadTime, deleteTime, alterTime)" + + "intrate, bankNum, productDescription, uploadTime, deleteTime, alterTime,managerNum)" + " values (#{productNum},#{productName},#{category},#{intrate},#{bankNum}," + "#{productDescription},#{uploadTime},#{deleteTime},#{alterTime})") public void addProductHistroy(ProductHistroy productHistroys); diff --git a/demo/src/main/java/com/example/demo/Dao/transMapper.java b/demo/src/main/java/com/example/demo/Dao/transMapper.java index 7c414ca..327e996 100644 --- a/demo/src/main/java/com/example/demo/Dao/transMapper.java +++ b/demo/src/main/java/com/example/demo/Dao/transMapper.java @@ -19,12 +19,11 @@ public interface transMapper { "#{note},#{checkNum})") public void addTransaction(Transaction transactions); - @Update("update audit set transactionNum=#{transactionNum},payer=#{payer}" + + @Update("update transaction set transactionNum=#{transactionNum},payer=#{payer}" + ",payee=#{payee},transactionTime=#{transactionTime},transactionAmount=#{transactionAmount}," + "note=#{note}") public void updateTransaction(Transaction transactions); - @Delete("delete from audit where transactionNum=#{transactionNum}") - public void deleteTransaction(long transactionNum); - + @Delete("delete from transaction where transactionNum=#{transactionNum}") + public void deleteTransaction(int transactionNum); } diff --git a/demo/src/main/java/com/example/demo/bean/Bank.java b/demo/src/main/java/com/example/demo/bean/Bank.java index be9f33d..0586fa2 100644 --- a/demo/src/main/java/com/example/demo/bean/Bank.java +++ b/demo/src/main/java/com/example/demo/bean/Bank.java @@ -12,6 +12,7 @@ import javax.persistence.Id; @Entity public class Bank { @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) private int bankNum; private String bankName; private String contact;//联系方式 diff --git a/demo/src/main/java/com/example/demo/bean/Repayment.java b/demo/src/main/java/com/example/demo/bean/Repayment.java index 5744436..b830553 100644 --- a/demo/src/main/java/com/example/demo/bean/Repayment.java +++ b/demo/src/main/java/com/example/demo/bean/Repayment.java @@ -18,4 +18,13 @@ public class Repayment { private double repAmount; private double repSum; + public double getRepAmount() { + return 0; + } + + public void setRepAmount(double repamount) { + } + + public void setRepSum(double pay) { + } } diff --git a/demo/src/main/java/com/example/demo/bean/UsageDate.java b/demo/src/main/java/com/example/demo/bean/UsageDate.java index 0a10f6b..d7c1f49 100644 --- a/demo/src/main/java/com/example/demo/bean/UsageDate.java +++ b/demo/src/main/java/com/example/demo/bean/UsageDate.java @@ -23,7 +23,27 @@ public class UsageDate { private float amount; private String startTime; - public UsageDate(){}; + public UsageDate(){} private int equation; + public double getAmount() { + return amount; + } + + public int getYear() { + return year; + } + + public long getProductNum() { + return 0; + } + + public long getUserNum() { + return 0; + } + + public int getBankNum() { + return 0; + } + } diff --git a/demo/src/main/java/com/example/demo/bean/UserBankIdentify.java b/demo/src/main/java/com/example/demo/bean/UserBankIdentify.java index d0d41cb..6889b3b 100644 --- a/demo/src/main/java/com/example/demo/bean/UserBankIdentify.java +++ b/demo/src/main/java/com/example/demo/bean/UserBankIdentify.java @@ -1,5 +1,6 @@ package com.example.demo.bean; +import lombok.Setter; import lombok.Getter; import javax.persistence.Entity; @@ -8,6 +9,7 @@ import javax.persistence.GenerationType; import javax.persistence.Id; @Getter +@Setter @Entity public class UserBankIdentify { @Id diff --git a/demo/src/main/java/com/example/demo/circulator/controller/NextCirController.java b/demo/src/main/java/com/example/demo/circulator/controller/NextCirController.java index 71d0b63..56767ce 100644 --- a/demo/src/main/java/com/example/demo/circulator/controller/NextCirController.java +++ b/demo/src/main/java/com/example/demo/circulator/controller/NextCirController.java @@ -34,11 +34,11 @@ public class NextCirController { if(next_principal_and_intrate>=0){ request.setAttribute("next",next_principal_and_intrate); }else if(next_principal_and_intrate==-1){ - return "/计算失败"; + return "/计算失败!"; }else if(next_principal_and_intrate==-2){ - return "/未贷款此类业务"; + return "/未贷款此类业务!"; }else if(next_principal_and_intrate==-3){ - return "/无此类业务"; + return "/无此类业务!"; } return "/next"; } 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 b2c2487..74f7405 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 @@ -14,11 +14,11 @@ public class PayCirController { public String payAmountCir(long checkNum,double pay){ int result = payCirService.payAmountCirculator(checkNum,pay); if(result==1){ - return "/还款成功"; + return "/还款成功!"; }else if(result==-2){ - return"/未贷款该业务"; + return"/未贷款该业务!"; }else - 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 52f2802..9c03880 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 @@ -36,12 +36,11 @@ public class SumCirController { if(sum_principal_and_intrate>=0){ request.setAttribute("sum",sum_principal_and_intrate); }else if(sum_principal_and_intrate==-3){ - return "/无此类产品"; + return "/无此类产品!"; }else{ - return "/计算失败"; + return "/计算失败!"; } - return "/circulator"; } } diff --git a/demo/src/main/java/com/example/demo/circulator/service/CirService.java b/demo/src/main/java/com/example/demo/circulator/service/CirService.java index 09b230d..c84f43b 100644 --- a/demo/src/main/java/com/example/demo/circulator/service/CirService.java +++ b/demo/src/main/java/com/example/demo/circulator/service/CirService.java @@ -1,11 +1,9 @@ package com.example.demo.circulator.service; -import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.PostConstruct; -@Service public abstract class CirService { @PostConstruct public void init(){} diff --git a/demo/src/main/java/com/example/demo/circulator/service/EPAIR_CirService.java b/demo/src/main/java/com/example/demo/circulator/service/EPAIR_CirService.java index 43635d2..f354f78 100644 --- a/demo/src/main/java/com/example/demo/circulator/service/EPAIR_CirService.java +++ b/demo/src/main/java/com/example/demo/circulator/service/EPAIR_CirService.java @@ -5,11 +5,8 @@ import com.example.demo.Dao.usageDateMapper; import com.example.demo.bean.Product; import com.example.demo.bean.UsageDate; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; - -@Service public class EPAIR_CirService extends CirService{ @Autowired private usageDateMapper usageDateMapper; diff --git a/demo/src/main/java/com/example/demo/circulator/service/EPR_CirService.java b/demo/src/main/java/com/example/demo/circulator/service/EPR_CirService.java index 40580a7..92f9824 100644 --- a/demo/src/main/java/com/example/demo/circulator/service/EPR_CirService.java +++ b/demo/src/main/java/com/example/demo/circulator/service/EPR_CirService.java @@ -7,16 +7,12 @@ import com.example.demo.bean.Product; import com.example.demo.bean.Repayment; import com.example.demo.bean.UsageDate; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -@Service public class EPR_CirService extends CirService{ @Autowired private usageDateMapper usageDateMapper; - @Autowired private paymentMapper paymentMapper; - @Autowired private productMapper productMapper; @Transactional //数据库与事物的一致性 @@ -24,7 +20,7 @@ public class EPR_CirService extends CirService{ try{ UsageDate usageDate = usageDateMapper.selectUsageDateByCheckNum(checkNum); Repayment repayment = paymentMapper.selectPepaymentBycheckNum(checkNum); - if(usageDate!=null){return -2;} + if(usageDate==null)return -2; int year = usageDate.getYear(); double amount = usageDate.getAmount(); long productNum = usageDate.getProductNum(); @@ -34,7 +30,7 @@ public class EPR_CirService extends CirService{ float intrate = product.getIntrate(); double rep_amount = 0; if(repayment!=null) - repayment.getRepAmount(); + rep_amount = repayment.getRepAmount(); intrate /= 12; int month = year*12; double next_principal_and_interest = amount/month + (amount - rep_amount) * intrate; @@ -51,7 +47,6 @@ public class EPR_CirService extends CirService{ public double SumCirculator(long productNum,double amount,int year){ try{ Product product = productMapper.selectProductByProductNum(productNum); - if(product==null)return -3; float intrate = product.getIntrate(); intrate /= 12; int month = year * 12; 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 de019c0..d617bc5 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 @@ -6,26 +6,18 @@ import com.example.demo.Dao.usageDateMapper; import com.example.demo.bean.Repayment; import com.example.demo.bean.Transaction; import com.example.demo.bean.UsageDate; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -@Service public class PayCirService { - @Autowired private usageDateMapper usageDateMapper; - @Autowired private paymentMapper paymentMapper; - @Autowired private transMapper transMapper; public int payAmountCirculator(long checkNum,double pay){ try{ Repayment repayment = paymentMapper.selectPepaymentBycheckNum(checkNum); UsageDate usageDate= usageDateMapper.selectUsageDateByCheckNum(checkNum); - if(usageDate!=null)return -2; - double rep_amount = 0; - if(repayment!=null) - repayment.getRepAmount(); + if(usageDate==null)return -2; + double repamount = repayment.getRepAmount(); long userNum = usageDate.getUserNum(); int bankNum = usageDate.getBankNum(); double amount = usageDate.getAmount(); @@ -34,10 +26,14 @@ public class PayCirService { Transaction transaction = new Transaction(checkNum,userNum,bankNum,pay); transMapper.addTransaction(transaction); - rep_amount = pay - amount/(year*12); - repayment.setRepAmount(rep_amount); + repamount = pay - amount/(year*12); + repayment.setRepAmount(repamount); repayment.setRepSum(pay); - paymentMapper.updateRepayment(repayment); + if(repayment!=null){ + paymentMapper.updateRepayment(repayment); + }else{ + paymentMapper.addRepayment(repayment); + } return 1; }catch(Exception e){ e.printStackTrace();