Rwa兑换

application/admin/view/product/welfarerede/add.html

@@ -53,16 +53,16 @@
             <input id="c-end_time" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[end_time]" type="text" value="{:date('Y-m-d H:i:s')}">
         </div>
     </div>
-        <div class="form-group">
-            <label class="control-label col-xs-12 col-sm-2">赠送茶宝:</label>
-            <div class="col-xs-12 col-sm-3">
-                <input id="c-send_chabao" class="form-control" step="0.0001" name="row[send_chabao]" type="number" value="0">
-            </div>
-            <label class="control-label col-xs-12 col-sm-2">{:__('排序')}:</label>
-            <div class="col-xs-12 col-sm-3">
-                <input id="c-weigh" class="form-control" step="1" name="row[weigh]" type="number" value="1">
-            </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">赠送茶宝:</label>
+        <div class="col-xs-12 col-sm-3">
+            <input id="c-send_chabao" class="form-control" step="0.0001" name="row[send_chabao]" type="number" value="0">
         </div>
+        <label class="control-label col-xs-12 col-sm-2">{:__('排序')}:</label>
+        <div class="col-xs-12 col-sm-3">
+            <input id="c-weigh" class="form-control" step="1" name="row[weigh]" type="number" value="1">
+        </div>
+    </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Is_token')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -90,8 +90,7 @@
         </div>
     </div>
     
-
-    <div class="form-group">
+    <div class="form-group" >
         <label class="control-label col-xs-12 col-sm-2">{:__('是否支持茶宝')}:</label>
         <div class="col-xs-12 col-sm-3">
             {:build_radios('row[is_chabao]', ['1'=>__('是'), '0'=>__('否')])}

application/api/controller/Exchange.php

@@ -106,7 +106,7 @@ class Exchange extends Api
               'create_time' => time()
           ];
           //有代币参与时
-          if($welfare_config->is_token >0){
+          if($welfare_config->is_token == 1 && empty($type_id)){
               if (empty($coin_from_address)) {
                   $this->error(__('Parameter error'));
               }
@@ -152,8 +152,8 @@ class Exchange extends Api
               $inster_data['amount_token'] = $coin_data['amount'];
               $inster_data['tx_hash_token'] = $coin_data['hash'];
             }
-          
-            if(empty($type_id)){
+            //U支付
+            if(empty($type_id) && empty($welfare_config->is_token)){
                 //USDT转入记录
                 $BscApi = new BscApi('0x55d398326f99059ff775485246999027b3197955');
                 $result_usdt = $BscApi->getTransactionRecordsByAddress($usdt_from_address, $welfare_config->transfer_address, 49990000);
@@ -188,7 +188,9 @@ class Exchange extends Api
                 //记录
                 $inster_data['tx_hash_usdt'] = $usdt_data['hash'];
                 Log::info($inster_data, '插入数据');
-            }else{
+            }
+            
+            if($type_id == 1){
                 $inster_data['token_name'] =$token= $welfare_config->chabao_num;
             }