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

admin/control/merchant.php

@@ -1217,6 +1217,8 @@ class merchantControl extends SystemControl
                 $retry_times_cfg['profit_ratio'] = $profit_ratio;
                 $profit_formula = $_POST['profit_formula'] ?? '';
                 $retry_times_cfg['profit_formula'] = $profit_formula;
+                $only_high_prices = intval($_POST['only_high_prices']) ?? 0;
+                $retry_times_cfg['only_high_prices'] = $only_high_prices;
                 return serialize($retry_times_cfg);
             };
             $retry_times_cfg = $retry_times_data($qualitys);
@@ -1312,4 +1314,4 @@ class merchantControl extends SystemControl
         }
         return $transfer_cfg;
     }
-}
+}

admin/templates/default/merchant.ctl.php

@@ -179,6 +179,15 @@
                 </tr>
 
                 <tr class="noborder">
+                    <td colspan="2" class="required">
+                        <label style="margin-left: 45px;display: inline-block; width: 110px">允许只有高价通道：</label>
+                        <label>
+                            <input type="checkbox" name="only_high_prices" value="1" <?php if($output['retry_times']['only_high_prices'] === 1) { echo 'checked'; }?>>
+                        </label>
+                    </td>
+                </tr>
+
+                <tr class="noborder">
                     <td>
                         <hr>
                     </td>
@@ -550,4 +559,4 @@
             })
         })
     });
-</script>
+</script>

data/model/predeposit.model.php

@@ -484,12 +484,18 @@ class predepositModel extends Model {
         if (!$update) {
             throw new Exception('操作失败');
         }
+
+        if(defined('SUPPORT_UNUSE_PDLOG') && SUPPORT_UNUSE_PDLOG === true) {
+            return true;
+        }
+
         $insert = $this->table('pd_log')->insert($data_log);
         if (!$insert) {
             throw new Exception('操作失败');
         }
 
-        if(!$fRefill) {
+        if(!$fRefill)
+        {
             // 支付成功发送买家消息
             $param = [];
             $param['code'] = 'predeposit_change';
@@ -498,8 +504,8 @@ class predepositModel extends Model {
             $data_msg['freeze_amount'] = ncPriceFormat($data_msg['freeze_amount']);
             $param['param'] = $data_msg;
             QueueClient::push('sendMemberMsg', $param);
+            return $insert;
         }
-        return $insert;
     }
 
     /**

rdispatcher/codispatcher.php

@@ -5,7 +5,7 @@ define('APP_ID', 'cordispatcher');
 define('MOBILE_SERVER',true);
 define('USE_COROUTINE',true);
 define('SUPPORT_PTHREAD',false);
-
+define('SUPPORT_UNUSE_PDLOG',true);
 
 define('BASE_ROOT_PATH',str_replace('/rdispatcher','',dirname(__FILE__)));
 define('BASE_PATH',BASE_ROOT_PATH . '/rdispatcher');