Эх сурвалжийг харах

判断是否购买持有产品

afa 4 сар өмнө
parent
commit
39ed6a8d51

+ 4 - 3
application/admin/controller/ledger/LedgerSmhChange.php → application/admin/controller/ledger/LedgerTeacAngelChange.php

@@ -11,11 +11,11 @@ use think\exception\DbException;
 use think\response\Json;
 
 /**
- * 算力变动明细管理
+ * Teac-天使变动明细管理  ledger_teac_angel_change
  *
  * @icon fa fa-circle-o
  */
-class LedgerSmhChange extends Backend
+class LedgerTeacAngelChange extends Backend
 {
 
     /**
@@ -26,7 +26,8 @@ class LedgerSmhChange extends Backend
     public function _initialize()
     {
         parent::_initialize();
-        $this->model = new \app\common\model\LedgerSmhChangeModel();
+        $this->model = new \app\common\model\LedgerTeacAngelChangeModel();
+
 
     }
 

+ 0 - 0
application/admin/view/ledger/ledger_smh_change/index.html → application/admin/view/ledger/ledger_teac_angel_change/index.html


+ 1 - 1
application/api/controller/Order.php

@@ -65,7 +65,7 @@ class Order extends Api
                 $pvs = bcmul(($order_info['pv'] * $areaNum), config('community_ratio'), 2);
                 if($pvs > 0)$userModel::setCommunityRewards($this->auth->id, $pvs, Asset::TOKEN);
             }
-            
+          
             //生态节点标识
             WelfareLoginc::setUserEcologyAirdrop($this->auth->id, $params['product_id'], $this->auth->parent_id);
 

+ 1 - 1
application/api/logic/WelfareLoginc.php

@@ -170,7 +170,7 @@ class WelfareLoginc
                 ]);
             }
         }
-
+     
         //发放上级推广奖励
         $ecologyCount = Loader::model('ProductOrder')->isBuyHoldProduct($ecology['parent_hold_product_id'], $parentId);
         if($ecologyCount > 0){

+ 1 - 1
application/common/model/ProductOrder.php

@@ -118,7 +118,7 @@ class ProductOrder extends Model
     //判断是否购买持有产品
     public function isBuyHoldProduct(array $productId, int $uid){
         
-        return self::where('user_id', $uid)->whereIn('product_id', $productId)->whereIn('a.status', [self::Paid, self::Transferred, self::Freeze])->count();
+        return self::where('user_id', $uid)->whereIn('product_id', $productId)->whereIn('status', [self::Paid, self::Transferred, self::Freeze])->count();
     }
 
     //获取持有产品数量

+ 6 - 8
public/assets/js/backend/ledger/ledger_smh_change.js → public/assets/js/backend/ledger/ledger_teac_angel_change.js

@@ -5,13 +5,11 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
             // 初始化表格参数配置
             Table.api.init({
                 extend: {
-                    index_url: 'ledger/ledger_smh_change/index' + location.search,
-                    add_url: 'ledger/ledger_smh_change/add',
-                    edit_url: 'ledger/ledger_smh_change/edit',
-                    del_url: 'ledger/ledger_smh_change/del',
-                    multi_url: 'ledger/ledger_smh_change/multi',
-                    import_url: 'ledger/ledger_smh_change/import',
-                    table: 'ledger_smh_change',
+                    index_url: 'ledger/ledger_teac_angel_change/index' + location.search,
+              
+                    multi_url: 'ledger/ledger_teac_angel_change/multi',
+                    import_url: 'ledger/ledger_teac_angel_change/import',
+                    table: 'ledger_teac_angel_change',
                 }
             });
 
@@ -30,7 +28,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'address', title: '用户地址'},
                         {
                             field: 'action', title: '账变类型', searchList: {
-                                '400': '今日产出',
+                                '0': '茶付宝转入',
                                 '401': '兑换',
                                 '402': '提现',
                                 '403': '提现退回',

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

@@ -55,6 +55,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                 19: '生态节点奖励',
                                 20: '存储服务费',
                                 21: '社区服务奖励',
+                                22: '茶付宝转入',
                             }, operate: 'FIND_IN_SET', formatter: Table.api.formatter.label
                         },
                     ]