临时提交

src/utils/constants.js

@@ -155,11 +155,15 @@ export const ConfigKey = {
   NOVERIFY_WITHDRAW_SINGLE: "noverify.withdraw.single", // 提现单笔免审核额度（元）
   RECHARGE_MIN_SERVICE: "recharge.min.service", // 充值最低服务费（元）
   ORDER_AUTO_CLOSE_CD: "order.auto.close.cd", // 订单自动关闭冷却时间（分）
+  ARRIVAL_DELAY: "arrival.delay", // 充值到账延迟时间（小时）
   SS_LICENCE_USER_ID: "ss.licence.user.id", // 用户协议文章ID
   SS_LICENCE_PRIVACY_ID: "ss.licence.privacy.id", // 隐私政策文章ID
   SS_LICENCE_ABOUT_ID: "ss.licence.about.id", // 关于我们文章ID
   SS_LICENCE_MCH_ID: "ss.licence.mch.id", // 商户协议文章ID
   SS_LICENCE_COLLECTION_ID: "ss.licence.collection.id", // 个人信息收集清单文章ID
+  RISK_WITHDRAW_ENABLED: "risk.withdraw.enabled", // 是否开启提现风控
+  RISK_WITHDRAW_TIME: "risk.withdraw.time", // 风控订单和提现相隔时长（分钟）
+  RISK_WITHDRAW_COUNT: "risk.withdraw.count", // 提现风控累计风险次数
 }
 
 // 用户类型

src/views/ss/store/index.vue

@@ -104,11 +104,16 @@
           <dict-tag :value="scope.row.type" :options="dict.type.ss_store_type"/>
         </template>
       </el-table-column>
-      <el-table-column label="营业时间" align="center" min-width="100">
+      <el-table-column label="营业时间" align="center" min-width="120">
         <template slot-scope="d">
           {{d.row.businessTimeStart}} 至 {{d.row.businessTimeEnd}}
         </template>
       </el-table-column>
+      <el-table-column label="非营时间使用" align="center" min-width="100">
+        <template slot-scope="d">
+          <boolean-tag :value="d.row.useOutTime" true-text="允许" false-text="不允许"/>
+        </template>
+      </el-table-column>
       <el-table-column label="门店地址" align="center" min-width="200" show-overflow-tooltip>
         <template slot-scope="d">
           {{d.row.province}}{{d.row.city}}{{d.row.county}}{{d.row.address}}
@@ -182,7 +187,7 @@
           <form-col label="是否在地图展示" prop="show" :span="span" label-width="9em">
             <el-switch v-model="form.show"/>
           </form-col>
-          <form-col label="店铺名称" prop="name" :span="span * 2">
+          <form-col label="店铺名称" prop="name" :span="span">
             <el-input v-model="form.name" placeholder="请输入店铺名称" />
           </form-col>
           <form-col label="店铺类型" prop="type" :span="span">
@@ -209,6 +214,9 @@
               placeholder="请选择营业时间范围">
             </el-time-picker>
           </form-col>
+          <form-col label="非营业时间内使用" prop="useOutTime" :span="span" label-width="10em">
+            <el-switch v-model="form.useOutTime" active-text="允许" inactive-text="不允许"/>
+          </form-col>
           <form-col label="定位地址" prop="address" :span="span * 2">
             <el-input v-model="form.address" placeholder="请输入店铺地址">
               <template #prepend>
@@ -255,12 +263,13 @@ import { parseTime } from '../../../utils/ruoyi'
 import { $view } from '@/utils/mixins'
 import UserLink from '@/components/Business/SmUser/UserLink.vue'
 import StoreLink from '@/components/Business/Store/StoreLink.vue'
+import BooleanTag from '@/components/BooleanTag/index.vue'
 
 export default {
   name: "Store",
   mixins: [$view],
   dicts: ['ss_store_type', 'store_status'],
-  components: { StoreLink, UserLink, AreaTextSelect, PlaceSearchDialog, UserInput, SmUserSelect },
+  components: { BooleanTag, StoreLink, UserLink, AreaTextSelect, PlaceSearchDialog, UserInput, SmUserSelect },
   props: {
     query: {
       type: Object,
@@ -401,7 +410,8 @@ export default {
         updateTime: null,
         updateBy: null,
         deleted: null,
-        show: true
+        show: true,
+        useOutTime: true
       };
       this.resetForm("form");
     },

src/views/ss/suit/component/SuitEditDialog.vue

@@ -50,7 +50,7 @@
             </template>
           </el-input>
         </form-col>
-        <form-col :span="span" label="度数" prop="value" v-else-if="form.feeType === SuitFeeType.COUNT">
+        <form-col :span="span" label="充值电量" prop="value" v-else-if="form.feeType === SuitFeeType.COUNT">
           <el-input v-model="form.value" placeholder="请输入度数" type="number">
             <template #append>度</template>
           </el-input>

src/views/system/config/group.vue

@@ -6,10 +6,15 @@
         <config-item :config="getConfig(ConfigKey.SERVICE_FEE_RATE)"/>
         <config-item :config="getConfig(ConfigKey.RECHARGE_MIN_SERVICE)"/>
         <config-item :config="getConfig(ConfigKey.ORDER_AUTO_CLOSE_CD)"/>
+        <config-item :config="getConfig(ConfigKey.ARRIVAL_DELAY)"/>
         <h3>提现</h3>
         <config-item :config="getConfig(ConfigKey.DAILY_WITHDRAW_AMOUNT)"/>
         <config-item :config="getConfig(ConfigKey.DAILY_WITHDRAW_COUNT)"/>
         <config-item :config="getConfig(ConfigKey.NOVERIFY_WITHDRAW_SINGLE)"/>
+        <h3>风控</h3>
+        <config-item :config="getConfig(ConfigKey.RISK_WITHDRAW_ENABLED)" type="switch"/>
+        <config-item :config="getConfig(ConfigKey.RISK_WITHDRAW_TIME)"/>
+        <config-item :config="getConfig(ConfigKey.RISK_WITHDRAW_COUNT)"/>
       </el-tab-pane>
       <el-tab-pane label="文章配置" lazy>
         <config-item :config="getConfig(ConfigKey.SS_LICENCE_USER_ID)">