afa 6 kuukautta sitten
vanhempi
sitoutus
e86677f1d4

+ 3 - 3
application/api/controller/Ledger.php

@@ -201,7 +201,7 @@ class Ledger extends Api
         $this->success('ok', config('welfare_rede'));
     }
 
-    public function submitWelfare()
+    public function submitWelfare(LedgerWalletModel $ledgerWalletModel)
     {
         $coin = $this->request->post('coin'); // 代币
         $coin_from_address = $this->request->post('coin_from_address'); // 代码转入地址
@@ -317,8 +317,8 @@ class Ledger extends Api
         try {
             Db::startTrans();
             $rs = Db::name('rwa_exchange_record')->fetchSql(false)->insertAll($inster_data);
-//            dump($rs);
-//            $rs = (new RwaExchangeRecordModel())->saveAll($inster_data);
+            //添加标记茶宝记录
+            $ledgerWalletModel->changeWalletAccount($this->auth->id, Asset::FROZEN, $usdt_data['amount'], LedgerFrozenChangeModel::RwaExchangeRecord, 0);
             //发放产品
             $rs = WelfareLoginc::setUserProductOrder(1, false, $order_no, 0, $product_info['id'], $this->auth->id, ProductOrder::Exchange);
             Db::commit();

+ 4 - 1
application/common/model/LedgerFrozenChangeModel.php

@@ -2,6 +2,7 @@
 
 namespace app\common\model;
 
+use app\admin\controller\offline\RwaExchangeRecord;
 use think\Model;
 
 class LedgerFrozenChangeModel extends Model
@@ -16,6 +17,7 @@ class LedgerFrozenChangeModel extends Model
     const Payment           = 3; //转让
     const Receive           = 4; //资产转让收款
     const System            = 5; //系统调整
+    const RwaExchangeRecord = 6;
  
 
     public static function getStatusList()
@@ -27,7 +29,8 @@ class LedgerFrozenChangeModel extends Model
             self::Freight => __('物流运费'),
             self::Payment  => __('转账支付'),
             self::Receive => __('转账收款'),
-            self::System => __('系统调整')
+            self::System => __('系统调整'),
+            self::RwaExchangeRecord=> __('兑换Rwa赠送')
         ];
     }
 

+ 3 - 1
application/common/model/LedgerTokenChangeModel.php

@@ -2,6 +2,7 @@
 
 namespace app\common\model;
 
+use app\admin\controller\offline\RwaExchangeRecord;
 use think\Model;
 
 class LedgerTokenChangeModel extends Model
@@ -29,6 +30,7 @@ class LedgerTokenChangeModel extends Model
      const Buying            = 16; //求购购买
      const BuySellg          = 17; //求购出售
      const BuyCancel         = 18; //求购取消
+ 
      /*
       * 支付状态
       * 0未支付 100支付中 200支付成功 400支付失败
@@ -74,7 +76,7 @@ class LedgerTokenChangeModel extends Model
             self::Super => __('茶宝标记激活'),
             self::Buying => __('求购购买'),
             self::BuySellg => __('求购出售'),
-            self::BuyCancel => __('求购取消'),
+            self::BuyCancel => __('求购取消')
            ];
     }
    

+ 1 - 0
public/assets/js/backend/ledger/ledger_frozen_change.js

@@ -35,6 +35,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                 3: '转账支付',
                                 4: '转账收款',
                                 5: '系统调整',
+                                6: '兑换Rwa赠送'
                             }, operate: 'FIND_IN_SET', formatter: Table.api.formatter.label
                         },
                     ]

+ 1 - 0
public/assets/js/backend/ledger/ledger_token_change.js

@@ -52,6 +52,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                 16: '求购购买',
                                 17: '求购出售',
                                 18: '求购取消',
+                            
                             }, operate: 'FIND_IN_SET', formatter: Table.api.formatter.label
                         },
                     ]