diff --git a/app/admin/service/UserService.php b/app/admin/service/UserService.php index dbd0b573..d4f51eb0 100644 --- a/app/admin/service/UserService.php +++ b/app/admin/service/UserService.php @@ -28,6 +28,7 @@ use app\model\UserStockFurModel; use app\model\UserStockGBXModel; use app\model\UserStockHkdModel; use app\model\UserStockIdnModel; +use app\model\UserStockIndexInrModel; use app\model\UserStockInModel; use app\model\UserStockJpModel; use app\model\UserStockModel; @@ -220,6 +221,10 @@ class UserService extends AdminBaseService $userStockInList = UserStockInModel::where('user_id', 'in', $userIdArr) ->where('stock_id', 'INR') ->column('usable_num,frozen_num', 'user_id'); + // 印度股指资产 + $userStockIndexInrList = UserStockIndexInrModel::where('user_id', 'in', $userIdArr) + ->where('contract_id', 'INR') + ->column('usable_num,frozen_num', 'user_id'); //新加坡股票资产 $userStockSGDList = UserStockSgdModel::where('user_id', 'in', $userIdArr) ->where('stock_id', 'SGD') @@ -341,6 +346,7 @@ class UserService extends AdminBaseService 'stock_tha' => $userStockThaList[$item['user_id']]['usable_num'] ?? '0', // 泰股资产 'stock_mys' => $userStockMysList[$item['user_id']]['usable_num'] ?? '0', // 马股资产 'stock_in' => $userStockInList[$item['user_id']]['usable_num'] ?? '0', // 印度股资产 + 'stock_index_inr' => $userStockIndexInrList[$item['user_id']]['usable_num'] ?? '0', //印度股指资产 'stock_sgd' => $userStockSGDList[$item['user_id']]['usable_num'] ?? '0', // 新加坡股资产 'stock_fund' => $userStockFundList[$item['user_id']]['usable_num'] ?? '0', // 基金资产 'stock_option_in' => $userStockOptionInrList[$item['user_id']]['usable_num'] ?? '0', // 印度期权资产 @@ -361,6 +367,7 @@ class UserService extends AdminBaseService 'stock_tha_frozen' => $userStockThaList[$item['user_id']]['frozen_num'] ?? '0', // 泰股资产 'stock_mys_frozen' => $userStockMysList[$item['user_id']]['frozen_num'] ?? '0', // 马股资产 'stock_in_frozen' => $userStockInList[$item['user_id']]['frozen_num'] ?? '0', // 印度股资产 + 'stock_index_inr_frozen' => $userStockIndexInrList[$item['user_id']]['frozen_num'] ?? '0', // 印度股指资产资产 'stock_sgd_frozen' => $userStockSGDList[$item['user_id']]['frozen_num'] ?? '0', // 新加坡股资产 'stock_fund_frozen' => $userStockFundList[$item['user_id']]['frozen_num'] ?? '0', // 基金资产 'stock_option_in_frozen' => $userStockOptionInrList[$item['user_id']]['frozen_num'] ?? '0', // 印度期权资产 diff --git a/app/home/service/WalletService.php b/app/home/service/WalletService.php index 25927955..40316773 100644 --- a/app/home/service/WalletService.php +++ b/app/home/service/WalletService.php @@ -38,6 +38,8 @@ use app\model\UserStockHkdLogModel; use app\model\UserStockHkdModel; use app\model\UserStockIdnLogModel; use app\model\UserStockIdnModel; +use app\model\UserStockIndexInrLogModel; +use app\model\UserStockIndexInrModel; use app\model\UserStockInLogModel; use app\model\UserStockInModel; use app\model\UserStockJpLogModel; @@ -1420,9 +1422,13 @@ class WalletService extends BaseHomeService return UserStockJpModel::getUserStockLock($user_id); break; case 19: - // 巴西 + // 外汇 return UserForexModel::getUserForexLock($user_id); break; + case 20: + // 印度股指 + return UserStockIndexInrModel::getUserStockIndexInrLock($user_id); + break; default: return []; break; @@ -1539,6 +1545,11 @@ class WalletService extends BaseHomeService 'user_id' => $user_id, 'contract_id' => 'USD' ]); + case 20: + return UserStockIndexInrModel::updateUserStockIndexInr($update_data, [ + 'user_id' => $user_id, + 'contract_id' => 'INR' + ]); break; default: return false; @@ -1621,6 +1632,9 @@ class WalletService extends BaseHomeService $log_data['contract_id'] = 'USD'; return UserForexLogModel::InsertUserBalanceLog($log_data); break; + case 20: + $log_data['contract_id'] = 'INR'; + return UserStockIndexInrLogModel::InsertUserBalanceLog($log_data); default: return false; break; diff --git a/app/model/UserStockIndexInrLogModel.php b/app/model/UserStockIndexInrLogModel.php index f8315bbe..b12aec21 100644 --- a/app/model/UserStockIndexInrLogModel.php +++ b/app/model/UserStockIndexInrLogModel.php @@ -5,4 +5,21 @@ namespace app\model; class UserStockIndexInrLogModel extends BaseModel { protected $name = 'user_stock_index_inr_log'; + + public static function InsertUserBalanceLog(array $data) + { + $self = new self; + $self->user_id = $data['user_id']; + $self->contract_id = $data['contract_id']; + $self->change_type = $data['change_type']; + $self->change_num = $data['change_num']; + if(isset($data['order_id'])){ + $self->order_id = $data['order_id']; + } + $self->before_num = $data['before_num']; + $self->create_time = date('Y-m-d H:i:s'); + $self->update_time = date('Y-m-d H:i:s'); + return $self->save(); + } + } \ No newline at end of file diff --git a/app/model/UserStockIndexInrModel.php b/app/model/UserStockIndexInrModel.php new file mode 100644 index 00000000..476c63d2 --- /dev/null +++ b/app/model/UserStockIndexInrModel.php @@ -0,0 +1,37 @@ +$user_id, + 'contract_id'=>$contract_id + ])->lock(true)->find(); + if(empty($info)){ + // 如果没有则创建 + $info = new self; + $info->user_id = $user_id; + $info->contract_id = $contract_id; + $info->usable_num = 0; + $info->frozen_num = 0; + $info->create_time = date('Y-m-d H:i:s'); + $info->update_time = date('Y-m-d H:i:s'); + $info->save(); + } + return $info->toArray(); + } + + public static function updateUserStockIndexInr(array $update_data,array $where) + { + $update_data['update_time']=date('Y-m-d H:i:s'); + $res=self::where($where)->save($update_data); + //echo self::where($where)->getLastSql(); + return $res; + } + +} \ No newline at end of file