充值和后台用户列表调整

application/admin/lang/zh-cn/user/rechargelog.php

@@ -8,8 +8,8 @@ return [
     'Jewelafter'    => '充值后钻石余额',
     'Moneyafter'    => '充值后账户余额',
     'Away'          => '支付通道',
-    'Away 1'        => '微信APP支付',
-    'Away 2'        => '支付宝WAP支付',
+    'Away 1'        => '微信支付',
+    'Away 2'        => '支付宝支付',
     'Away 3'        => '微信公众号支付',
     'Away 4'        => '苹果支付',
     'Platform'      => '充值平台',

application/api/controller/Money.php

@@ -51,6 +51,7 @@ class Money extends Common
         $openid = $this->request->request("openid", "");// 非小程序支付无需传值
         $params_from = $this->request->request("params_from",1);// 平台参数充值平台:1=安卓,2=ios
         $amounts = $this->request->request("amounts",0);// 自定义金额
+        $jewelRate = config('site.money_to_jewel');
         if (!$rechar_id && empty($amounts)) {
             $this->error(__('Invalid parameters'));
         }
@@ -66,9 +67,9 @@ class Money extends Common
             $recharMode = new \app\common\model\RecharConfig();
             $recharInfo = $recharMode->where(["id" => $rechar_id])->find();
         } else {
-            $amountsNew = $amounts * 100;
+            $amountsNew = $amounts * $jewelRate;
             $recharInfo = [
-                'money' => $amountsNew,
+                'money' => $amounts,
                 'jewel' => $amountsNew,
                 'jewel_full' => $amountsNew,
             ];
@@ -88,7 +89,7 @@ class Money extends Common
             if ($userMoney > $maxMoney) {
                 $this->error('请先实名认证');
             }
-        }echo '<pre>';var_dump(3);exit;
+        }
         if ($params_from == "ios") {
             $jewel = $recharInfo['jewel'];
         } else {

application/api/controller/Notify.php

@@ -166,7 +166,7 @@ class Notify extends Api
                 $detail = "钻石充值";
                 $res3 = $jewellogModel->addUserJewelLog($userInfo["id"], $orderInfo["jewel"], "+", $userInfo["jewel"], $detail, 1);
                 // 添加充值记录
-                $res4 = $rechargelogModel->addRecord($userInfo["id"], $orderInfo["jewel"], $payamount, bcadd($userInfo["jewel"], $orderInfo["jewel"], 2), $userInfo["money"], $orderInfo["platform"], 1,$isFirst,$preUserId);
+                $res4 = $rechargelogModel->addRecord($userInfo["id"], $orderInfo["jewel"], $payamount, bcadd($userInfo["jewel"], $orderInfo["jewel"], 2), $userInfo["money"], $orderInfo["platform"], 2,$isFirst,$preUserId);
                 if ($res1 && $res2 && $res3 && $res4) {
                     // 添加统计
                     $userInfo->chargecount = $userInfo->chargecount + $payamount;

public/assets/js/backend/user/user.js

@@ -48,12 +48,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         // {field: 'onlinetime', title: __('最近一次上线时间'), formatter: Table.api.formatter.datetime, operate: 'RANGE', addclass: 'datetimerange', sortable: true},
                         // {field: 'chargecount', title: __('总充值金额')},
                         // {field: 'rebatecount', title: __('总获得返利金额')},
-                        //{field: 'gender', title: __('Gender'), searchList: {1: __('Male'), 0: __('Female')}, formatter: Table.api.formatter.normal},
+                        {field: 'gender', title: __('Gender'), searchList: {1: __('Male'), 0: __('Female')}, formatter: Table.api.formatter.normal},
                         // {field: 'age', title: __('Age'), operate: 'LIKE'},
                         // {field: 'level', title: __('Level'), operate: 'BETWEEN', sortable: true},
                         // {field: 'empirical', title: __('Empirical'), operate: 'LIKE'},
-                        // {field: 'money', title: __('Money'), operate: 'LIKE'},
-                        // {field: 'jewel', title: __('Jewel'), operate: 'LIKE'},
+                        {field: 'money', title: __('Money'), operate: 'LIKE'},
+                        {field: 'jewel', title: __('Jewel'), operate: 'LIKE'},
                         // {field: 'sound_coin', title: __('Sound_coin'), operate: 'LIKE'},
                         // {field: 'noble.name', title: __('Noble'), operate: 'LIKE'},
                         // {field: 'noble_duetime', title: __('NobleDuetime'), formatter: Table.api.formatter.datetime, operate: 'RANGE'},