Merge branch 'ratios' of 39.97.239.116:gyfl/xyzshop into ratios

admin/control/merchant.php

@@ -1129,6 +1129,8 @@ class merchantControl extends SystemControl
                 $profit_ratio = floatval($_POST['profit_ratio']) ?? 0;
                 $retry_times_cfg['lower_ratio'] = ['ratio' => $ratio, 'period' => $period];
                 $retry_times_cfg['profit_ratio'] = $profit_ratio;
+                $profit_formula = $_POST['profit_formula'] ?? '';
+                $retry_times_cfg['profit_formula'] = $profit_formula;
                 return serialize($retry_times_cfg);
             };
 

admin/templates/default/merchant.ctl.php

@@ -157,6 +157,27 @@
             </tr>
 
             <tr class="noborder">
+                <td colspan="2" class="required">
+                    <label style="margin-left: 45px;" for="name">利润计算方式：</label>
+                    <label>
+                        <select name="profit_formula">
+                            <option value="qts" <?php if ($output['retry_times']['profit_formula'] == 'qts') {
+                                echo 'selected';
+                            } ?>>卡类型+面值
+                            <option value="qt" <?php if ($output['retry_times']['profit_formula'] == 'qt') {
+                                echo 'selected';
+                            } ?>>卡类型
+                            </option>
+                            <option value="all" <?php if ($output['retry_times']['profit_formula'] == 'all') {
+                                echo 'selected';
+                            } ?>>全部
+                            </option>
+                        </select>
+                    </label>
+                </td>
+            </tr>
+
+            <tr class="noborder">
                 <td>
                     <hr>
                 </td>