From dd924d7a83cc20a12c6a68cfce4c6b86747877ea Mon Sep 17 00:00:00 2001
From: jyx <1584081113@qq.com>
Date: Wed, 16 Jan 2019 17:39:58 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=98=E6=AC=BE=E7=95=8C=E9=9D=A2=E4=BA=A4?=
 =?UTF-8?q?=E4=BA=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../demo/circulator/service/PayCirService.java | 18 +++++++++++-------
 .../main/resources/static/loanInformation.html |  3 ++-
 2 files changed, 13 insertions(+), 8 deletions(-)

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 f6d2d81..f5766af 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
@@ -27,8 +27,6 @@ public class PayCirService {
             double amount = audit.getAmount();
 
             if(userNum2!=userNum)return -1;
-            if (repayment != null)
-                repamount = repayment.getRepAmount();
             Product product = productMapper.selectProductByProductNum(productNum);
             if (product == null)
                 return -3;
@@ -43,14 +41,20 @@ public class PayCirService {
             transMapper.addTransaction(transaction);
 
             double intrate = product.getIntrate();
-            double rep_amount = repayment.getRepSum();
-            repamount = pay - (amount - repamount) * intrate;
-            repayment.setRepAmount(repamount);
-            repayment.setCheckNum(checkNum);
-            repayment.setRepSum(pay + rep_amount);
+
             if (repayment != null) {
+                double rep_amount = repayment.getRepSum();
+                repamount = pay - (amount - repamount) * intrate;
+                repayment.setRepAmount(repamount);
+                repayment.setCheckNum(checkNum);
+                repayment.setRepSum(pay + rep_amount);
                 paymentMapper.updateRepayment(repayment);
             } else {
+                repayment = new Repayment();
+                //repamount = pay - amount * intrate;
+                repayment.setRepAmount(repamount);
+                repayment.setCheckNum(checkNum);
+                repayment.setRepSum(pay);
                 paymentMapper.addRepayment(repayment);
             }
             return 1;
diff --git a/demo/src/main/resources/static/loanInformation.html b/demo/src/main/resources/static/loanInformation.html
index a33bb73..76d7358 100644
--- a/demo/src/main/resources/static/loanInformation.html
+++ b/demo/src/main/resources/static/loanInformation.html
@@ -233,6 +233,7 @@ box-shadow:inset 0px 1px 1px rgba(0,0,0,0.5);*/
                 async: false,
                 // success: function (data) {
                 //     alert("贷款成功");
+                //
                 // },
                 // error: function (msg) {
                 //     alert("提交失败" );
@@ -248,7 +249,7 @@ box-shadow:inset 0px 1px 1px rgba(0,0,0,0.5);*/
 		<div class="div_col" id="pro">
 			<div class="div_c_l"><span>产品名</span>
 			</div>
-			<div class="div_c_r"><input type="cardNum" name="productNum" id="" onKeyDown="" value="" placeholder="卡号">
+			<div class="div_c_r"><input type="cardNum" name="productNum" id="" onKeyDown="" value="" placeholder="产品名">
 				<span style="float: right;margin-top: -30px;background:#fff"></span></input>
 			</div>
 		</div>