diff --git a/src/admin/member_do.php b/src/admin/member_do.php
index dde15349..906fdc19 100644
--- a/src/admin/member_do.php
+++ b/src/admin/member_do.php
@@ -144,6 +144,12 @@ function __EditUser()
----------------*/
else if ($dopost == 'edituser') {
CheckPurview('member_Edit');
+ $send_max = isset($send_max)? intval($send_max) : 0;
+ $user_money = isset($user_money)? intval($user_money) : 0;
+ $money = isset($money)? intval($money) : 0;
+ $scores = isset($scores)? intval($scores) : 0;
+ $rank = isset($rank)? intval($rank) : 0;
+ $id = isset($id)? intval($id) : 0;
if (!isset($_POST['id'])) exit('dedebiz');
$pwdsql = empty($pwd) ? '' : ",pwd='".md5($pwd)."'";
if (function_exists('password_hash')) {
@@ -155,7 +161,7 @@ else if ($dopost == 'edituser') {
ShowMsg("不支持直接把前台会员转为管理的操作", "-1");
exit();
}
- $query = "UPDATE `#@__member` SET send_max='$send_max',email='$email',uname='$uname',sex='$sex',matt='$matt',money='$money',scores='$scores',`rank`='$rank',spacesta='$spacesta',uptime='$uptime',exptime='$exptime'$pwdsql WHERE mid='$id' AND matt<>10 ";
+ $query = "UPDATE `#@__member` SET send_max='$send_max',email='$email',uname='$uname',sex='$sex',matt='$matt',user_money='$user_money',money='$money',scores='$scores',`rank`='$rank',spacesta='$spacesta',uptime='$uptime',exptime='$exptime'$pwdsql WHERE mid='$id' AND matt<>10 ";
$rs = $dsql->ExecuteNoneQuery2($query);
if ($rs == 0) {
$query = "UPDATE `#@__member` SET email='$email',uname='$uname',sex='$sex',money='$money',scores='$scores',`rank`='$rank',spacesta='$spacesta',uptime='$uptime',exptime='$exptime'$pwdsql WHERE mid='$id' ";
diff --git a/src/admin/member_main.php b/src/admin/member_main.php
index 2897d5b1..6f321393 100644
--- a/src/admin/member_main.php
+++ b/src/admin/member_main.php
@@ -82,7 +82,7 @@ function GetMemberName($rank, $mt)
function GetMAtt($m)
{
if ($m < 1) return '';
- else if ($m == 10) return " 管理员";
- else return " 推荐";
+ else if ($m == 10) return " 管";
+ else return " 荐";
}
?>
\ No newline at end of file
diff --git a/src/admin/templets/member_main.htm b/src/admin/templets/member_main.htm
index 530f4560..173ec999 100644
--- a/src/admin/templets/member_main.htm
+++ b/src/admin/templets/member_main.htm
@@ -63,11 +63,11 @@
选择 |
mid |
- 用户 |
+ 用户 |
名称 |
邮箱 |
会员等级 |
- 会员属性 |
+ 会员属性 |
地址时间 |
发布限制 |
操作 |
@@ -93,9 +93,10 @@
{dede:field.rank function="GetMemberName(@me,'限制会员')"/} |
- {dede:field.mtype/}用户
- 金币{dede:field.money/}
+ {dede:field.mtype/}用户
+ 金币{dede:field.money/}
积分{dede:field.scores/}
+ 余额{dede:field.user_money/}
|
{dede:field.loginip/}
diff --git a/src/admin/templets/member_view.htm b/src/admin/templets/member_view.htm
index 3867154d..03868d18 100644
--- a/src/admin/templets/member_view.htm
+++ b/src/admin/templets/member_view.htm
@@ -89,6 +89,7 @@
|
积分:
+ 余额:
|
diff --git a/src/install/update.txt b/src/install/update.txt
index 5d2ac0a5..e889bb0a 100644
--- a/src/install/update.txt
+++ b/src/install/update.txt
@@ -124,4 +124,5 @@ INSERT INTO `#@__sys_payment`(`id`, `code`, `name`, `short_name`, `sortrank`, `c
INSERT INTO `#@__sys_payment`(`id`, `code`, `name`, `short_name`, `sortrank`, `config`, `status`) VALUES (2, 'Alipay', '支付宝支付', '支付宝', 1, '{"APPID":"","PrivateKey":"","AppCertPublicKey":"AlipayAppCertPublicKey","CertPublicKey":"AlipayCertPublicKey","RootCert":"AlipayRootCert","SignType":"RSA2"}', 0);
INSERT INTO `#@__sys_payment`(`id`, `code`, `name`, `short_name`, `sortrank`, `config`, `status`) VALUES (3, 'Bank', '银行转账', '转账', 2, '{"AccountName":"","AccountNO":"","Name":""}', 0);
INSERT INTO `#@__sys_payment`(`id`, `code`, `name`, `short_name`, `sortrank`, `config`, `status`) VALUES (4, 'Balance', '余额支付', '余额', 3, '[]', 0);
-INSERT INTO `#@__sys_payment`(`id`, `code`, `name`, `short_name`, `sortrank`, `config`, `status`) VALUES (5, 'Cod', '货到付款', '货到付款', 4, '[]', 0);
\ No newline at end of file
+INSERT INTO `#@__sys_payment`(`id`, `code`, `name`, `short_name`, `sortrank`, `config`, `status`) VALUES (5, 'Cod', '货到付款', '货到付款', 4, '[]', 0);
+ALTER TABLE `#@__member` ADD COLUMN `user_money` decimal(10, 2) UNSIGNED NULL DEFAULT 0.00 AFTER `send_max`;
\ No newline at end of file
diff --git a/src/system/common.func.php b/src/system/common.func.php
index 48814a2e..7f4f7b16 100755
--- a/src/system/common.func.php
+++ b/src/system/common.func.php
@@ -323,7 +323,7 @@ $arrs2 = array();
*/
function ShowMsg($msg, $gourl, $onlymsg = 0, $limittime = 0)
{
- if (strtolower($GLOBALS['format'])==='json') {
+ if (isset($GLOBALS['format']) && strtolower($GLOBALS['format'])==='json') {
echo json_encode(array(
"code"=>0,
"msg"=>$msg,
diff --git a/src/system/memberlogin.class.php b/src/system/memberlogin.class.php
index 804499a9..02c3ab0b 100755
--- a/src/system/memberlogin.class.php
+++ b/src/system/memberlogin.class.php
@@ -99,6 +99,7 @@ class MemberLogin
var $M_LoginID;
var $M_MbType;
var $M_Money;
+ var $M_UserMoney;
var $M_Scores;
var $M_UserName;
var $M_Rank;
@@ -153,6 +154,7 @@ class MemberLogin
$this->M_LoginID = $this->fields['userid'];
$this->M_MbType = $this->fields['mtype'];
$this->M_Money = $this->fields['money'];
+ $this->M_UserMoney = $this->fields['user_money'];
$this->M_UserName = FormatUsername($this->fields['uname']);
$this->M_Scores = $this->fields['scores'];
$this->M_Face = $this->fields['face'];
@@ -296,6 +298,7 @@ class MemberLogin
$this->M_Rank = 0;
$this->M_Face = "";
$this->M_Money = 0;
+ $this->M_UserMoney = 0;
$this->M_UserName = "";
$this->M_LoginTime = 0;
$this->M_MbType = '';
@@ -542,7 +545,7 @@ class MemberLogin
elseif ($this->M_Rank > 10) $sta .= "会员已到期";
}
}
- $sta .= " 积分{$this->M_Scores}分,金币{$this->M_Money}个";
+ $sta .= " 积分{$this->M_Scores}分,金币{$this->M_Money}个,余额{$this->M_UserMoney}元";
return $sta;
}
//获取能够发布文档的栏目
diff --git a/src/user/buy_action.php b/src/user/buy_action.php
index a2de523f..609fc712 100755
--- a/src/user/buy_action.php
+++ b/src/user/buy_action.php
@@ -1,6 +1,6 @@
ExecuteNoneQuery($inquery);
if (!$isok) {
@@ -100,7 +101,26 @@ if (!isset($paytype)) {
$tpl->LoadTemplate(DEDEMEMBER.'/templets/buy_action_payment.htm');
$tpl->Display();
} else {
- //TODO进行支付处理
+ $moRow = $dsql->GetOne("SELECT * FROM `#@__member_operation` WHERE buyid='$buyid'");
+ if ($moRow['sta'] == 2) {
+ ShowMsg("已完成支付,无需重复付款", "javascript:;");
+ exit;
+ }
+ if($paytype === 4) {
+ if ($cfg_ml->M_UserMoney < $row['money']) {
+ ShowMsg("余额不足,请确保当前账户有足够金币支付", "javascript:;");
+ exit;
+ }
+ $query = "UPDATE `#@__member_operation` SET sta = '2' WHERE buyid = '$buyid'";
+ $dsql->ExecuteNoneQuery($query);
+ $query = "UPDATE `#@__member` SET money = money+{$row['num']} WHERE mid = '$mid'";
+ $dsql->ExecuteNoneQuery($query);
+ $query = "UPDATE `#@__member` SET user_money = user_money-{$row['money']} WHERE mid = '$mid'";
+ $dsql->ExecuteNoneQuery($query);
+ ShowMsg("成功使用余额付款", "javascript:;");
+ exit;
+ }
+
}
/**
* 加密函数
diff --git a/src/user/templets/buy_action_payment.htm b/src/user/templets/buy_action_payment.htm
index ee686aa2..5f1beb1f 100755
--- a/src/user/templets/buy_action_payment.htm
+++ b/src/user/templets/buy_action_payment.htm
@@ -55,7 +55,7 @@
{/dede:array}