flyzto 5 месяцев назад
Родитель
Сommit
2df76f6ff9

+ 1 - 0
server/init.js

@@ -6,6 +6,7 @@ const Logs = require('./libs/logs');
   settingInit({
     innerDefaultAmount: 10000,
     minProfitAmount: 0,
+    minShowAmount: 0,
     innerRebateRatio: 0,
     obRebateRatio: 0,
     hgRebateRatio: 0,

+ 7 - 1
server/models/GamesPs.js

@@ -595,12 +595,18 @@ const updateSolutions = (solutions) => {
  * 获取中单方案
  */
 const getSolutions = async () => {
+  const { minShowAmount } = await getSetting();
   const solutionsList = Object.values(GAMES.Solutions);
   const relIds = solutionsList.map(item => item.info.id);
   const gamesEvents = getGamesEvents({ relIds });
   const gamesRelation = getGamesRelation();
   const relationsMap = new Map(gamesRelation.map(item => [item.id, item.rel]));
-  const solutions = solutionsList.sort((a, b) => b.sol.win_average - a.sol.win_average).map(item => {
+  const solutions = solutionsList.sort((a, b) => b.sol.win_average - a.sol.win_average)
+  .filter(item => {
+    const { sol: { win_average } } = item;
+    return win_average >= minShowAmount;
+  })
+  .map(item => {
     const { info: { id } } = item;
     const relation = relationsMap.get(id);
     return {

+ 5 - 0
server/models/Setting.js

@@ -16,6 +16,11 @@ const systemSettingSchema = new Schema({
     required: true,
     default: 0
   },
+  minShowAmount: {
+    type: Number,
+    required: true,
+    default: 0
+  },
   innerRebateRatio: {
     type: Number,
     required: true,

+ 1 - 0
server/triangle/settings.js

@@ -3,6 +3,7 @@ const Logs = require('../libs/logs');
 const SETTING = {
   innerDefaultAmount: 10000,
   minProfitAmount: 0,
+  minShowAmount: 0,
   innerRebateRatio: 0,
   obRebateRatio: 0,
   hgRebateRatio: 0,

+ 14 - 1
web/apps/web-antd/src/views/system/parameter/index.vue

@@ -7,6 +7,7 @@ import { ref, reactive, computed, onMounted, onUnmounted, watch } from 'vue';
 const initialFormState = {
   innerDefaultAmount: 10000,
   minProfitAmount: 0,
+  minShowAmount: 0,
   innerRebateRatio: 0,
   obRebateRatio: 0,
   hgRebateRatio: 0,
@@ -102,7 +103,7 @@ onUnmounted(() => {
       </Form.Item>
 
       <Form.Item
-        label="最小利润额"
+        label="最小单关利润额"
         name="minProfitAmount"
       >
         <InputNumber
@@ -113,6 +114,18 @@ onUnmounted(() => {
         />
       </Form.Item>
 
+      <Form.Item
+        label="最小展示利润额"
+        name="minShowAmount"
+      >
+        <InputNumber
+          v-model:value="formState.minShowAmount"
+          :min="-99999"
+          :step="1"
+          style="width: 200px"
+        />
+      </Form.Item>
+
       <Form.Item
         label="内盘返点比例(%)"
         name="innerRebateRatio"