![](\"@/assets/images/coupon.png\")
\r\n\t\t\t\t\t\t\t\t\t![](\"@/assets/images/point.png\")
\r\n\t\t\t\t\t\t\t\t\t![](\"@/assets/images/balance.png\")
\r\n\t\t\t\t\t\t\t\t\t![](\"@/assets/images/member-empty.png\"){kind=spacer}
\r\n\t\t\t\t\t\t
{{ reward.point }}
- 兑换券
+ 积分
用于下单时抵现或兑换商品等
- 消费券
+ 余额
{{ (parseFloat(member.balance) + parseFloat(member.balance_money)).toFixed(2) }}
diff --git a/addon/pinfan/model/PinfanGroup.php b/addon/pinfan/model/PinfanGroup.php
index 4a7591af..4cbf6c30 100644
--- a/addon/pinfan/model/PinfanGroup.php
+++ b/addon/pinfan/model/PinfanGroup.php
@@ -202,7 +202,7 @@ class PinfanGroup extends BaseModel
$member_account_model->addMemberAccount($pintuan_info[ 'site_id' ], $v[ 'member_id' ], 'balance', $pintuan_info[ 'reward_type_num' ], 'pinfan', 0, '活动奖励发放', $v[ 'order_id' ]);
$user_model->addUserLog($user_admin_info[ 'uid' ], $user_admin_info[ 'username' ], $pintuan_info[ 'site_id' ], "拼团返利：会员余额调整id:" . $v[ 'member_id' ] . "金额" . $pintuan_info[ 'reward_type_num' ]);
} else if ($pintuan_info[ 'reward_type' ] == 2) {
- #奖励现金消费券
+ #奖励现金余额
$member_account_model->addMemberAccount($pintuan_info[ 'site_id' ], $v[ 'member_id' ], 'balance_money', $pintuan_info[ 'reward_type_num' ], 'pinfan', 0, '活动奖励发放', $v[ 'order_id' ]);
$user_model->addUserLog($user_admin_info[ 'uid' ], $user_admin_info[ 'username' ], $pintuan_info[ 'site_id' ], "拼团返利：会员余额调整id:" . $v[ 'member_id' ] . "金额" . $pintuan_info[ 'reward_type_num' ]);
} else if ($pintuan_info[ 'reward_type' ] == 4) {
@@ -481,7 +481,7 @@ class PinfanGroup extends BaseModel
$member_account_model->addMemberAccount($pintuan_info[ 'site_id' ], $v[ 'member_id' ], 'balance', $pintuan_info[ 'reward_type_num' ], 'pinfan', 0, '活动奖励发放', $v[ 'order_id' ]);
$user_model->addUserLog($user_admin_info[ 'uid' ], $user_admin_info[ 'username' ], $pintuan_info[ 'site_id' ], "拼团返利：会员余额调整id:" . $v[ 'member_id' ] . "金额" . $pintuan_info[ 'reward_type_num' ]);
} else if ($pintuan_info[ 'reward_type' ] == 2) {
- #奖励现金消费券
+ #奖励现金余额
$member_account_model->addMemberAccount($pintuan_info[ 'site_id' ], $v[ 'member_id' ], 'balance_money', $pintuan_info[ 'reward_type_num' ], 'pinfan', 0, '活动奖励发放', $v[ 'order_id' ]);
$user_model->addUserLog($user_admin_info[ 'uid' ], $user_admin_info[ 'username' ], $pintuan_info[ 'site_id' ], "拼团返利：会员余额调整id:" . $v[ 'member_id' ] . "金额" . $pintuan_info[ 'reward_type_num' ]);
} else if ($pintuan_info[ 'reward_type' ] == 4) {
diff --git a/addon/pointexchange/shop/view/exchange/add.html b/addon/pointexchange/shop/view/exchange/add.html
index a4246920..faa1a08f 100644
--- a/addon/pointexchange/shop/view/exchange/add.html
+++ b/addon/pointexchange/shop/view/exchange/add.html
@@ -286,7 +286,7 @@
{block name="script"}
@@ -911,7 +911,7 @@
width: '14%',
templet: '#exchangeLimit'
}, {
- title: '所需兑换券',
+ title: '所需积分',
unresize: 'false',
width: '12%',
templet: '#exchangePoint'
@@ -959,7 +959,7 @@
name: '兑换次数',
value: 'limit_num'
},{
- name: '所需兑换券',
+ name: '所需积分',
value: 'point'
},{
name: '所需金额',
diff --git a/addon/pointexchange/shop/view/exchange/edit.html b/addon/pointexchange/shop/view/exchange/edit.html
index 8ac4fce0..5a658438 100644
--- a/addon/pointexchange/shop/view/exchange/edit.html
+++ b/addon/pointexchange/shop/view/exchange/edit.html
@@ -342,7 +342,7 @@
{block name="script"}
@@ -712,7 +712,7 @@
width: '14%',
templet: '#exchangeLimit'
}, {
- title: '所需兑换券',
+ title: '所需积分',
unresize: 'false',
width: '12%',
templet: '#exchangePoint'
@@ -755,7 +755,7 @@
name: '兑换次数',
value: 'limit_num'
},{
- name: '所需兑换券',
+ name: '所需积分',
value: 'point'
},{
name: '所需金额',
diff --git a/addon/scenefestival/shop/view/record/lists.html b/addon/scenefestival/shop/view/record/lists.html
index cae1e265..659de93b 100644
--- a/addon/scenefestival/shop/view/record/lists.html
+++ b/addon/scenefestival/shop/view/record/lists.html
@@ -121,9 +121,9 @@
var str = data.award_type;
if(str.search("balance") != -1 ){
if(data.balance_type == 0){
- return '奖励储值消费券' + "【"+data.balance+"元】";
+ return '奖励储值余额' + "【"+data.balance+"元】";
}else{
- return '奖励现金消费券' + "【"+data.balance_money+"元】";
+ return '奖励现金余额' + "【"+data.balance_money+"元】";
}
}else {
return '--';
diff --git a/addon/store/model/StoreOrderCreate.php b/addon/store/model/StoreOrderCreate.php
index 52b52968..aaa4a309 100644
--- a/addon/store/model/StoreOrderCreate.php
+++ b/addon/store/model/StoreOrderCreate.php
@@ -33,7 +33,7 @@ class StoreOrderCreate extends OrderCreate
{
private $goods_money = 0;//商品金额
- private $balance_money = 0;//消费券
+ private $balance_money = 0;//余额
private $delivery_money = 0;//配送费用
private $coupon_money = 0;//优惠券金额
private $adjust_money = 0;//调整金额
@@ -543,7 +543,7 @@ class StoreOrderCreate extends OrderCreate
{
$this->pay_type = 'BALANCE';
$balance_money = $data[ 'member_account' ][ 'balance_money' ];//储值余额
- $balance = $data[ 'member_account' ][ 'balance' ];//现金消费券
+ $balance = $data[ 'member_account' ][ 'balance' ];//现金余额
$member_account_model = new MemberAccount();
$surplus_banance = $data[ 'balance_money' ];
//优先扣除储值余额
diff --git a/addon/store/model/cashier/CashierOrderOffset.php b/addon/store/model/cashier/CashierOrderOffset.php
index 4bf9f102..b3bf0d6c 100644
--- a/addon/store/model/cashier/CashierOrderOffset.php
+++ b/addon/store/model/cashier/CashierOrderOffset.php
@@ -52,11 +52,11 @@ class CashierOrderOffset extends BaseModel
],
[
'name' => 'balance',
- 'title' => '储值消费券'
+ 'title' => '储值余额'
],
[
'name' => 'balance_money',
- 'title' => '现金消费券'
+ 'title' => '现金余额'
],
);
@@ -138,19 +138,19 @@ class CashierOrderOffset extends BaseModel
$num = $v['num'];
$relate_id = $v['relate_id'];
switch($type){
- case 'balance'://储值消费券
+ case 'balance'://储值余额
$from_type = 'refund';
- $relate_tag = '储值消费券返还';
- $remark = '订单关闭,返还储值消费券:' . $num.',订单id:'.$order_id;
+ $relate_tag = '储值余额返还';
+ $remark = '订单关闭,返还储值余额:' . $num.',订单id:'.$order_id;
$member_account_model = new MemberAccount();
- $account_title = '订单关闭,返还储值消费券';
+ $account_title = '订单关闭,返还储值余额';
$result = $member_account_model->addMemberAccount($site_id, $member_id, 'balance', $num, $from_type, $relate_tag, $remark, $account_title);
break;
- case 'balance_money'://现金消费券
+ case 'balance_money'://现金余额
$from_type = 'refund';
- $relate_tag = '现金消费券返还';
- $remark = '订单关闭,返还现金消费券:' . $num.',订单id:'.$order_id;
- $account_title = '订单关闭,返还现金消费券';
+ $relate_tag = '现金余额返还';
+ $remark = '订单关闭,返还现金余额:' . $num.',订单id:'.$order_id;
+ $account_title = '订单关闭,返还现金余额';
$member_account_model = new MemberAccount();
$result = $member_account_model->addMemberAccount($site_id, $member_id, 'balance_money', $num, $from_type, $relate_tag, $remark, $account_title);
break;
@@ -211,10 +211,10 @@ class CashierOrderOffset extends BaseModel
$num = $v['num'];//优惠项数量
$offset_money = $v['offset_money'];//优惠金额
switch($type){
- case 'balance'://储值消费券
+ case 'balance'://储值余额
$balance += $num;
break;
- case 'balance_money'://现金消费券
+ case 'balance_money'://现金余额
$balance_money += $num;
break;
// case 'coupon'://优惠券
diff --git a/addon/store/model/cashier/CashierOrderPay.php b/addon/store/model/cashier/CashierOrderPay.php
index b24403a7..5086f889 100644
--- a/addon/store/model/cashier/CashierOrderPay.php
+++ b/addon/store/model/cashier/CashierOrderPay.php
@@ -502,8 +502,8 @@ class CashierOrderPay extends BaseModel
['site_id', '=', $site_id]
);
$member_account = $member_account_model->getMemberAccount($member_account_condition)['data'] ?? [];
- $member_balance = $member_account['balance'];//储值消费券
- $member_balance_money = $member_account['balance_money'];//现金消费券
+ $member_balance = $member_account['balance'];//储值余额
+ $member_balance_money = $member_account['balance_money'];//现金余额
if ($balance_money > 0) {
$order_data = array();
//优先扣除可不提现余额
@@ -515,7 +515,7 @@ class CashierOrderPay extends BaseModel
$surplus -= $temp_balance;
$from_type = 'order';
$relate_tag = '余额抵扣';
- $remark = '订单名称：' . $calculate_data['order_name'] . '，订单编号：' . $calculate_data['out_trade_no'] ?? '' . '，订单金额:' . $calculate_data['order_money'] . '，订单余额抵扣，扣除储值消费券:' . $temp_balance;
+ $remark = '订单名称：' . $calculate_data['order_name'] . '，订单编号：' . $calculate_data['out_trade_no'] ?? '' . '，订单金额:' . $calculate_data['order_money'] . '，订单余额抵扣，扣除储值余额:' . $temp_balance;
$account_title = '订单余额抵扣';
if ($temp_balance > 0) {
$result = $member_account_model->addMemberAccount($site_id, $member_id, 'balance', -$temp_balance, $from_type, $relate_tag, $remark, $account_title);
@@ -534,7 +534,7 @@ class CashierOrderPay extends BaseModel
);
$order_offset_model->addOrderOffset($discount_params);
}
- //扣除现金消费券
+ //扣除现金余额
$temp_balance = $member_balance_money;
if ($member_balance_money > $surplus) {
$temp_balance = $surplus;
@@ -542,7 +542,7 @@ class CashierOrderPay extends BaseModel
// $surplus -= $temp_balance;
$from_type = 'order';
$relate_tag = '余额抵扣';
- $remark = '订单名称：' . $calculate_data['order_name'] . '，订单编号：' . $calculate_data['out_trade_no'] . '，订单金额:' . $calculate_data['order_money'] . '，订单余额抵扣，扣除储值消费券:' . $temp_balance;
+ $remark = '订单名称：' . $calculate_data['order_name'] . '，订单编号：' . $calculate_data['out_trade_no'] . '，订单金额:' . $calculate_data['order_money'] . '，订单余额抵扣，扣除储值余额:' . $temp_balance;
$account_title = '订单余额抵扣';
if ($temp_balance > 0) {
$result = $member_account_model->addMemberAccount($site_id, $member_id, 'balance_money', -$temp_balance, $from_type, $relate_tag, $remark, $account_title);
diff --git a/addon/store/model/cashier/CashierOrderRefund.php b/addon/store/model/cashier/CashierOrderRefund.php
index 1ffa3140..9f5957bb 100644
--- a/addon/store/model/cashier/CashierOrderRefund.php
+++ b/addon/store/model/cashier/CashierOrderRefund.php
@@ -438,9 +438,9 @@ class CashierOrderRefund extends BaseModel
$refund_balance = $params['refund_balance'];//可退可提现佣金
if ($refund_balance_money > 0) {
$from_type = 'refund';
- $relate_tag = '现金消费券退还';
- $remark = '订单退款,退还现金消费券:' . $refund_balance_money;
- $account_title = '订单退款,退还现金消费券';
+ $relate_tag = '现金余额退还';
+ $remark = '订单退款,退还现金余额:' . $refund_balance_money;
+ $account_title = '订单退款,退还现金余额';
$result = $member_account_model->addMemberAccount($site_id, $member_id, 'balance_money', $refund_balance_money, $from_type, $relate_tag, $remark, $account_title);
if ($result['code'] < 0) {
return $result;
@@ -448,9 +448,9 @@ class CashierOrderRefund extends BaseModel
}
if ($refund_balance > 0) {
$from_type = 'refund';
- $relate_tag = '储值消费券退还';
- $remark = '订单退款,退还储值消费券:' . $refund_balance;
- $account_title = '订单退款,退还储值消费券';
+ $relate_tag = '储值余额退还';
+ $remark = '订单退款,退还储值余额:' . $refund_balance;
+ $account_title = '订单退款,退还储值余额';
$result = $member_account_model->addMemberAccount($site_id, $member_id, 'balance', $refund_balance, $from_type, $relate_tag, $remark, $account_title);
if ($result['code'] < 0) {
return $result;
@@ -567,7 +567,7 @@ class CashierOrderRefund extends BaseModel
return $this->error();
//订单整体项
- //查询正处于退款中和退款成功的退款记录,计算已经退的钱以及退的消费券 积分 红包
+ //查询正处于退款中和退款成功的退款记录,计算已经退的钱以及退的余额 积分 红包
$refund_temp_condition = array(
['order_id', '=', $order_id],
['refund_status', '<>', self::REFUND_CLOSE],
@@ -576,8 +576,8 @@ class CashierOrderRefund extends BaseModel
//统计已经扣除的
$over_refund_money = 0;
$over_refund_pay_money = 0;//已退款真实退款金额
- $over_refund_balance_money = 0;//已退款退款现金消费券
- $over_refund_balance = 0;//已退款退款储值消费券
+ $over_refund_balance_money = 0;//已退款退款现金余额
+ $over_refund_balance = 0;//已退款退款储值余额
$over_refund_point_money = 0;//已退积分金额
$over_refund_point = 0;//已退积分
@@ -586,8 +586,8 @@ class CashierOrderRefund extends BaseModel
$over_refund_pay_money += $v['refund_pay_money'];
$over_refund_point += $v['refund_point'];//退的积分
$over_refund_point_money += $v['refund_point_money'];//退的积分金额
- $over_refund_balance += $v['refund_balance'];//储值消费券
- $over_refund_balance_money += $v['refund_balance_money'];//现金消费券
+ $over_refund_balance += $v['refund_balance'];//储值余额
+ $over_refund_balance_money += $v['refund_balance_money'];//现金余额
}
$order_goods_ids = $params['order_goods_ids'] ?? '';
@@ -668,8 +668,8 @@ class CashierOrderRefund extends BaseModel
$over_refund_pay_money = $params['over_refund_pay_money'];
$over_refund_point = $params['over_refund_point'];//退的积分
$over_refund_point_money = $params['over_refund_point_money'];//退的积分金额
- $over_refund_balance = $params['over_refund_balance'];//储值消费券
- $over_refund_balance_money = $params['over_refund_balance_money'];//现金消费券
+ $over_refund_balance = $params['over_refund_balance'];//储值余额
+ $over_refund_balance_money = $params['over_refund_balance_money'];//现金余额
$order_id = $order_goods_info['order_id'];
$order_goods_id = $order_goods_info['order_goods_id'];
$order_money = $params['order_money'];
@@ -691,8 +691,8 @@ class CashierOrderRefund extends BaseModel
$surplus_pay_money = $pay_money - $over_refund_pay_money;//剩余真实金额
$surplus_point = $total_point - $over_refund_point;//剩余可退积分
$surplus_point_money = $total_point_money - $over_refund_point_money;//剩余积分可抵金额
- $surplus_balance_money = $total_balance_money - $over_refund_balance_money;//剩余现金消费券
- $surplus_balance = $total_balance - $over_refund_balance;//剩余真储值消费券
+ $surplus_balance_money = $total_balance_money - $over_refund_balance_money;//剩余现金余额
+ $surplus_balance = $total_balance - $over_refund_balance;//剩余真储值余额
$refund_shipping_money = 0;
if ($refund_shipping_money > 0) {
$refund_shipping_money = $refund_shipping_money > $surplus_order_money ? $surplus_order_money : $refund_shipping_money;
@@ -884,7 +884,7 @@ class CashierOrderRefund extends BaseModel
$member_account = $refund_data['member_account'] ?? [];
$can_refund_balance = $refund_data['can_refund_balance'];
if($can_refund_balance <= 0){
- return $this->error([], '没有可退的消费券');
+ return $this->error([], '没有可退的余额');
}
$refund_total_balance = $refund_data['refund_total_balance'];
$refund_transfer_type = $params['refund_transfer_type'] ?? '';
@@ -951,9 +951,9 @@ class CashierOrderRefund extends BaseModel
$refund_balance_money = $member_account['balance_money'];
if ($refund_balance_money > 0) {
$from_type = 'refund';//todo 需要改
- $relate_tag = '现金消费券清零';
- $remark = '订单退款,退还现金消费券:' . $refund_balance_money;
- $account_title = '订单退款,退还现金消费券';
+ $relate_tag = '现金余额清零';
+ $remark = '订单退款,退还现金余额:' . $refund_balance_money;
+ $account_title = '订单退款,退还现金余额';
$result = $member_account_model->addMemberAccount($site_id, $member_id, 'balance_money', -$refund_balance_money, $from_type, $relate_tag, $remark, $account_title);
if ($result['code'] < 0) {
return $result;
@@ -961,9 +961,9 @@ class CashierOrderRefund extends BaseModel
}
if ($refund_balance > 0) {
$from_type = 'refund';
- $relate_tag = '储值消费券清零';
- $remark = '订单退款,退还储值消费券:' . $refund_balance;
- $account_title = '订单退款,退还储值消费券';
+ $relate_tag = '储值余额清零';
+ $remark = '订单退款,退还储值余额:' . $refund_balance;
+ $account_title = '订单退款,退还储值余额';
$result = $member_account_model->addMemberAccount($site_id, $member_id, 'balance', -$refund_balance, $from_type, $relate_tag, $remark, $account_title);
if ($result['code'] < 0) {
return $result;
diff --git a/addon/store/store/view/cash/cash.html b/addon/store/store/view/cash/cash.html
index 95fdd2c6..ccb2077a 100644
--- a/addon/store/store/view/cash/cash.html
+++ b/addon/store/store/view/cash/cash.html
@@ -828,7 +828,7 @@
calculatePrice(param);
});
- // 选择消费券
+ // 选择余额
form.on('checkbox(is_balance)', function(data){
if (data.elem.checked) {
param.is_balance = 1;
@@ -1080,10 +1080,10 @@
-
消费券（元）
+余额（元）
{{d.balance_sum}}
-结算时可用消费券抵付
+结算时可用余额抵付
@@ -1235,9 +1235,9 @@
diff --git a/addon/store/store/view/order/detail.html b/addon/store/store/view/order/detail.html
index 04e46690..ea639d74 100644
--- a/addon/store/store/view/order/detail.html
+++ b/addon/store/store/view/order/detail.html
@@ -401,7 +401,7 @@
-
+
- 消费券：￥{{d.member_account.balance_money}}
+ 余额：￥{{d.member_account.balance_money}}
店铺优惠券：￥{$order_detail["coupon_money"]}
店铺优惠：￥{$order_detail["promotion_money"]}
{if $order_detail["balance_money"] > 0}
- 消费券：￥{$order_detail["balance_money"]}
+ 余额：￥{$order_detail["balance_money"]}
{/if}
订单调价：￥{$order_detail["adjust_money"]}
配送费用：￥{$order_detail["delivery_money"]}
diff --git a/addon/topic/model/TopicOrderCreate.php b/addon/topic/model/TopicOrderCreate.php
index 30614f88..a11ea6ef 100644
--- a/addon/topic/model/TopicOrderCreate.php
+++ b/addon/topic/model/TopicOrderCreate.php
@@ -31,7 +31,7 @@ class TopicOrderCreate extends OrderCreate
{
private $goods_money = 0;//商品金额
- private $balance_money = 0;//消费券
+ private $balance_money = 0;//余额
private $delivery_money = 0;//配送费用
private $coupon_money = 0;//优惠券金额
private $adjust_money = 0;//调整金额
@@ -42,7 +42,7 @@ class TopicOrderCreate extends OrderCreate
private $is_virtual = 0; //是否是虚拟类订单
private $order_name = ''; //订单详情
private $goods_num = 0; //商品种数
- private $member_balance_money = 0;//会员账户消费券(计算过程中会逐次减少)
+ private $member_balance_money = 0;//会员账户余额(计算过程中会逐次减少)
private $pay_type = 'ONLINE_PAY';//支付方式
private $invoice_delivery_money = 0;
private $error = 0; //是否有错误
@@ -214,7 +214,7 @@ class TopicOrderCreate extends OrderCreate
$config_model = new Config();
$balance_config = $config_model->getBalanceConfig($shop_goods_list['site_id']);
- //扣除消费券(统一扣除)
+ //扣除余额(统一扣除)
if ($calculate_data["balance_money"] > 0 && $balance_config[ 'data' ][ 'value' ][ 'balance_show' ] == 1) {
$this->pay_type = "BALANCE";
$calculate_data['order_id'] = $order_id;
@@ -247,7 +247,7 @@ class TopicOrderCreate extends OrderCreate
{
$data = $this->initMemberAddress($data);
$data = $this->initMemberAccount($data);//初始化会员账户
- //消费券付款
+ //余额付款
if ($data['is_balance'] > 0) {
$this->member_balance_money = $data["member_account"]["balance_total"] ?? 0;
}
diff --git a/app/api/controller/Member.php b/app/api/controller/Member.php
index b9d288a3..509d84b3 100644
--- a/app/api/controller/Member.php
+++ b/app/api/controller/Member.php
@@ -348,10 +348,10 @@ class Member extends BaseApi
*/
public function accountrule()
{
- //兑换券
+ //积分
$point = event('MemberAccountRule', [ 'account' => 'point', 'site_id' => $this->site_id ]);
- //消费券
+ //余额
$balance = event('MemberAccountRule', [ 'account' => 'balance', 'site_id' => $this->site_id ]);
//成长值
@@ -474,8 +474,8 @@ class Member extends BaseApi
$member_model = new \app\model\member\Member();
$member_data = $member_model->getMemberInfo([ [ 'member_id', '=', $member_id ], [ 'site_id', '=', $this->site_id ] ]);
- $balance_money = $member_data[ 'data' ][ 'balance_money' ]; //现金消费券
- $balance = $member_data[ 'data' ][ 'balance' ]; //储值消费券
+ $balance_money = $member_data[ 'data' ][ 'balance_money' ]; //现金余额
+ $balance = $member_data[ 'data' ][ 'balance' ]; //储值余额
$member_account_model = new MemberAccount();
$surplus_banance = $this->params[ 'money' ]; //支付金额
//优先扣除储值余额
diff --git a/app/api/controller/Memberaccount.php b/app/api/controller/Memberaccount.php
index 1caf2368..ba065086 100644
--- a/app/api/controller/Memberaccount.php
+++ b/app/api/controller/Memberaccount.php
@@ -27,7 +27,7 @@ class Memberaccount extends BaseApi
{
$token = $this->checkToken();
if ($token[ 'code' ] < 0) return $this->response($token);
- $account_type = isset($this->params[ 'account_type' ]) ? $this->params[ 'account_type' ] : 'balance,balance_money'; //账户类型 消费券:balance，积分:point
+ $account_type = isset($this->params[ 'account_type' ]) ? $this->params[ 'account_type' ] : 'balance,balance_money'; //账户类型 余额:balance，积分:point
if (!in_array($account_type, [ 'point', 'balance', 'balance,balance_money' ])) return $this->response($this->error('', 'INVALID_PARAMETER'));
@@ -46,7 +46,7 @@ class Memberaccount extends BaseApi
$page = isset($this->params[ 'page' ]) ? $this->params[ 'page' ] : 1;
$page_size = isset($this->params[ 'page_size' ]) ? $this->params[ 'page_size' ] : PAGE_LIST_ROWS;
- $account_type = isset($this->params[ 'account_type' ]) ? $this->params[ 'account_type' ] : 'balance,balance_money';//账户类型 消费券:balance，积分:point
+ $account_type = isset($this->params[ 'account_type' ]) ? $this->params[ 'account_type' ] : 'balance,balance_money';//账户类型 余额:balance，积分:point
$start_time = empty($this->params[ 'date' ]) ? strtotime(date('Y-m', strtotime("today"))) : strtotime($this->params[ 'date' ]);
$end_time = strtotime("+1 month", $start_time);
$from_type = isset($this->params[ 'from_type' ]) ? $this->params[ 'from_type' ] : '';
@@ -87,7 +87,7 @@ class Memberaccount extends BaseApi
$token = $this->checkToken();
if ($token[ 'code' ] < 0) return $this->response($token);
- $account_type = $this->params[ 'account_type' ] ?? 'point'; // 账户类型 消费券:balance，积分:point
+ $account_type = $this->params[ 'account_type' ] ?? 'point'; // 账户类型 余额:balance，积分:point
$from_type = $this->params[ 'from_type' ] ?? '';
$query_type = $this->params[ 'query_type' ] ?? ''; // 查询类型 收入：income 支出：pay
$start_time = $this->params[ 'start_time' ] ?? 0;
diff --git a/app/component/view/member_info/design.html b/app/component/view/member_info/design.html
index 1dda0da5..06814a2b 100644
--- a/app/component/view/member_info/design.html
+++ b/app/component/view/member_info/design.html
@@ -37,12 +37,12 @@
200
- 消费券
+ 余额
80
- 兑换券
+ 积分
@@ -76,12 +76,12 @@
200
- 消费券
+ 余额
80
- 兑换券
+ 积分
diff --git a/app/install/source/database.sql b/app/install/source/database.sql
index 629a7d0e..101abb35 100644
--- a/app/install/source/database.sql
+++ b/app/install/source/database.sql
@@ -2819,7 +2819,7 @@ CREATE TABLE promotion_games_award (
relate_id int(11) NOT NULL DEFAULT 0 COMMENT '关联id（根据奖品类型）',
relate_name varchar(255) NOT NULL DEFAULT '' COMMENT '关联商品名称（优惠券或者赠品名称）',
point int(11) NOT NULL DEFAULT 0 COMMENT '积分数',
- balance decimal(10, 2) NOT NULL DEFAULT 0.00 COMMENT '消费券',
+ balance decimal(10, 2) NOT NULL DEFAULT 0.00 COMMENT '余额',
award_num int(11) NOT NULL DEFAULT 0 COMMENT '奖品数量',
award_winning_rate int(11) NOT NULL DEFAULT 0 COMMENT '奖品中奖概率',
remaining_num int(11) NOT NULL DEFAULT 0 COMMENT '剩余数量',
@@ -2969,7 +2969,7 @@ CREATE TABLE promotion_festival_award (
award_type varchar(255) NOT NULL DEFAULT '' COMMENT '奖品类型 以逗号分割',
coupon varchar(255) NOT NULL DEFAULT '' COMMENT '关联id（根据奖品类型）',
point int(11) NOT NULL DEFAULT 0 COMMENT '积分数',
- balance decimal(10, 2) NOT NULL DEFAULT 0.00 COMMENT '消费券',
+ balance decimal(10, 2) NOT NULL DEFAULT 0.00 COMMENT '余额',
award_num int(11) NOT NULL DEFAULT 0 COMMENT '奖品数量',
remaining_num int(11) NOT NULL DEFAULT 0 COMMENT '剩余数量',
receive_num int(11) NOT NULL DEFAULT 0 COMMENT '已领取数量',
@@ -3081,7 +3081,7 @@ CREATE TABLE promotion_exchange_goods (
create_time int(11) NOT NULL DEFAULT 0 COMMENT '创建时间',
modify_time int(11) NOT NULL DEFAULT 0 COMMENT '修改时间',
sort int(11) NOT NULL DEFAULT 0 COMMENT '排序',
- pay_type int(11) NOT NULL DEFAULT 0 COMMENT '兑换类型 0-积分 1-积分+消费券',
+ pay_type int(11) NOT NULL DEFAULT 0 COMMENT '兑换类型 0-积分 1-积分+余额',
delivery_price decimal(10, 2) NOT NULL DEFAULT 0.00 COMMENT '物流费用（礼品有效）',
rule text DEFAULT NULL COMMENT '兑换规则',
PRIMARY KEY (id)
@@ -3378,7 +3378,7 @@ CREATE TABLE promotion_birthdaygift (
level_name varchar(255) NOT NULL DEFAULT '' COMMENT '等级名称',
type varchar(255) NOT NULL DEFAULT '' COMMENT '奖励类型',
point int(11) NOT NULL DEFAULT 0 COMMENT '积分',
- balance decimal(10, 2) NOT NULL DEFAULT 0.00 COMMENT '消费券',
+ balance decimal(10, 2) NOT NULL DEFAULT 0.00 COMMENT '余额',
coupon varchar(255) NOT NULL DEFAULT '' COMMENT '优惠券ID 以逗号隔开',
blessing_content varchar(255) NOT NULL DEFAULT '' COMMENT '祝福语',
site_id int(11) NOT NULL DEFAULT 0,
@@ -4519,7 +4519,7 @@ CREATE TABLE member_recommend (
update_time int(11) NOT NULL DEFAULT 0 COMMENT '修改时间',
status int(11) NOT NULL DEFAULT 0 COMMENT '状态（0未开始1进行中2已结束-1已关闭）',
point int(11) NOT NULL DEFAULT 0 COMMENT '积分',
- balance decimal(10, 2) NOT NULL DEFAULT 0.00 COMMENT '消费券',
+ balance decimal(10, 2) NOT NULL DEFAULT 0.00 COMMENT '余额',
coupon varchar(255) NOT NULL DEFAULT '' COMMENT '优惠券ID 以逗号隔开',
max_point decimal(10, 2) NOT NULL DEFAULT 0.00 COMMENT '每月最多积分',
max_balance decimal(10, 2) NOT NULL DEFAULT 0.00 COMMENT '每月最多余额',
@@ -5004,7 +5004,7 @@ CREATE TABLE member (
point int(11) NOT NULL DEFAULT 0 COMMENT '积分',
balance decimal(10, 2) NOT NULL DEFAULT 0.00 COMMENT '余额',
growth int(11) NOT NULL DEFAULT 0 COMMENT '成长值',
- balance_money decimal(10, 2) NOT NULL DEFAULT 0.00 COMMENT '现金消费券(可提现)',
+ balance_money decimal(10, 2) NOT NULL DEFAULT 0.00 COMMENT '现金余额(可提现)',
account5 decimal(10, 2) NOT NULL DEFAULT 0.00 COMMENT '账户5',
is_auth int(11) NOT NULL DEFAULT 0 COMMENT '是否认证',
is_member tinyint(4) NOT NULL DEFAULT 0 COMMENT '是否是会员',
diff --git a/app/model/games/Games.php b/app/model/games/Games.php
index 30fd9563..55af8af1 100644
--- a/app/model/games/Games.php
+++ b/app/model/games/Games.php
@@ -411,7 +411,7 @@ class Games extends BaseModel
if ($luck_draw_num > $game_info[ 'join_frequency' ]) return $this->error("", "您的抽奖次数已用完");
}
- if ($game_info[ 'points' ] > 0 && $member_info[ 'point' ] < $game_info[ 'points' ]) return $this->error("", "兑换券不足");
+ if ($game_info[ 'points' ] > 0 && $member_info[ 'point' ] < $game_info[ 'points' ]) return $this->error("", "积分不足");
$lottery_result = $this->lotteryCalculate($game_info);
diff --git a/app/model/member/MemberAccount.php b/app/model/member/MemberAccount.php
index 97fa9205..64f546b4 100644
--- a/app/model/member/MemberAccount.php
+++ b/app/model/member/MemberAccount.php
@@ -26,9 +26,9 @@ class MemberAccount extends BaseModel
{
//账户类型
private $account_type = [
- 'balance' => '储值消费券',
- 'balance_money' => '消费券',
- 'point' => '兑换券',
+ 'balance' => '储值余额',
+ 'balance_money' => '余额',
+ 'point' => '积分',
'growth' => '成长值'
];
@@ -87,7 +87,7 @@ class MemberAccount extends BaseModel
$from_type[ 'point' ][ 'refund' ] = [ 'type_name' => '退还', 'type_url' => '' ];
$from_type[ 'point' ][ 'pointexchangerefund' ] = [ 'type_name' => '积分兑换退还', 'type_url' => '' ];
- $from_type[ 'point' ][ 'pointexchange' ] = [ 'type_name' => '兑换券兑换商品', 'type_url' => '' ];
+ $from_type[ 'point' ][ 'pointexchange' ] = [ 'type_name' => '积分兑换商品', 'type_url' => '' ];
$from_type[ 'balance' ][ 'presale_deposit_refund' ] = [ 'type_name' => '预售定金退还', 'type_url' => '' ];
$from_type[ 'balance' ][ 'presale_refund' ] = [ 'type_name' => '预售订单退还', 'type_url' => '' ];
diff --git a/app/model/member/Withdraw.php b/app/model/member/Withdraw.php
index 44974a37..803f523e 100644
--- a/app/model/member/Withdraw.php
+++ b/app/model/member/Withdraw.php
@@ -151,7 +151,7 @@ class Withdraw extends BaseModel
"applet_type" => $applet_type
);
- //减少现金消费券
+ //减少现金余额
$member_account = new MemberAccount();
$account_res = $member_account->addMemberAccount($site_id, $member_id, 'balance_money', -$apply_money, 'withdraw', '会员提现', '会员提现扣除');
if ($account_res['code'] != 0) return $account_res;
@@ -247,7 +247,7 @@ class Withdraw extends BaseModel
);
$result = model("member_withdraw")->update($data, $condition);
- //增加现金消费券
+ //增加现金余额
$member_account = new MemberAccount();
$account_res = $member_account->addMemberAccount($info['site_id'], $info['member_id'], 'balance_money', $info["apply_money"], 'withdraw', '会员提现申请未通过', '提现申请未通过返还');
if ($account_res['code'] != 0) {
diff --git a/app/model/order/OrderRefund.php b/app/model/order/OrderRefund.php
index a1e21337..500f2b3a 100644
--- a/app/model/order/OrderRefund.php
+++ b/app/model/order/OrderRefund.php
@@ -923,9 +923,9 @@ class OrderRefund extends BaseModel
//退款余额
if ($refund_balance_money > 0) {
$member_account_model = new MemberAccount();
- // 查询该订单使用的现金消费券
+ // 查询该订单使用的现金余额
$order_use_balance_money = abs($member_account_model->getMemberAccountSum([['account_type', '=', 'balance_money'], ['type_tag', '=', $order_id], ['from_type', '=', 'order']], 'account_data')['data']);
- // 查询该订单已退回的现金消费券
+ // 查询该订单已退回的现金余额
$refunded_balance_money = $member_account_model->getMemberAccountSum([['account_type', '=', 'balance_money'], ['type_tag', '=', $order_id], ['from_type', '=', 'refund']], 'account_data')['data'];
if ($order_use_balance_money > $refunded_balance_money) {
diff --git a/app/shop/controller/Member.php b/app/shop/controller/Member.php
index 559043d1..c2181492 100644
--- a/app/shop/controller/Member.php
+++ b/app/shop/controller/Member.php
@@ -486,7 +486,7 @@ class Member extends BaseShop
$member_id = input('member_id', 0);
$adjust_num = input('adjust_num', 0);
$remark = input('remark', '商家调整');
- $this->addLog("会员消费券调整id:" . $member_id . "金额" . $adjust_num);
+ $this->addLog("会员余额调整id:" . $member_id . "金额" . $adjust_num);
$member_account_model = new MemberAccountModel();
return $member_account_model->addMemberAccount($this->site_id, $member_id, 'balance', $adjust_num, 'adjust', 0, $remark ? $remark : '商家调整');
}
@@ -499,7 +499,7 @@ class Member extends BaseShop
$member_id = input('member_id', 0);
$adjust_num = input('adjust_num', 0);
$remark = input('remark', '商家调整');
- $this->addLog("会员兑换券调整id:" . $member_id . "数量" . $adjust_num);
+ $this->addLog("会员积分调整id:" . $member_id . "数量" . $adjust_num);
$member_account_model = new MemberAccountModel();
return $member_account_model->addMemberAccount($this->site_id, $member_id, 'point', $adjust_num, 'adjust', 0, $remark ? $remark : '商家调整');
}
@@ -802,8 +802,8 @@ class Member extends BaseShop
$phpExcel->getActiveSheet()->setCellValue('H1', '会员标签');
$phpExcel->getActiveSheet()->setCellValue('I1', 'qq');
$phpExcel->getActiveSheet()->setCellValue('J1', '地址');
- $phpExcel->getActiveSheet()->setCellValue('K1', '消费券');
- $phpExcel->getActiveSheet()->setCellValue('L1', '兑换券');
+ $phpExcel->getActiveSheet()->setCellValue('K1', '余额');
+ $phpExcel->getActiveSheet()->setCellValue('L1', '积分');
$phpExcel->getActiveSheet()->setCellValue('M1', '成长值');
$phpExcel->getActiveSheet()->setCellValue('N1', '上次登录时间');
$phpExcel->getActiveSheet()->setCellValue('O1', '上次登录ip');
@@ -983,10 +983,10 @@ class Member extends BaseShop
$phpExcel->getActiveSheet()->setCellValue('E1', '微信公众号openid');
$phpExcel->getActiveSheet()->setCellValue('F1', '微信小程序openid');
$phpExcel->getActiveSheet()->setCellValue('G1', '真实姓名');
- $phpExcel->getActiveSheet()->setCellValue('H1', '兑换券');
+ $phpExcel->getActiveSheet()->setCellValue('H1', '积分');
$phpExcel->getActiveSheet()->setCellValue('I1', '成长值');
- $phpExcel->getActiveSheet()->setCellValue('J1', '消费券(可提现)');
- $phpExcel->getActiveSheet()->setCellValue('K1', '消费券(不可提现)');
+ $phpExcel->getActiveSheet()->setCellValue('J1', '余额(可提现)');
+ $phpExcel->getActiveSheet()->setCellValue('K1', '余额(不可提现)');
$phpExcel->getActiveSheet()->setCellValue('L1', '会员等级(名称)');
// 设置第一个sheet为工作的sheet
$phpExcel->setActiveSheetIndex(0);
diff --git a/app/shop/controller/Membercluster.php b/app/shop/controller/Membercluster.php
index 3d24121b..dd11812a 100644
--- a/app/shop/controller/Membercluster.php
+++ b/app/shop/controller/Membercluster.php
@@ -208,8 +208,8 @@ class Membercluster extends BaseShop
$phpExcel->getActiveSheet()->setCellValue('H1', '会员标签');
$phpExcel->getActiveSheet()->setCellValue('I1', 'qq');
$phpExcel->getActiveSheet()->setCellValue('J1', '地址');
- $phpExcel->getActiveSheet()->setCellValue('K1', '消费券');
- $phpExcel->getActiveSheet()->setCellValue('L1', '兑换券');
+ $phpExcel->getActiveSheet()->setCellValue('K1', '余额');
+ $phpExcel->getActiveSheet()->setCellValue('L1', '积分');
$phpExcel->getActiveSheet()->setCellValue('M1', '成长值');
$phpExcel->getActiveSheet()->setCellValue('N1', '上次登录时间');
$phpExcel->getActiveSheet()->setCellValue('O1', '上次登录ip');
diff --git a/app/shop/view/account/balance.html b/app/shop/view/account/balance.html
index e2a8f2fe..103c41da 100644
--- a/app/shop/view/account/balance.html
+++ b/app/shop/view/account/balance.html
@@ -31,8 +31,8 @@
总余额
{$total_balance + $total_balance_money}
- 现金消费券：{$total_balance_money} - 储值消费券：{$total_balance} + 现金余额：{$total_balance_money} + 储值余额：{$total_balance}
@@ -171,7 +171,7 @@
width: '10%',
unresize: 'false',
templet: function (data) {
- return data.account_type == 'balance' ? '储值消费券' : '现金消费券';
+ return data.account_type == 'balance' ? '储值余额' : '现金余额';
}
}, {
field: 'type_name',
diff --git a/app/shop/view/diy/member_info_component.html b/app/shop/view/diy/member_info_component.html
index d42782bd..a0443262 100644
--- a/app/shop/view/diy/member_info_component.html
+++ b/app/shop/view/diy/member_info_component.html
@@ -17,12 +17,12 @@
200
- 消费券
+ 余额
80
- 兑换券
+ 积分
@@ -47,12 +47,12 @@
>
200
- 消费券
+ 余额
80
- 兑换券
+ 积分
diff --git a/app/shop/view/localorder/detail.html b/app/shop/view/localorder/detail.html
index 40f78a77..fb5c9111 100644
--- a/app/shop/view/localorder/detail.html
+++ b/app/shop/view/localorder/detail.html
@@ -283,7 +283,7 @@
{/if}
{if $order_detail["balance_money"] > 0}
-
{/if}
消费券：￥{$order_detail["balance_money"]}
+余额：￥{$order_detail["balance_money"]}
diff --git a/app/shop/view/member/account_detail.html b/app/shop/view/member/account_detail.html
index 71da5677..d7988274 100644
--- a/app/shop/view/member/account_detail.html
+++ b/app/shop/view/member/account_detail.html
@@ -61,8 +61,8 @@
@@ -311,7 +311,7 @@
return ;
}
if (balance*1 + data.field.adjust_num*1 < 0) {
- layer.msg('当前储值消费券不可以为负数');
+ layer.msg('当前储值余额不可以为负数');
repeat_flag = false;
return ;
}
@@ -344,7 +344,7 @@
return ;
}
if (balance*1 + data.field.adjust_num*1 < 0) {
- layer.msg('消费券(可提现)不可以为负数');
+ layer.msg('余额(可提现)不可以为负数');
repeat_flag = false;
return ;
}
@@ -438,7 +438,7 @@
};
laytpl($("#balance").html()).render(data, function(html) {
layer.open({
- title: '调整储值消费券',
+ title: '调整储值余额',
skin: 'layer-tips-class',
type: 1,
area: ['800px'],
@@ -454,7 +454,7 @@
};
laytpl($("#balance_money").html()).render(data, function(html) {
layer.open({
- title: '调整现金消费券',
+ title: '调整现金余额',
skin: 'layer-tips-class',
type: 1,
area: ['800px'],
@@ -516,7 +516,7 @@
-
+
-
+
-
+