From 9f5612997603d4cc4cbbae68c489d9b49dbcbe37 Mon Sep 17 00:00:00 2001
From: j1ack <1209452658@qq.com>
Date: Mon, 5 Jun 2023 11:06:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E6=94=B6=E9=85=8D=E7=BD=AE=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5=E2=80=99=20git=20commit=20-m=20?=
 =?UTF-8?q?=E4=BB=A3=E6=94=B6=E9=85=8D=E7=BD=AE=E6=B7=BB=E5=8A=A0=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E2=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/configuration/daishouConfig.vue | 35 +++++++++++++++++------
 1 file changed, 27 insertions(+), 8 deletions(-)

diff --git a/src/views/configuration/daishouConfig.vue b/src/views/configuration/daishouConfig.vue
index a6bcac1..2ddb162 100644
--- a/src/views/configuration/daishouConfig.vue
+++ b/src/views/configuration/daishouConfig.vue
@@ -9,7 +9,7 @@
         <!-- v-loading="loading" -->
         <div class="bg">
             <div class="bottom form controls">
-                <el-form ref="form" :model="form" :rules="rules" label-width="170px" style="display:block">
+                <el-form ref="form" :model="form" :rules="rules" label-width="180px" style="display:block">
                     <el-form-item label="代收订单有效期" prop="orderExpiredTime">
                         <el-input v-model="form.orderExpiredTime" placeholder="请输入代收订单有效期"
                             style="width: 560px;border-color: #E6F1FF;">
@@ -32,11 +32,11 @@
                             <template slot="append">分钟</template>
                         </el-input>
                         <div style="font-size: 12px;color:rgb(187, 187, 187)">
-                            订单有效期过后{{form.orderAmountUnfreezeTime}}分钟解冻
+                            订单有效期过后{{ form.orderAmountUnfreezeTime }}分钟解冻
                         </div>
                     </el-form-item>
-                    <el-form-item label="码商代收接单最小余额" prop="carddealerMinBalance">
-                        <el-input v-model="form.carddealerMinBalance" placeholder="请输入码商代收接单最小余额"
+                    <el-form-item label="在线卡商代收押金预警值" prop="carddealerMinBalance">
+                        <el-input v-model="form.carddealerMinBalance" placeholder="请输入在线卡商代收押金预警值"
                             style="width: 560px;border-color: #E6F1FF;">
                         </el-input>
                     </el-form-item>
@@ -93,11 +93,23 @@
                         </div>
                     </el-form-item>
 
+                    <el-form-item label="在线卡剩余额度预警值" prop="carddealerCardMinReceive">
+                        <el-input v-model="form.carddealerCardMinReceive" placeholder="请输入在线卡剩余额度预警值"
+                            style="width: 560px;border-color: #E6F1FF;">
+                        </el-input>
+                    </el-form-item>
+
+                    <el-form-item label="商户余额预警值" prop="merchantBalanceMax">
+                        <el-input v-model="form.merchantBalanceMax" placeholder="请输入商户余额预警值"
+                            style="width: 560px;border-color: #E6F1FF;">
+                        </el-input>
+                    </el-form-item>
+
                     <el-form-item label="是否允许同金额" prop="sameAmountLimitStatus">
                         <el-switch v-model="form.sameAmountLimitStatus" :active-value="1" :inactive-value="2">
                         </el-switch>
                     </el-form-item>
-                    
+
                     <el-form-item label="app限制出卡" prop="appLimitStatus">
                         <el-switch v-model="form.appLimitStatus" :active-value="1" :inactive-value="2">
                         </el-switch>
@@ -129,7 +141,7 @@ export default {
             open: false,
             // 表单参数
             form: {
-                
+
             },
             rules: {
                 orderExpiredTime: [
@@ -145,7 +157,7 @@ export default {
                     { required: true, message: "请输入订单金额解冻时间", trigger: "blur" },
                 ],
                 carddealerMinBalance: [
-                    { required: true, message: "请输入码商代收接单最小余额", trigger: "blur" },
+                    { required: true, message: "请输入在线卡商代收押金预警值", trigger: "blur" },
                 ],
                 marginTime: [
                     { required: true, message: "请输入风控统计时间", trigger: "blur" },
@@ -170,6 +182,8 @@ export default {
                 .then((response) => {
                     this.form = response.data
                     this.form.carddealerMinBalance = this.NumberDiv(this.form.carddealerMinBalance, 100)
+                    this.form.carddealerCardMinReceive = this.NumberDiv(this.form.carddealerCardMinReceive, 100)
+                    this.form.merchantBalanceMax = this.NumberDiv(this.form.merchantBalanceMax, 100)
                     this.form.cardFloatingAmount = this.NumberDiv(this.form.cardFloatingAmount, 100)
                     // this.form.payMax = this.NumberDiv(this.form.payMax, 100)
                     // this.form.payMin = this.NumberDiv(this.form.payMin, 100)
@@ -183,6 +197,9 @@ export default {
                 if (valid) {
                     let carddealerMinBalance = this.NumberMul(this.form.carddealerMinBalance, 100)
                     let cardFloatingAmount = this.NumberMul(this.form.cardFloatingAmount, 100)
+                    let carddealerCardMinReceive = this.NumberMul(this.form.carddealerCardMinReceive, 100)
+                    let merchantBalanceMax = this.NumberMul(this.form.merchantBalanceMax, 100)
+
                     // let payMax = this.NumberMul(this.form.payMax, 100)
                     // let payMin = this.NumberMul(this.form.payMin, 100)
                     payConfig
@@ -199,7 +216,9 @@ export default {
                             carddealerMinBalance: carddealerMinBalance,
                             orderAmountUnfreezeTime: this.form.orderAmountUnfreezeTime,
                             // oneCardWithMultipleChannels:this.form.oneCardWithMultipleChannels,
-                            sameAmountLimitStatus:this.form.sameAmountLimitStatus,
+                            sameAmountLimitStatus: this.form.sameAmountLimitStatus,
+                            merchantBalanceMax: merchantBalanceMax,
+                            carddealerCardMinReceive: carddealerCardMinReceive
                             // payMax: payMax,
                             // payMin: payMin,
                         })