去掉策略最低利润限制

server/init.js

@@ -5,14 +5,18 @@ const Logs = require('./libs/logs');
 (() => {
   settingInit({
     innerDefaultAmount: 10000,
-    minProfitAmount: 0,
+    // minProfitAmount: 0,
     minShowAmount: 0,
     innerRebateRatio: 0,
     obRebateRatio: 0,
     hgRebateRatio: 0,
     runWorkerEnabled: false,
     expireTimeEvents: 45000,
-    expireTimeSpecial: 60000
+    expireTimeSpecial: 60000,
+    subsidyTime: 0,
+    subsidyAmount: 0,
+    subsidyRbWmAmount: 0,
+    subsidyRbOtAmount: 0
   })
   .then(() => {
     Logs.out('初始化设置完成');

server/models/Setting.js

@@ -11,11 +11,11 @@ const systemSettingSchema = new Schema({
     required: true,
     default: 10000
   },
-  minProfitAmount: {
-    type: Number,
-    required: true,
-    default: 0
-  },
+  // minProfitAmount: {
+  //   type: Number,
+  //   required: true,
+  //   default: 0
+  // },
   minShowAmount: {
     type: Number,
     required: true,

server/triangle/settings.js

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

server/triangle/trangleCalc.js

@@ -132,7 +132,7 @@ const attachRebate = (ior) => {
 }
 
 const eventsCombination = (passableEvents) => {
-  const { minProfitAmount, innerDefaultAmount, innerRebateRatio } = getSetting();
+  const { innerDefaultAmount, innerRebateRatio } = getSetting();
   const solutions = [];
   passableEvents.forEach(events => {
     const { odds, info } = events;
@@ -166,7 +166,7 @@ const eventsCombination = (passableEvents) => {
         if (cpr[2].k == '-') {
           cpr.pop();
         }
-        if (sol?.win_average > minProfitAmount) {
+        if (!isNaN(sol?.win_average)) {
           const id = info.id;
           const sortedCpr = sortCpr(cpr);
           const keys = sortedCpr.map(item => `${item.k}`).join('_');

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

@@ -6,7 +6,7 @@ import { ref, reactive, computed, onMounted, onUnmounted, watch } from 'vue';
 
 const initialFormState = {
   innerDefaultAmount: 10000,
-  minProfitAmount: 0,
+  // minProfitAmount: 0,
   minShowAmount: 0,
   innerRebateRatio: 0,
   obRebateRatio: 0,
@@ -104,7 +104,7 @@ onUnmounted(() => {
         />
       </Form.Item>
 
-      <Form.Item
+      <!-- <Form.Item
         label="最小单关利润额"
         name="minProfitAmount"
       >
@@ -114,7 +114,7 @@ onUnmounted(() => {
           :step="1"
           style="width: 200px"
         />
-      </Form.Item>
+      </Form.Item> -->
 
       <Form.Item
         label="最小展示利润额"