qianggou
/
admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

【修改】兑换券改积分，消费券改余额

This commit is contained in:
liqianjin 2023-03-04 15:42:06 +08:00
parent 8957872c83
commit 432f43178a
97 changed files with 330 additions and 326 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addon/bale/model/BaleOrderCreate.php
View File

@ -43,7 +43,7 @@ class BaleOrderCreate extends OrderCreate
private $is_virtual = 0; //是否是虚拟类订单
private $order_name = ''; //订单详情
private $goods_num = 0; //商品种数
private $balance_money = 0;//消费券
private $balance_money = 0;//余额
private $member_balance_money = 0;//会员账户余额(计算过程中会逐次减少)
private $pay_type = 'ONLINE_PAY';//支付方式
private $invoice_delivery_money = 0;

2
addon/birthdaygift/shop/view/birthdaygift/add.html
View File

@ -154,7 +154,7 @@
</div>
</div>
<div class="word-aux"><p>红包为储值消费券，仅在消费时可用</p></div>
<div class="word-aux"><p>红包为储值余额，仅在消费时可用</p></div>
</div>
<div class="coupon-wrap layui-hide">

2
addon/birthdaygift/shop/view/birthdaygift/edit.html
View File

@ -157,7 +157,7 @@
</div>
</div>
<div class="word-aux"><p>红包为储值消费券，仅在消费时可用</p></div>
<div class="word-aux"><p>红包为储值余额，仅在消费时可用</p></div>
</div>
<div class="coupon-wrap {if !in_array('coupon', $info['type']) }layui-hide{/if}">

2
addon/blindbox/model/BlindboxOrder.php
View File

@ -251,7 +251,7 @@ class BlindboxOrder extends BaseModel
{
$this->pay_type = "BALANCE";
$member_model = new Member();
$balance_money = $data[ "member_account" ][ "balance_money" ]; //现金消费券
$balance_money = $data[ "member_account" ][ "balance_money" ]; //现金余额
$balance = $data[ "member_account" ][ "balance" ]; //储值余额
$member_account_model = new MemberAccount();
$surplus_banance = $data[ "balance_money" ];

2
addon/cashier/config/cashier_auth.php
View File

@ -99,7 +99,7 @@ return [
],
[
'name' => 'member_modify_balance',
'title' => '调整消费券',
'title' => '调整余额',
'type' => 'api',
'url' => 'cashier/storeapi/member/modifybalance',
],

8
addon/cashier/model/order/CashierOrderPay.php
View File

@ -491,7 +491,7 @@ class CashierOrderPay extends BaseModel
);
$member_info = $member_model->getMemberInfo($member_condition)[ 'data' ] ?? [];
$member_balance = $member_info[ 'balance' ];//储值余额
$member_balance_money = $member_info[ 'balance_money' ];//现金消费券
$member_balance_money = $member_info[ 'balance_money' ];//现金余额
if ($balance_money > 0) {
$order_data = array ();
//优先扣除可不提现余额
@ -503,7 +503,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;
$remark = '收银订单余额抵扣';
if ($temp_balance > 0) {
$result = $member_account_model->addMemberAccount($site_id, $member_id, 'balance', -$temp_balance, $from_type, $relate_tag, $remark, $order_id);
@ -512,14 +512,14 @@ class CashierOrderPay extends BaseModel
}
$order_data[ 'balance' ] = $temp_balance;
}
//扣除现金消费券
//扣除现金余额
$temp_balance = $member_balance_money;
if ($member_balance_money > $surplus) {
$temp_balance = $surplus;
}
$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;
$remark = '收银订单余额抵扣';
if ($temp_balance > 0) {
$result = $member_account_model->addMemberAccount($site_id, $member_id, 'balance_money', -$temp_balance, $from_type, $relate_tag, $remark, $order_id);

2
addon/cashier/shop/view/order/detail.html
View File

@ -395,7 +395,7 @@
{/if}
{if $order_detail["balance_money"] > 0}
<div>
<p>消费券：<span>￥{$order_detail["balance_money"]}</span></p>
<p>余额：<span>￥{$order_detail["balance_money"]}</span></p>
</div>
{/if}

2
addon/cashier/source/os/components/nc-member-buycard/nc-member-buycard.vue
View File

@ -35,7 +35,7 @@
<view class="content-data">
<view class="content-data-item">
<view class="item-title">消费券</view>
<view class="item-title">余额</view>
<view class="item-value">{{ (parseFloat(info.balance_money) + parseFloat(info.balance)) | moneyFormat }}</view>
<view class="item-btn" @click="recharge()">充值</view>
</view>

22
addon/cashier/source/os/components/nc-member-detail/nc-member-detail.vue
View File

@ -32,13 +32,13 @@
<view class="data-item-action" @click="memberAction('point_list')">查看</view>
</view>
<view class="content-data-item">
<view class="data-item-title">储值消费券(元)</view>
<view class="data-item-title">储值余额(元)</view>
<view class="data-item-value">{{ memberInfo && memberInfo.balance ? memberInfo.balance : '0.00' }}</view>
<view class="data-item-action" @click="memberAction('balance_list')">查看</view>
<!-- <view class="data-item-action" v-if="memberInfo && memberInfo.balance > 0" @click="refundBalance">退储值</view> -->
</view>
<view class="content-data-item">
<view class="data-item-title">现金消费券(元)</view>
<view class="data-item-title">现金余额(元)</view>
<view class="data-item-value">{{ memberInfo && memberInfo.balance_money ? memberInfo.balance_money : '0.00' }}</view>
</view>
<view class="content-data-item">
@ -71,7 +71,7 @@
</view>
<view class="content-data-item" @click="memberAction('balance')">
<view class="data-item-icon"><image mode="aspectFit" :src="$util.img('public/uniapp/cashier/icon-member-balance.png')"></image></view>
<view class="data-item-value">消费券充值</view>
<view class="data-item-value">余额充值</view>
</view>
<view class="content-data-item" @click="memberAction('sendCoupon')">
<view class="data-item-icon"><image mode="aspectFit" :src="$util.img('public/uniapp/cashier/icon-member-coupon.png')"></image></view>
@ -252,11 +252,11 @@
</view>
</uni-popup>
<!-- 消费券调整 -->
<!-- 余额调整 -->
<uni-popup ref="balancePop">
<view class="pop-box pointPop-box">
<view class="pop-header">
<view class="pop-header-text">调整消费券</view>
<view class="pop-header-text">调整余额</view>
<view class="pop-header-close" @click="popClose('balance')"><i class="iconguanbi1 iconfont"></i></view>
</view>
@ -265,7 +265,7 @@
<view class="form-item">
<view class="form-label">
<text class="required"></text>
当前消费券：
当前余额：
</view>
<view class="form-inline">{{ memberInfo && memberInfo.balance ? memberInfo.balance : '0.00' }}</view>
</view>
@ -277,7 +277,7 @@
</view>
<view class="form-inline">
<input class="form-input" type="number" placeholder="请输入调整数额" v-model="balanceData.num" />
<view class="word-aux">调整数额与当前储值消费券相加不能小于0</view>
<view class="word-aux">调整数额与当前储值余额相加不能小于0</view>
</view>
</view>
@ -453,11 +453,11 @@
</view>
</uni-popup>
<!-- 消费券列表 -->
<!-- 余额列表 -->
<uni-popup ref="balanceListPop">
<view class="pop-box couponlistPop-box">
<view class="pop-header">
<view class="pop-header-text">消费券</view>
<view class="pop-header-text">余额</view>
<view class="pop-header-close" @click="popClose('balance_list')"><i class="iconguanbi1 iconfont"></i></view>
</view>
@ -627,7 +627,7 @@ export default {
},
{
width: 15,
title: '消费券',
title: '余额',
align: 'left',
field: 'account_data'
},
@ -1010,7 +1010,7 @@ export default {
}
});
},
// 调整消费券
// 调整余额
saveBalance() {
this.$api.sendRequest({
url: '/cashier/storeapi/member/modifybalance',

2
addon/cashier/source/os/components/nc-member/nc-member.vue
View File

@ -34,7 +34,7 @@
<view class="content-data">
<view class="content-data-item">
<view class="item-title">消费券</view>
<view class="item-title">余额</view>
<view class="item-value">{{ (parseFloat(info.balance_money) + parseFloat(info.balance)) | moneyFormat }}</view>
<view class="item-btn" @click="recharge()">充值</view>
</view>

2
addon/cashier/source/os/components/nc-select-member/nc-select-member.vue
View File

@ -37,7 +37,7 @@
<view class="phone">手机号：{{ item.mobile ? item.mobile : '--' }}</view>
<view class="other">
<!-- <view>类型：小程序</view> -->
<view>消费券：{{ parseFloat(parseFloat(item.balance) + parseFloat(item.balance_money)).toFixed(2) }}</view>
<view>余额：{{ parseFloat(parseFloat(item.balance) + parseFloat(item.balance_money)).toFixed(2) }}</view>
</view>
</view>
</view>

2
addon/cashier/source/os/pages/billing/index.vue
View File

@ -23,7 +23,7 @@
</view>
<view class="head-info-bottom">
<view class="">积分：{{ memberInfo.point }}</view>
<view class="">消费券：{{ (parseFloat(memberInfo.balance_money) + parseFloat(memberInfo.balance)) | moneyFormat }}</view>
<view class="">余额：{{ (parseFloat(memberInfo.balance_money) + parseFloat(memberInfo.balance)) | moneyFormat }}</view>
</view>
</view>

2
addon/cashier/source/os/pages/buycard/index.vue
View File

@ -22,7 +22,7 @@
</view>
<view class="head-info-bottom">
<view class="">积分：{{ memberInfo.point }}</view>
<view class="">消费券：{{ (parseFloat(memberInfo.balance_money) + parseFloat(memberInfo.balance)) | moneyFormat }}</view>
<view class="">余额：{{ (parseFloat(memberInfo.balance_money) + parseFloat(memberInfo.balance)) | moneyFormat }}</view>
</view>
</view>

2
addon/cashier/source/os/pages/member/list.vue
View File

@ -34,7 +34,7 @@
<view class="item-desc">
<view>{{ item.mobile ? item.mobile : '' }}</view>
<view>
消费券：
余额：
<text>{{ parseFloat(parseFloat(item.balance) + parseFloat(item.balance_money)).toFixed(2) }}</text>
</view>
</view>

2
addon/cashier/source/os/pages/member/public/js/list.js
View File

@ -194,7 +194,7 @@ export default {
field: 'account_type_name'
}, {
width: 15,
title: '消费券',
title: '余额',
align: 'left',
field: 'account_data'
},

2
addon/cashier/source/os/pages/recharge/index.vue
View File

@ -23,7 +23,7 @@
</view>
<view class="head-info-bottom">
<view class="">积分：{{ memberInfo.point }}</view>
<view class="">消费券：{{ (parseFloat(memberInfo.balance_money) + parseFloat(memberInfo.balance)) | moneyFormat }}</view>
<view class="">余额：{{ (parseFloat(memberInfo.balance_money) + parseFloat(memberInfo.balance)) | moneyFormat }}</view>
</view>
</view>

2
addon/cashier/storeapi/controller/Member.php
View File

@ -262,7 +262,7 @@ class Member extends BaseStoreApi
}
/**
* 调整消费券
* 调整余额
*/
public function modifyBalance()
{

4
addon/fenxiao/model/FenxiaoWithdraw.php
View File

@ -30,7 +30,7 @@ class FenxiaoWithdraw extends BaseModel
{
//提现类型
public $withdraw_type = [
'balance' => '消费券',
'balance' => '余额',
'weixin' => '微信',
'alipay' => '支付宝',
'bank' => '银行卡',
@ -45,7 +45,7 @@ class FenxiaoWithdraw extends BaseModel
public function getTransferType($site_id){
$pay_model = new Pay();
$transfer_type_list = $pay_model->getTransferType($site_id);
$transfer_type_list['balance'] = '消费券';
$transfer_type_list['balance'] = '余额';
return $transfer_type_list;
}
/**

2
addon/fenxiao/shop/controller/Config.php
View File

@ -166,7 +166,7 @@ class Config extends BaseShop
$fenxiao_withdraw_model = new FenxiaoWithdraw();
$transfer_type_list = $fenxiao_withdraw_model->getTransferType($this->site_id);
$transfer_type_list[ 'balance' ] = '消费券';
$transfer_type_list[ 'balance' ] = '余额';
$this->assign('transfer_type_list', $transfer_type_list);
$this->forthMenu();
return $this->fetch('config/settlement');

2
addon/fenxiao/shop/controller/Fenxiao.php
View File

@ -694,7 +694,7 @@ class Fenxiao extends BaseShop
$adjust_num = input('adjust_num', 0);
// $remark = input('remark', '商家调整');
$remark = '后台核销';
// $this->addLog("会员消费券调整id:" . $member_id . "金额" . $adjust_num);
// $this->addLog("会员余额调整id:" . $member_id . "金额" . $adjust_num);
$fenxiao = model('fenxiao')->getInfo(['fenxiao_id' => $fenxiao_id, 'site_id' => $this->site_id], 'fenxiao_id,fenxiao_name,parent,grand_parent');
$fenxiao_account_model = new FenxiaoAccount();
return $fenxiao_account_model->addAccount($fenxiao['fenxiao_id'], $fenxiao['fenxiao_name'], 'house_purchase', -$adjust_num, $fenxiao['fenxiao_id'], 'house_purchase', $remark);

8
addon/fenxiao/shop/view/config/basics.html
View File

@ -128,24 +128,24 @@
<div class="word-aux ">有贡献值，积分每天定额返</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">定额返消费券占比：</label>
<label class="layui-form-label">定额返余额占比：</label>
<div class="layui-input-block">
<div class="layui-input-inline">
<input type="number" name="settlement_points_to_balance_money_ratio" class="layui-input ns-len-mid" value="{$basics_info.settlement_points_to_balance_money_ratio??0}" />
</div>
<div class="layui-form-mid">%</div>
</div>
<div class="word-aux ">定额返消费券占比</div>
<div class="word-aux ">定额返余额占比</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">定额返兑换券占比：</label>
<label class="layui-form-label">定额返积分占比：</label>
<div class="layui-input-block">
<div class="layui-input-inline">
<input type="number" name="settlement_points_to_point_ratio" class="layui-input ns-len-mid" value="{$basics_info.settlement_points_to_point_ratio??0}" />
</div>
<div class="layui-form-mid">%</div>
</div>
<div class="word-aux ">定额返兑换券占比</div>
<div class="word-aux ">定额返积分占比</div>
</div>
<div class="layui-form-item" style="display:none">
<label class="layui-form-label">是否开启分销：</label>

4
addon/fenxiao/shop/view/fenxiao/add.html
View File

@ -379,12 +379,12 @@
}
}, {
field: 'balance',
title: '消费券',
title: '余额',
unresize: 'false',
width: '15%',
},{
field: 'point',
title: '兑换券',
title: '积分',
unresize: 'false',
width: '15%',
},

6
addon/fenxiao/shop/view/fenxiao/lists.html
View File

@ -381,7 +381,7 @@
}
});
break;
case 'adjust_house_purchase': //调整消费券
case 'adjust_house_purchase': //调整余额
adjustBalance(data);
break;
}
@ -458,11 +458,11 @@
location.href = ns.url('fenxiao://shop/fenxiao/add');
}
// 调整消费券
// 调整余额
function adjustBalance(e){
laytpl($("#balance").html()).render(e, function(html) {
layer.open({
title: '调整储值消费券',
title: '调整储值余额',
skin: 'layer-tips-class',
type: 1,
area: ['800px'],

4
addon/futures/api/controller/Futures.php
View File

@ -90,11 +90,15 @@ class Futures extends BaseApi{
if ($token['code'] < 0) return $this->response($token);
$status = input('status', 'all');
$search_text = input('search_text', '');
$condition = [
['a.seller_uid', '=', $this->member_id],
['a.site_id','=',$this->site_id]
];
if($search_text != ''){
$condition[] = ['o.order_no','like','%'.$search_text.'%'];
}
switch($status){
case 'stock':

2
addon/futures/model/order/FuturesOrderCreate.php
View File

@ -240,7 +240,7 @@ class FuturesOrderCreate extends OrderCreate
}
}
//生成整体支付单据
$pay->addPay($shop_goods_list[ 'site_id' ], $out_trade_no, $this->pay_type, $this->order_name, $this->order_name, $this->pay_money, '', 'OrderPayNotify', '/pages/order/detail?order_id=' . $order_id);
$pay->addPay($shop_goods_list[ 'site_id' ], $out_trade_no, $this->pay_type, $this->order_name, $this->order_name, $this->pay_money, '', 'OrderPayNotify', '/pages_promotion/futures/order?status=stock');//'/pages/order/detail?order_id=' . $order_id
$this->addOrderCronClose($order_id, $shop_goods_list[ 'site_id' ]);//增加关闭订单自动事件
model('order')->commit();
return $this->success($out_trade_no);

10
addon/giftcard/model/GiftCard.php
View File

@ -25,8 +25,8 @@ class GiftCard extends BaseModel
private $account_content = [
'point' => [ 'relate_tag' => "兑换积分", 'remark' => "礼品卡兑换" ],
'growth' => [ 'relate_tag' => "兑换成长值", 'remark' => "礼品卡兑换" ],
'balance' => [ 'relate_tag' => "兑换储值消费券", 'remark' => "礼品卡兑换" ],
'balance_meney' => [ 'relate_tag' => "兑换现金消费券", 'remark' => "礼品卡兑换" ]
'balance' => [ 'relate_tag' => "兑换储值余额", 'remark' => "礼品卡兑换" ],
'balance_meney' => [ 'relate_tag' => "兑换现金余额", 'remark' => "礼品卡兑换" ]
];
private $goods_money = 0;//商品金额
private $balance_money = 0;//余额
@ -463,7 +463,7 @@ class GiftCard extends BaseModel
// $message = '优惠卷已领完';
// }
// }
//领取账户有关奖励 积分/成长值/储值余额/现金消费券
//领取账户有关奖励 积分/成长值/储值余额/现金余额
$member_account = [
'point' => $carmichael_record_info[ 'point' ],
'balance' => $carmichael_record_info[ 'balance' ],
@ -567,7 +567,7 @@ class GiftCard extends BaseModel
// $message = '优惠卷已领完';
// }
// }
//领取账户有关奖励 积分/成长值/储值余额/现金消费券
//领取账户有关奖励 积分/成长值/储值余额/现金余额
$member_account = [
'point' => $carmichael_record_info[ 'point' ],
'balance' => $carmichael_record_info[ 'balance' ],
@ -935,7 +935,7 @@ class GiftCard extends BaseModel
// $result = $member_model->checkPayPassword($data["member_id"], $data["pay_password"]);
// if ($result["code"] >= 0) {
$balance_money = $data[ "member_account" ][ "balance_money" ]; //现金消费券
$balance_money = $data[ "member_account" ][ "balance_money" ]; //现金余额
$balance = $data[ "member_account" ][ "balance" ]; //储值余额
$member_account_model = new MemberAccount();
$surplus_banance = $data[ "balance_money" ];

2
addon/giftcard/shop/view/giftcard/add.html
View File

@ -170,7 +170,7 @@
<!--储值-->
<div id="real-balance" class="layui-show">
<div class="layui-form-item">
<label class="layui-form-label">储值消费券：</label>
<label class="layui-form-label">储值余额：</label>
<div class="layui-input-inline">
<input type="number" min="0" name="balance" onchange="detectionNumType(this,'positiveNumber')" class="layui-input len-short" autocomplete="off" value="0">
</div>

4
addon/giftcard/shop/view/giftcard/detail.html
View File

@ -74,7 +74,7 @@
</div>
{if $detail.card_right_type=='balance'}
<div class="promotion-view-item">
<label>储值消费券：</label>
<label>储值余额：</label>
<span>{$detail.balance}元</span>
</div>
{/if}
@ -164,7 +164,7 @@
<p>礼品卡持卡人兑换时可从按照商品列表中商品数量进行兑换。</p>
{/if}
{else/}
<p>礼品卡持卡人兑换时将储值卡的储值消费券充值到持卡人账户余额中</p>
<p>礼品卡持卡人兑换时将储值卡的储值余额充值到持卡人账户余额中</p>
{/if}
</div>
</div>

2
addon/giftcard/shop/view/giftcard/edit.html
View File

@ -135,7 +135,7 @@
<!--储值-->
<div id="card_right_type_balance" class="{if $giftcard_info.card_right_type == 'balance'} layui-show {else/} layui-hide {/if}">
<div class="layui-form-item">
<label class="layui-form-label">储值消费券：</label>
<label class="layui-form-label">储值余额：</label>
<div class="layui-input-inline">
<input type="number" min="0" name="balance" onchange="detectionNumType(this,'positiveNumber')" class="layui-input len-short" autocomplete="off" value="{$giftcard_info.balance}">
</div>

6
addon/hongbao/model/Hongbao.php
View File

@ -442,12 +442,12 @@ class Hongbao extends BaseModel
$user_model = new User();
if($data['balance_set'] == 1){
#奖励不可提现余额
$member_account_model->addMemberAccount($data['site_id'], $data['member_id'], 'balance', $data['money'], 'hongbao', 0, '裂变红包发放,不可提现消费券:' . $data['money'],$launch_id);
$member_account_model->addMemberAccount($data['site_id'], $data['member_id'], 'balance', $data['money'], 'hongbao', 0, '裂变红包发放,不可提现余额:' . $data['money'],$launch_id);
}else{
#奖励可提现余额
$member_account_model->addMemberAccount($data['site_id'], $data['member_id'], 'balance_money', $data['money'], 'hongbao', 0, '裂变红包发放,可提现消费券:' . $data['money'],$launch_id);
$member_account_model->addMemberAccount($data['site_id'], $data['member_id'], 'balance_money', $data['money'], 'hongbao', 0, '裂变红包发放,可提现余额:' . $data['money'],$launch_id);
}
$user_model->addUserLog($data['uid'], $data['username'], $data['site_id'], "裂变红包：会员消费券调整id:" . $data['member_id'] . "金额" . $data['money']);
$user_model->addUserLog($data['uid'], $data['username'], $data['site_id'], "裂变红包：会员余额调整id:" . $data['member_id'] . "金额" . $data['money']);
$hongbao_group = model('promotion_hongbao_group')->getInfo(
[

2
addon/member/api/controller/Member.php
View File

@ -336,7 +336,7 @@ class Member extends BaseApi
//积分
$point = event('MemberAccountRule', ['account' => 'point', 'site_id' => $this->site_id]);
//消费券
//余额
$balance = event('MemberAccountRule', ['account' => 'balance', 'site_id' => $this->site_id]);
//成长值

6
addon/member/api/controller/Memberaccount.php
View File

@ -24,7 +24,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'));
$member_model = new MemberModel();
$info = $member_model->getMemberInfo([ [ 'member_id', '=', $token[ 'data' ][ 'member_id' ] ] ], $account_type);
@ -40,7 +40,7 @@ class Memberaccount extends BaseApi
if ($token[ 'code' ] < 0) return $this->response($token);
$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' ] : '';
@ -79,7 +79,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;

4
addon/member/model/Member.php
View File

@ -676,11 +676,11 @@ class Member extends BaseModel
$growth = $PHPExcel->getActiveSheet()->getCell('I' . $i)->getValue();
$growth = trim($growth, ' ');
//消费券(可提现)
//余额(可提现)
$balance_money = $PHPExcel->getActiveSheet()->getCell('J' . $i)->getValue();
$balance_money = trim($balance_money, ' ');
//消费券(不可提现)
//余额(不可提现)
$balance = $PHPExcel->getActiveSheet()->getCell('K' . $i)->getValue();
$balance = trim($balance, ' ');

10
addon/member/model/MemberAccount.php
View File

@ -24,9 +24,9 @@ class MemberAccount extends BaseModel
{
//账户类型
private $account_type = [
'balance' => '消费券（不可提现）',
'balance_money' => '消费券（可提现）',
'point' => '兑换券',
'balance' => '余额（不可提现）',
'balance_money' => '余额（可提现）',
'point' => '积分',
'growth' => '成长值',
'tea_fruit' => '茶果',
'tea_flower' => '茶花',
@ -83,7 +83,7 @@ class MemberAccount extends BaseModel
$from_type[ 'balance' ][ 'refund' ] = [ 'type_name' => '退还', 'type_url' => '' ];
$from_type[ 'balance_money' ][ 'refund' ] = [ 'type_name' => '退还', 'type_url' => '' ];
$from_type[ 'point' ][ 'refund' ] = [ 'type_name' => '退还', 'type_url' => '' ];
$from_type[ 'point' ][ 'pointexchangerefund' ] = [ 'type_name' => '兑换券兑换退还', 'type_url' => '' ];
$from_type[ 'point' ][ 'pointexchangerefund' ] = [ 'type_name' => '积分兑换退还', 'type_url' => '' ];
$from_type[ 'balance' ][ 'presale_deposit_refund' ] = [ 'type_name' => '预售定金退还', 'type_url' => '' ];
$from_type[ 'balance' ][ 'presale_refund' ] = [ 'type_name' => '预售订单退还', 'type_url' => '' ];
@ -142,7 +142,7 @@ class MemberAccount extends BaseModel
if ($account_type == 'balance') {
$msg = '账户余额不足';
} elseif ($account_type == 'point') {
$msg = '账户兑换券不足';
$msg = '账户积分不足';
} elseif ($account_type == 'growth') {
$msg = '账户成长值不足';
}

24
addon/member/shop/controller/Member.php
View File

@ -92,9 +92,9 @@ class Member extends BaseShop
$end_order_complete_num = input('end_order_complete_num', '');
$start_order_complete_money = input('start_order_complete_money', '');//消费金额
$end_order_complete_money = input('end_order_complete_money', '');
$start_point = input('start_point', '');//兑换券
$start_point = input('start_point', '');//积分
$end_point = input('end_point', '');
$start_balance = input('start_balance', '');//消费券
$start_balance = input('start_balance', '');//余额
$end_balance = input('end_balance', '');
$start_growth = input('start_growth', '');//成长值
$end_growth = input('end_growth', '');
@ -165,7 +165,7 @@ class Member extends BaseShop
} else if ($start_point == '' && $end_point != '') {
$condition[] = [ 'point', '<=', $end_point ];
}
//消费券
//余额
if ($start_balance != '' && $end_balance != '') {
$condition[] = [ '', 'exp', Db::raw("(balance + balance_money) between {$start_balance} and {$end_balance}") ];
} else if ($start_balance != '' && $end_balance == '') {
@ -219,7 +219,7 @@ class Member extends BaseShop
//积分
$point = event('MemberAccountRule', [ 'account' => 'point', 'site_id' => $this->site_id ]);
$this->assign('point', $point);
//消费券
//余额
$balance = event('MemberAccountRule', [ 'account' => 'balance', 'site_id' => $this->site_id ]);
$this->assign('balance', $balance);
//成长值
@ -480,7 +480,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);
}
@ -618,7 +618,7 @@ class Member extends BaseShop
$end_order_complete_money = input('end_order_complete_money', '');
$start_point = input('start_point', '');//积分
$end_point = input('end_point', '');
$start_balance = input('start_balance', '');//消费券
$start_balance = input('start_balance', '');//余额
$end_balance = input('end_balance', '');
$start_growth = input('start_growth', '');//成长值
$end_growth = input('end_growth', '');
@ -690,7 +690,7 @@ class Member extends BaseShop
} else if ($start_point == '' && $end_point != '') {
$condition[] = [ 'point', '<=', $end_point ];
}
//消费券
//余额
if ($start_balance != '' && $end_balance != '') {
$condition[] = [ 'balance', 'between', [ $start_balance, $end_balance ] ];
} else if ($start_balance != '' && $end_balance == '') {
@ -752,8 +752,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');
@ -934,10 +934,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', '会员等级(id)');
// 设置第一个sheet为工作的sheet
$phpExcel->setActiveSheetIndex(0);

4
addon/member/shop/controller/Membercluster.php
View File

@ -211,8 +211,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');

24
addon/member/shop/view/member/account_detail.html
View File

@ -67,7 +67,7 @@
<div class="custom-panel-from ns-form">
<div class="layui-form" lay-filter="pointForm">
<div class="layui-form-item">
<label class="layui-form-label">兑换券</label>
<label class="layui-form-label">积分</label>
<div>
<span class="ns-len-short ns-account-value" id="member_point">{$member_info.point}</span>
<button class="layui-btn layui-btn-primary layui-icon" onclick="savePoint(this)" data-num="{$member_info.point}">&#xe642;</button>
@ -77,7 +77,7 @@
<div class="layui-form">
<div class="layui-form-item">
<label class="layui-form-label">消费券（不可提现）</label>
<label class="layui-form-label">余额（不可提现）</label>
<div>
<span class="ns-len-short ns-account-value" id="member_balance">{$member_info.balance}</span>
@ -89,7 +89,7 @@
<div class="layui-form">
<div class="layui-form-item">
<label class="layui-form-label">消费券（可提现）</label>
<label class="layui-form-label">余额（可提现）</label>
<div>
<span class="ns-len-short ns-account-value" id="member_balance_money">{$member_info.balance_money}</span>
<button class="layui-btn layui-btn-primary layui-icon" onclick="saveBalanceMoney(this)" data-num="{$member_info.balance_money}">&#xe642;</button>
@ -328,7 +328,7 @@
return ;
}
if (point*1 + data.field.adjust_num*1 < 0) {
layer.msg('兑换券不可以为负数');
layer.msg('积分不可以为负数');
repeat_flag = false;
return ;
}
@ -394,7 +394,7 @@
return ;
}
if (balance*1 + data.field.adjust_num*1 < 0) {
layer.msg('消费券(可提现)不可以为负数');
layer.msg('余额(可提现)不可以为负数');
repeat_flag = false;
return ;
}
@ -458,7 +458,7 @@
};
laytpl($("#point").html()).render(data, function(html) {
layer.open({
title: '调整兑换券',
title: '调整积分',
skin: 'layer-tips-class',
type: 1,
area: ['800px'],
@ -473,7 +473,7 @@
var currIntegral = parseInt($(".integral-bounced .ns-account-value").text());
if (newIntegral + currIntegral < 0){
layer.msg("调整数额与当前值兑换券数相加不能小于0");
layer.msg("调整数额与当前值积分数相加不能小于0");
$(this).val(-currIntegral);
return false;
}
@ -488,7 +488,7 @@
};
laytpl($("#balance").html()).render(data, function(html) {
layer.open({
title: '调整消费券（不可提现）',
title: '调整余额（不可提现）',
skin: 'layer-tips-class',
type: 1,
area: ['800px'],
@ -504,7 +504,7 @@
};
laytpl($("#balance_money").html()).render(data, function(html) {
layer.open({
title: '调整消费券（可提现）',
title: '调整余额（可提现）',
skin: 'layer-tips-class',
type: 1,
area: ['800px'],
@ -534,7 +534,7 @@
<script type="text/html" id="point">
<div class="layui-form integral-bounced">
<div class="layui-form-item">
<label class="layui-form-label">当前兑换券：</label>
<label class="layui-form-label">当前积分：</label>
<div class="layui-input-block ns-account-value">{{ parseInt(d.point) }}</div>
</div>
@ -543,7 +543,7 @@
<div class="layui-input-block amount">
<input type="number" value="0" placeholder="请输入调整数额" name="adjust_num" lay-verify="num" class="layui-input ns-len-short">
</div>
<span class="ns-word-aux">调整数额与当前兑换券数相加不能小于0</span>
<span class="ns-word-aux">调整数额与当前积分数相加不能小于0</span>
</div>
<div class="layui-form-item">
@ -594,7 +594,7 @@
</div>
</script>
<!-- 消费券（可提现）弹框html -->
<!-- 余额（可提现）弹框html -->
<script type="text/html" id="balance_money">
<div class="layui-form">
<div class="layui-form-item">

4
addon/member/shop/view/member/blacklist.html
View File

@ -91,7 +91,7 @@ layui.use(['form', 'laytpl'], function() {
unresize: 'false'
}, {
field: 'point',
title: '兑换券',
title: '积分',
width: '8%',
unresize: 'false',
align: 'left',
@ -100,7 +100,7 @@ layui.use(['form', 'laytpl'], function() {
}
}, {
field: 'balance',
title: '消费券',
title: '余额',
width: '8%',
unresize: 'false',
align: 'left',

28
addon/member/shop/view/member/edit_member.html
View File

@ -113,7 +113,7 @@
<div class="custom-panel-from ns-form">
<div class="layui-form" lay-filter="pointForm">
<div class="layui-form-item">
<label class="layui-form-label">兑换券</label>
<label class="layui-form-label">积分</label>
<div>
<span class="ns-len-short ns-account-value" id="member_point">{$member_info.data.point}</span>
<button class="layui-btn layui-btn-primary layui-icon" onclick="savePoint(this)" data-num="{$member_info.data.point}">&#xe642;</button>
@ -123,7 +123,7 @@
<div class="layui-form">
<div class="layui-form-item">
<label class="layui-form-label">消费券（不可提现）</label>
<label class="layui-form-label">余额（不可提现）</label>
<div>
<span class="ns-len-short ns-account-value" id="member_balance">{$member_info.data.balance}</span>
@ -135,7 +135,7 @@
<div class="layui-form">
<div class="layui-form-item">
<label class="layui-form-label">消费券（可提现）</label>
<label class="layui-form-label">余额（可提现）</label>
<div>
<span class="ns-len-short ns-account-value" id="member_balance_money">{$member_info.data.balance_money}</span>
<button class="layui-btn layui-btn-primary layui-icon" onclick="saveBalanceMoney(this)" data-num="{$member_info.data.balance_money}">&#xe642;</button>
@ -464,7 +464,7 @@
return ;
}
if (point*1 + data.field.adjust_num*1 < 0) {
layer.msg('兑换券不可以为负数');
layer.msg('积分不可以为负数');
repeat_flag = false;
return ;
}
@ -530,7 +530,7 @@
return ;
}
if (balance*1 + data.field.adjust_num*1 < 0) {
layer.msg('消费券(可提现)不可以为负数');
layer.msg('余额(可提现)不可以为负数');
repeat_flag = false;
return ;
}
@ -600,7 +600,7 @@
};
laytpl($("#point").html()).render(data, function(html) {
layer.open({
title: '调整兑换券',
title: '调整积分',
skin: 'layer-tips-class',
type: 1,
area: ['800px'],
@ -615,7 +615,7 @@
var currIntegral = parseInt($(".integral-bounced .ns-account-value").text());
if (newIntegral + currIntegral < 0){
layer.msg("调整数额与当前值兑换券数相加不能小于0");
layer.msg("调整数额与当前值积分数相加不能小于0");
$(this).val(-currIntegral);
return false;
}
@ -630,7 +630,7 @@
};
laytpl($("#balance").html()).render(data, function(html) {
layer.open({
title: '调整消费券（不可提现）',
title: '调整余额（不可提现）',
skin: 'layer-tips-class',
type: 1,
area: ['800px'],
@ -646,7 +646,7 @@
};
laytpl($("#balance_money").html()).render(data, function(html) {
layer.open({
title: '调整消费券（可提现）',
title: '调整余额（可提现）',
skin: 'layer-tips-class',
type: 1,
area: ['800px'],
@ -928,11 +928,11 @@
});
}
</script>
<!-- 兑换券弹框html -->
<!-- 积分弹框html -->
<script type="text/html" id="point">
<div class="layui-form integral-bounced">
<div class="layui-form-item">
<label class="layui-form-label">当前兑换券：</label>
<label class="layui-form-label">当前积分：</label>
<div class="layui-input-block ns-account-value">{{ parseInt(d.point) }}</div>
</div>
@ -941,7 +941,7 @@
<div class="layui-input-block amount">
<input type="number" value="0" placeholder="请输入调整数额" name="adjust_num" lay-verify="num" class="layui-input ns-len-short">
</div>
<span class="ns-word-aux">调整数额与当前兑换券数相加不能小于0</span>
<span class="ns-word-aux">调整数额与当前积分数相加不能小于0</span>
</div>
<div class="layui-form-item">
@ -992,7 +992,7 @@
</div>
</script>
<!-- 消费券（可提现）弹框html -->
<!-- 余额（可提现）弹框html -->
<script type="text/html" id="balance_money">
<div class="layui-form">
<div class="layui-form-item">
@ -1076,7 +1076,7 @@
<tr {if $vo.level_type eq 1}style="background: #f2f2f2"{/if}>
<td><input type="checkbox" name="" lay-skin="primary" lay-filter="memberlevel" {if $vo.level_id eq $member_info.data.member_level}checked{/if} {if $vo.level_type eq 1}disabled{/if} value="{$vo.level_id}"></td>
<td>{$vo.level_name}</td>
<td>{if $vo.is_free_shipping eq 1}商品包邮；{/if}{if $vo.consume_discount neq 100}购物享{$vo.consume_discount / 10}折优惠；{/if}{if $vo.point_feedback > 0}购物{$vo.point_feedback}倍兑换券回馈{/if}</td>
<td>{if $vo.is_free_shipping eq 1}商品包邮；{/if}{if $vo.consume_discount neq 100}购物享{$vo.consume_discount / 10}折优惠；{/if}{if $vo.point_feedback > 0}购物{$vo.point_feedback}倍积分回馈{/if}</td>
</tr>
{/foreach}
</tbody>

40
addon/member/shop/view/member/member_list.html
View File

@ -99,7 +99,7 @@
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">兑换券</label>
<label class="layui-form-label">积分</label>
<div class="layui-input-inline">
<input type="text" class="layui-input" name="start_point" id="start_point" autocomplete="off">
</div>
@ -109,7 +109,7 @@
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">消费券</label>
<label class="layui-form-label">余额</label>
<div class="layui-input-inline">
<input type="text" class="layui-input" name="start_balance" id="start_balance" autocomplete="off">
</div>
@ -263,18 +263,18 @@
<a class="operation" lay-event="set_label">设置标签</a>
<a class="operation" lay-event="reset_pass">重置密码</a>
<a class="operation" lay-event="recive_coupon">发放优惠券</a>
<a class="operation" lay-event="adjust_balance">调整消费券</a>
<a class="operation" lay-event="adjust_integral">调整兑换券</a>
<a class="operation" lay-event="adjust_balance">调整余额</a>
<a class="operation" lay-event="adjust_integral">调整积分</a>
<a class="operation" lay-event="blacklist">黑名单</a>
</div>
</div>
</script>
<!-- 兑换券弹框html -->
<!-- 积分弹框html -->
<script type="text/html" id="point">
<div class="layui-form integral-bounced">
<div class="layui-form-item">
<label class="layui-form-label">当前兑换券：</label>
<label class="layui-form-label">当前积分：</label>
<div class="layui-input-block ns-account-value">{{ parseInt(d.point) }}</div>
</div>
@ -283,7 +283,7 @@
<div class="layui-input-block amount">
<input type="number" value="0" placeholder="请输入调整数额" name="adjust_num" lay-verify="num" class="layui-input ns-len-short">
</div>
<span class="ns-word-aux">调整数额与当前兑换券数相加不能小于0</span>
<span class="ns-word-aux">调整数额与当前积分数相加不能小于0</span>
</div>
<div class="layui-form-item">
@ -427,7 +427,7 @@
});
}
//兑换券
//积分
/* $("body").on("mousemove",".ns-point",function() {
$("body").find(".ns-point-box").show().stop(false, true);
});
@ -435,7 +435,7 @@
$("body").find(".ns-point-box").hide().stop(false, true);
}); */
//消费券
//余额
/* $("body").on("mousemove",".ns-balance",function() {
$("body").find(".ns-balance-box").show().stop(false, true);
});
@ -486,7 +486,7 @@
field: 'point',
title: '{if !empty($point)}' +
'<div class="ns-prompt-block">' +
'兑换券' +
'积分' +
'<div class="ns-prompt">' +
'<i class="iconfont iconwenhao1 required ns-point"></i>'+
'<div class="ns-point-box ns-reason-box ns-prompt-box" >' +
@ -499,7 +499,7 @@
'</div>' +
'</div>' +
'{else /} ' +
'兑换券' +
'积分' +
'{/if}',
width: '8%',
unresize: 'false',
@ -511,7 +511,7 @@
field: 'balance',
title: '{if !empty($balance)}'+
'<div class="ns-prompt-block balance">'+
'消费券'+
'余额'+
'<div class="ns-prompt">' +
'<i class="iconfont iconwenhao1 required ns-balance"></i>' +
'<div class="ns-balance-box ns-reason-box ns-prompt-box">' +
@ -524,7 +524,7 @@
'</div>' +
'</div>' +
'{else /} ' +
'消费券' +
'余额' +
'{/if}',
width: '8%',
unresize: 'false',
@ -593,10 +593,10 @@
case 'reset_pass': //重置密码
resetPassword(data);
break;
case 'adjust_balance': //调整消费券
case 'adjust_balance': //调整余额
adjustBalance(data);
break;
case 'adjust_integral': //调整兑换券
case 'adjust_integral': //调整积分
adjustIntegral(data);
break;
case 'set_label': //设置标签
@ -698,11 +698,11 @@
});
});
}
// 调整消费券
// 调整余额
function adjustBalance(e){
laytpl($("#balance").html()).render(e, function(html) {
layer.open({
title: '调整消费券（不可提现）',
title: '调整余额（不可提现）',
skin: 'layer-tips-class',
type: 1,
area: ['800px'],
@ -711,11 +711,11 @@
});
}
//调整兑换券
//调整积分
function adjustIntegral(e){
laytpl($("#point").html()).render(e, function(html) {
layer.open({
title: '调整兑换券',
title: '调整积分',
skin: 'layer-tips-class',
type: 1,
area: ['800px'],
@ -734,7 +734,7 @@
return ;
}
if (point*1 + data.field.adjust_num*1 < 0) {
layer.msg('兑换券不可以为负数');
layer.msg('积分不可以为负数');
repeat_flag_point = false;
return ;
}

8
addon/member/shop/view/membercluster/cluster_list.html
View File

@ -60,7 +60,7 @@
<a class="layui-btn" lay-event="more">批量处理</a>
<div class="more-operation">
<a class="operation" lay-event="recive_coupon">发放优惠券</a>
<a class="operation" lay-event="adjust_balance">调整消费券</a>
<a class="operation" lay-event="adjust_balance">调整余额</a>
<a class="operation" lay-event="adjust_integral">调整积分</a>
<a class="operation" lay-event="export_cluster_member">导出</a>
</div>
@ -211,7 +211,7 @@
case 'delete': //删除
delCluster(data.cluster_id);
break;
case 'adjust_balance': //调整消费券
case 'adjust_balance': //调整余额
adjustBalance(data);
break;
case 'adjust_integral': //调整积分
@ -268,11 +268,11 @@
});
}
// 调整消费券
// 调整余额
function adjustBalance(e){
laytpl($("#balance").html()).render(e, function(html) {
layer.open({
title: '调整消费券（不可提现）',
title: '调整余额（不可提现）',
skin: 'layer-tips-class',
type: 1,
area: ['800px'],

2
addon/memberrecommend/shop/view/recommend/add.html
View File

@ -112,7 +112,7 @@
<input name="balance" value="0" type="number" lay-verify="" class="layui-input len-short">
</div>
</div>
<div class="word-aux"><p>红包为储值消费券，仅在消费时可用</p></div>
<div class="word-aux"><p>红包为储值余额，仅在消费时可用</p></div>
</div>
<div class="coupon-wrap layui-hide">

2
addon/memberrecommend/shop/view/recommend/edit.html
View File

@ -113,7 +113,7 @@
<input name="balance" value="{$recommend_info.balance}" type="number" lay-verify="{if in_array('balance', $recommend_info['type']) }required|float{/if}" class="layui-input len-short">
</div>
</div>
<div class="word-aux"><p>红包为储值消费券，仅在消费时可用</p></div>
<div class="word-aux"><p>红包为储值余额，仅在消费时可用</p></div>
</div>
<div class="coupon-wrap {if !in_array('coupon', $recommend_info['type']) }layui-hide{/if}">

2
addon/pc/source/cs_default/assets/js/chunk-1969ff2c.3182ca2c.js
View File

File diff suppressed because one or more lines are too long

2
addon/pc/source/cs_default/assets/js/chunk-1969ff2c.3182ca2c.js.map
View File

File diff suppressed because one or more lines are too long

2
addon/pc/source/cs_default/assets/js/chunk-1969ff2c.52ea0a56.js
View File

File diff suppressed because one or more lines are too long

2
addon/pc/source/cs_default/assets/js/chunk-1969ff2c.52ea0a56.js.map
View File

File diff suppressed because one or more lines are too long

2
addon/pc/source/cs_default/assets/js/chunk-66c08c81.1981a058.js
View File

File diff suppressed because one or more lines are too long

2
addon/pc/source/cs_default/assets/js/chunk-66c08c81.1981a058.js.map
View File

File diff suppressed because one or more lines are too long

2
addon/pc/source/cs_default/assets/js/chunk-731ab782.417f2d9e.js
View File

File diff suppressed because one or more lines are too long

2
addon/pc/source/cs_default/assets/js/chunk-731ab782.417f2d9e.js.map
View File

File diff suppressed because one or more lines are too long

2
addon/pc/source/cs_indep/assets/js/chunk-66c08c81.1981a058.js
View File

File diff suppressed because one or more lines are too long

2
addon/pc/source/cs_indep/assets/js/chunk-66c08c81.1981a058.js.map
View File

File diff suppressed because one or more lines are too long

2
addon/pc/source/cs_indep/assets/js/chunk-731ab782.417f2d9e.js
View File

File diff suppressed because one or more lines are too long

2
addon/pc/source/cs_indep/assets/js/chunk-731ab782.417f2d9e.js.map
View File

File diff suppressed because one or more lines are too long

2
addon/pc/source/cs_separate/assets/js/chunk-1969ff2c.3182ca2c.js
View File

File diff suppressed because one or more lines are too long

2
addon/pc/source/cs_separate/assets/js/chunk-1969ff2c.3182ca2c.js.map
View File

File diff suppressed because one or more lines are too long

2
addon/pc/source/cs_separate/assets/js/chunk-1969ff2c.52ea0a56.js
View File

File diff suppressed because one or more lines are too long

2
addon/pc/source/cs_separate/assets/js/chunk-1969ff2c.52ea0a56.js.map
View File

File diff suppressed because one or more lines are too long

4
addon/pc/source/os/src/views/auth/register.vue
View File

@ -100,12 +100,12 @@
<div>
<div class="reward-content">
<div class="reward-item" v-if="reward && reward.point > 0">
<div class="head">兑换券奖励</div>
<div class="head">积分奖励</div>
<div class="content">
<div class="info">
<div>
<span class="num">{{ reward.point }}</span>
<span class="type">兑换券</span>
<span class="type">积分</span>
</div>
<div class="desc">用于下单时抵现或兑换商品等</div>
</div>

2
addon/pc/source/os/src/views/member/index.vue
View File

@ -49,7 +49,7 @@
<div class="item">
<router-link to="/member/account" class="item-content">
<img src="@/assets/images/balance.png" alt />
<div class="name">消费券</div>
<div class="name">余额</div>
<div class="num" v-if="member.balance || member.balance_money">
{{ (parseFloat(member.balance) + parseFloat(member.balance_money)).toFixed(2) }}
</div>

4
addon/pinfan/model/PinfanGroup.php
View File

@ -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) {

6
addon/pointexchange/shop/view/exchange/add.html
View File

@ -286,7 +286,7 @@
{block name="script"}
<script type="text/html" id="toolbarOperation">
<button class="layui-btn layui-btn-primary" lay-event="change-number">兑换次数</button>
<button class="layui-btn layui-btn-primary" lay-event="goods-integral">所需兑换券</button>
<button class="layui-btn layui-btn-primary" lay-event="goods-integral">所需积分</button>
<button class="layui-btn layui-btn-primary" lay-event="goods-price">所需金额</button>
</script>
@ -911,7 +911,7 @@
width: '14%',
templet: '#exchangeLimit'
}, {
title: '<span title="兑换所需兑换券">所需兑换券</span>',
title: '<span title="兑换所需积分">所需积分</span>',
unresize: 'false',
width: '12%',
templet: '#exchangePoint'
@ -959,7 +959,7 @@
name: '兑换次数',
value: 'limit_num'
},{
name: '所需兑换券',
name: '所需积分',
value: 'point'
},{
name: '所需金额',

6
addon/pointexchange/shop/view/exchange/edit.html
View File

@ -342,7 +342,7 @@
{block name="script"}
<script type="text/html" id="toolbarOperation">
<button class="layui-btn layui-btn-primary" lay-event="change-number">兑换次数</button>
<button class="layui-btn layui-btn-primary" lay-event="goods-integral">所需兑换券</button>
<button class="layui-btn layui-btn-primary" lay-event="goods-integral">所需积分</button>
<button class="layui-btn layui-btn-primary" lay-event="goods-price">所需金额</button>
</script>
@ -712,7 +712,7 @@
width: '14%',
templet: '#exchangeLimit'
}, {
title: '<span title="兑换所需兑换券">所需兑换券</span>',
title: '<span title="兑换所需积分">所需积分</span>',
unresize: 'false',
width: '12%',
templet: '#exchangePoint'
@ -755,7 +755,7 @@
name: '兑换次数',
value: 'limit_num'
},{
name: '所需兑换券',
name: '所需积分',
value: 'point'
},{
name: '所需金额',

4
addon/scenefestival/shop/view/record/lists.html
View File

@ -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 '--';

4
addon/store/model/StoreOrderCreate.php
View File

@ -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' ];
//优先扣除储值余额

24
addon/store/model/cashier/CashierOrderOffset.php
View File

@ -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'://优惠券

10
addon/store/model/cashier/CashierOrderPay.php
View File

@ -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);

44
addon/store/model/cashier/CashierOrderRefund.php
View File

@ -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;

10
addon/store/store/view/cash/cash.html
View File

@ -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 @@
<div class="member-num">
<div class="member-num-box">
<div class="member-info-box">
<p class="member-num-title text-color-gray">消费券（元）</p>
<p class="member-num-title text-color-gray">余额（元）</p>
<p class="member-num-price member-banlance">{{d.balance_sum}}</p>
<p class="member-num-desc"></p>
<p class="text-color-light-gray">结算时可用消费券抵付</p>
<p class="text-color-light-gray">结算时可用余额抵付</p>
</div>
<div class="member-info-box">
@ -1235,9 +1235,9 @@
<div class="banlance cash-store">
<div class="layui-form-item">
<input type="checkbox" name="is_balance" lay-skin="primary" value="1" lay-filter="is_balance" title="是否使用消费券">
<input type="checkbox" name="is_balance" lay-skin="primary" value="1" lay-filter="is_balance" title="是否使用余额">
</div>
<div class="layui-form-item">消费券：￥{{d.member_account.balance_money}}</div>
<div class="layui-form-item">余额：￥{{d.member_account.balance_money}}</div>
</div>
</div>

2
addon/store/store/view/order/detail.html
View File

@ -401,7 +401,7 @@
<div>店铺优惠券：￥{$order_detail["coupon_money"]}</div>
<div>店铺优惠：￥{$order_detail["promotion_money"]}</div>
{if $order_detail["balance_money"] > 0}
<div>消费券：￥{$order_detail["balance_money"]}</div>
<div>余额：￥{$order_detail["balance_money"]}</div>
{/if}
<div>订单调价：￥{$order_detail["adjust_money"]}</div>
<div>配送费用：￥{$order_detail["delivery_money"]}</div>

8
addon/topic/model/TopicOrderCreate.php
View File

@ -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;
}

8
app/api/controller/Member.php
View File

@ -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' ]; //支付金额
//优先扣除储值余额

6
app/api/controller/Memberaccount.php
View File

@ -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;

8
app/component/view/member_info/design.html
View File

@ -37,12 +37,12 @@
<div class="account-info" v-show="nc.style == 1 || nc.style == 3" :style="{'margin-left': nc.infoMargin + 'px', 'margin-right': nc.infoMargin + 'px' }">
<div class="account-item">
<div class="value">200</div>
<div class="title">消费券</div>
<div class="title">余额</div>
</div>
<div class="solid"></div>
<div class="account-item">
<div class="value">80</div>
<div class="title">兑换券</div>
<div class="title">积分</div>
</div>
<div class="solid"></div>
<div class="account-item">
@ -76,12 +76,12 @@
<div class="account-info" v-show="nc.style == 2" :style="{'margin-left': nc.infoMargin + 'px', 'margin-right': nc.infoMargin + 'px' }">
<div class="account-item">
<div class="value">200</div>
<div class="title">消费券</div>
<div class="title">余额</div>
</div>
<div class="solid"></div>
<div class="account-item">
<div class="value">80</div>
<div class="title">兑换券</div>
<div class="title">积分</div>
</div>
<div class="solid"></div>
<div class="account-item">

12
app/install/source/database.sql
View File

@ -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 '是否是会员',

2
app/model/games/Games.php
View File

@ -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);

8
app/model/member/MemberAccount.php
View File

@ -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' => '' ];

4
app/model/member/Withdraw.php
View File

@ -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) {

4
app/model/order/OrderRefund.php
View File

@ -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) {

14
app/shop/controller/Member.php
View File

@ -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);

4
app/shop/controller/Membercluster.php
View File

@ -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');

6
app/shop/view/account/balance.html
View File

@ -31,8 +31,8 @@
<p class="title">总余额</p>
<p class="money">{$total_balance + $total_balance_money}</p>
<p class="bottom-title">
<span>现金消费券：{$total_balance_money}</span>
<span>储值消费券：{$total_balance}</span>
<span>现金余额：{$total_balance_money}</span>
<span>储值余额：{$total_balance}</span>
</p>
</div>
<div class="content">
@ -171,7 +171,7 @@
width: '10%',
unresize: 'false',
templet: function (data) {
return data.account_type == 'balance' ? '储值消费券' : '现金消费券';
return data.account_type == 'balance' ? '储值余额' : '现金余额';
}
}, {
field: 'type_name',

8
app/shop/view/diy/member_info_component.html
View File

@ -17,12 +17,12 @@
<div class="account-info" v-show="value.member_info.style == 1" :style="{'margin-left': value.member_info.margin, 'margin-right': value.member_info.margin }">
<div class="account-item">
<div class="value">200</div>
<div class="title">消费券</div>
<div class="title">余额</div>
</div>
<div class="solid"></div>
<div class="account-item">
<div class="value">80</div>
<div class="title">兑换券</div>
<div class="title">积分</div>
</div>
<div class="solid"></div>
<div class="account-item">
@ -47,12 +47,12 @@
>
<div class="account-item">
<div class="value">200</div>
<div class="title">消费券</div>
<div class="title">余额</div>
</div>
<div class="solid"></div>
<div class="account-item">
<div class="value">80</div>
<div class="title">兑换券</div>
<div class="title">积分</div>
</div>
<div class="solid"></div>
<div class="account-item">

2
app/shop/view/localorder/detail.html
View File

@ -283,7 +283,7 @@
{/if}
{if $order_detail["balance_money"] > 0}
<div>
<p>消费券：<span>￥{$order_detail["balance_money"]}</span></p>
<p>余额：<span>￥{$order_detail["balance_money"]}</span></p>
</div>
{/if}
<div>

22
app/shop/view/member/account_detail.html
View File

@ -61,8 +61,8 @@
<div class="layui-input-inline">
<select name="account_type" lay-filter="account_type">
<option value="balance,balance_money">请选择</option>
<option value="balance">储值消费券</option>
<option value="balance_money">现金消费券</option>
<option value="balance">储值余额</option>
<option value="balance_money">现金余额</option>
</select>
</div>
</div>
@ -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 @@
<script type="text/html" id="balance">
<div class="layui-form">
<div class="layui-form-item">
<label class="layui-form-label">当前储值消费券：</label>
<label class="layui-form-label">当前储值余额：</label>
<div class="layui-input-block account-value">{{ d.balance }}</div>
</div>
@ -525,7 +525,7 @@
<div class="layui-input-block">
<input type="number" value="0" placeholder="请输入调整数额" name="adjust_num" lay-verify="num" class="layui-input len-short">
</div>
<span class="word-aux">调整数额与当前储值消费券相加不能小于0</span>
<span class="word-aux">调整数额与当前储值余额相加不能小于0</span>
</div>
<div class="layui-form-item">
@ -544,11 +544,11 @@
</div>
</script>
<!-- 现金消费券弹框html -->
<!-- 现金余额弹框html -->
<script type="text/html" id="balance_money">
<div class="layui-form">
<div class="layui-form-item">
<label class="layui-form-label">当前现金消费券：</label>
<label class="layui-form-label">当前现金余额：</label>
<div class="layui-input-block account-value">{{ d.balance_money }}</div>
</div>
@ -557,7 +557,7 @@
<div class="layui-input-block">
<input type="number" value="0" placeholder="请输入调整数额" name="adjust_num" lay-verify="num" class="layui-input len-short">
</div>
<span class="word-aux">调整数额与当前现金消费券相加不能小于0</span>
<span class="word-aux">调整数额与当前现金余额相加不能小于0</span>
</div>
<div class="layui-form-item">

4
app/shop/view/member/blacklist.html
View File

@ -90,7 +90,7 @@ layui.use(['form', 'laytpl'], function() {
unresize: 'false'
}, {
field: 'point',
title: '兑换券',
title: '积分',
width: '15%',
unresize: 'false',
align: 'left',
@ -99,7 +99,7 @@ layui.use(['form', 'laytpl'], function() {
}
}, {
field: 'balance',
title: '消费券',
title: '余额',
width: '15%',
unresize: 'false',
align: 'left',

32
app/shop/view/member/edit_member.html
View File

@ -118,16 +118,16 @@
<div class="member-info">
<div class="info">
<div class="data-item">
<span>储值消费券：</span>
<span>储值余额：</span>
<span id="member_balance">{:moneyFormat($member_info.data.balance)}</span>
<i class="layui-icon text-color" style="margin-left: 5px;" data-num="{$member_info.data.balance}" onclick="saveBalance(this)"></i>
</div>
<div class="data-item">
<span>现金消费券：</span>
<span>现金余额：</span>
<span>{:moneyFormat($member_info.data.balance_money)}</span>
</div>
<div class="data-item">
<span>兑换券：</span>
<span>积分：</span>
<span id="member_point">{:round($member_info.data.point)}</span>
<i class="layui-icon text-color" style="margin-left: 5px;" data-num="{$member_info.data.point}" onclick="savePoint(this)"></i>
</div>
@ -150,8 +150,8 @@
</div>
<div class="layui-card-body layui-tab layui-tab-brief" lay-filter="edit_user_tab">
<ul class="layui-tab-title">
<li class="layui-this" lay-id="basic_info">消费券</li>
<li lay-id="basic_info">兑换券</li>
<li class="layui-this" lay-id="basic_info">余额</li>
<li lay-id="basic_info">积分</li>
<li lay-id="basic_info">成长值</li>
<li lay-id="basic_info">订单管理</li>
<li lay-id="basic_info">收货地址</li>
@ -405,7 +405,7 @@
return ;
}
if (point*1 + data.field.adjust_num*1 < 0) {
layer.msg('兑换券不可以为负数');
layer.msg('积分不可以为负数');
repeat_flag = false;
return ;
}
@ -439,7 +439,7 @@
}
if (balance*1 + data.field.adjust_num*1 < 0) {
layer.msg('当前储值消费券不可以为负数');
layer.msg('当前储值余额不可以为负数');
repeat_flag = false;
return ;
}
@ -512,7 +512,7 @@
};
laytpl($("#point").html()).render(data, function(html) {
layer.open({
title: '调整兑换券',
title: '调整积分',
skin: 'layer-tips-class',
type: 1,
area: ['800px'],
@ -530,7 +530,7 @@
var currIntegral = parseInt($(".integral-bounced .account-value").text());
if (newIntegral + currIntegral < 0){
layer.msg("调整数额与当前值兑换券数相加不能小于0");
layer.msg("调整数额与当前值积分数相加不能小于0");
$(this).val(-currIntegral);
return false;
}
@ -545,7 +545,7 @@
};
laytpl($("#balance").html()).render(data, function(html) {
layer.open({
title: '调整储值消费券',
title: '调整储值余额',
skin: 'layer-tips-class',
type: 1,
area: ['800px'],
@ -971,11 +971,11 @@
})
}
</script>
<!-- 兑换券弹框html -->
<!-- 积分弹框html -->
<script type="text/html" id="point">
<div class="layui-form integral-bounced">
<div class="layui-form-item">
<label class="layui-form-label">当前兑换券：</label>
<label class="layui-form-label">当前积分：</label>
<div class="layui-input-block account-value">{{ parseInt(d.point) }}</div>
</div>
@ -984,7 +984,7 @@
<div class="layui-input-block amount">
<input type="number" value="0" placeholder="请输入调整数额" name="adjust_num" lay-verify="num" class="layui-input len-short">
</div>
<span class="word-aux">调整数额与当前兑换券数相加不能小于0</span>
<span class="word-aux">调整数额与当前积分数相加不能小于0</span>
</div>
<div class="layui-form-item">
@ -1007,7 +1007,7 @@
<script type="text/html" id="balance">
<div class="layui-form">
<div class="layui-form-item">
<label class="layui-form-label">当前储值消费券：</label>
<label class="layui-form-label">当前储值余额：</label>
<div class="layui-input-block account-value">{{ d.balance }}</div>
</div>
@ -1016,7 +1016,7 @@
<div class="layui-input-block">
<input type="number" value="0" placeholder="请输入调整数额" name="adjust_num" lay-verify="num" class="layui-input len-short">
</div>
<span class="word-aux">调整数额与当前储值消费券相加不能小于0</span>
<span class="word-aux">调整数额与当前储值余额相加不能小于0</span>
</div>
<div class="layui-form-item">
@ -1087,7 +1087,7 @@
<tr {if $vo.level_type eq 1}style="background: #f2f2f2"{/if}>
<td><input type="checkbox" name="" lay-skin="primary" lay-filter="memberlevel" {if $vo.level_id eq $member_info.data.member_level}checked{/if} {if $vo.level_type eq 1}disabled{/if} value="{$vo.level_id}"></td>
<td>{$vo.level_name}</td>
<td>{if $vo.is_free_shipping eq 1}商品包邮；{/if}{if $vo.consume_discount neq 100}购物享{$vo.consume_discount / 10}折优惠；{/if}{if $vo.point_feedback > 0}购物{$vo.point_feedback}倍兑换券回馈{/if}</td>
<td>{if $vo.is_free_shipping eq 1}商品包邮；{/if}{if $vo.consume_discount neq 100}购物享{$vo.consume_discount / 10}折优惠；{/if}{if $vo.point_feedback > 0}购物{$vo.point_feedback}倍积分回馈{/if}</td>
</tr>
{/foreach}
</tbody>

50
app/shop/view/member/member_list.html
View File

@ -165,7 +165,7 @@
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">兑换券</label>
<label class="layui-form-label">积分</label>
<div class="layui-input-inline input-append">
<input type="text" class="layui-input" name="start_point" id="start_point" autocomplete="off">
</div>
@ -177,7 +177,7 @@
<div class="layui-form-mid">分</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">消费券</label>
<label class="layui-form-label">余额</label>
<div class="layui-input-inline input-append">
<input type="text" class="layui-input len-short" name="start_balance" id="start_balance" autocomplete="off">
</div>
@ -326,18 +326,18 @@
<a class="operation" lay-event="set_label">设置标签</a>
<a class="operation" lay-event="reset_pass">重置密码</a>
<a class="operation" lay-event="recive_coupon">发放优惠券</a>
<a class="operation" lay-event="adjust_balance">调整消费券</a>
<a class="operation" lay-event="adjust_integral">调整兑换券</a>
<a class="operation" lay-event="adjust_balance">调整余额</a>
<a class="operation" lay-event="adjust_integral">调整积分</a>
<a class="operation" lay-event="blacklist">黑名单</a>
</div>
</div>
</script>
<!-- 兑换券弹框html -->
<!-- 积分弹框html -->
<script type="text/html" id="point">
<div class="layui-form integral-bounced">
<div class="layui-form-item">
<label class="layui-form-label">当前兑换券：</label>
<label class="layui-form-label">当前积分：</label>
<div class="layui-input-block account-value">{{ parseInt(d.point) }}</div>
</div>
@ -346,7 +346,7 @@
<div class="layui-input-block amount">
<input type="number" value="0" placeholder="请输入调整数额" name="adjust_num" lay-verify="num" class="layui-input len-short">
</div>
<span class="word-aux">调整数额与当前兑换券数相加不能小于0</span>
<span class="word-aux">调整数额与当前积分数相加不能小于0</span>
</div>
<div class="layui-form-item">
@ -369,7 +369,7 @@
<script type="text/html" id="balance">
<div class="layui-form">
<div class="layui-form-item">
<label class="layui-form-label">当前储值消费券：</label>
<label class="layui-form-label">当前储值余额：</label>
<div class="layui-input-block account-value">{{ d.balance }}</div>
</div>
@ -378,7 +378,7 @@
<div class="layui-input-block">
<input type="number" value="0" placeholder="请输入调整数额" name="adjust_num" lay-verify="num" class="layui-input len-short">
</div>
<span class="word-aux">调整数额与当前储值消费券相加不能小于0</span>
<span class="word-aux">调整数额与当前储值余额相加不能小于0</span>
</div>
<div class="layui-form-item">
@ -415,9 +415,9 @@
</div>
<div class="member-account">
<div class="account-item">可用兑换券：{{d.point}}</div>
<div class="account-item">可用积分：{{d.point}}</div>
<div class="account-item">现金金额：{{d.balance_money}}</div>
<div class="account-item">储值消费券：{{d.balance}}</div>
<div class="account-item">储值余额：{{d.balance}}</div>
<div class="account-item">成长值：{{d.growth}}</div>
</div>
@ -550,7 +550,7 @@
});
}
//兑换券
//积分
/* $("body").on("mousemove",".point",function() {
$("body").find(".point-box").show().stop(false, true);
});
@ -558,7 +558,7 @@
$("body").find(".point-box").hide().stop(false, true);
}); */
//消费券
//余额
/* $("body").on("mousemove",".ns-balance",function() {
$("body").find(".ns-balance-box").show().stop(false, true);
});
@ -687,10 +687,10 @@
case 'reset_pass': //重置密码
resetPassword(data);
break;
case 'adjust_balance': //调整消费券
case 'adjust_balance': //调整余额
adjustBalance(data);
break;
case 'adjust_integral': //调整兑换券
case 'adjust_integral': //调整积分
adjustIntegral(data);
break;
case 'set_label': //设置标签
@ -832,11 +832,11 @@
});
});
}
// 调整消费券
// 调整余额
function adjustBalance(e){
laytpl($("#balance").html()).render(e, function(html) {
layer.open({
title: '调整储值消费券',
title: '调整储值余额',
skin: 'layer-tips-class',
type: 1,
area: ['800px'],
@ -845,11 +845,11 @@
});
}
//调整兑换券
//调整积分
function adjustIntegral(e){
laytpl($("#point").html()).render(e, function(html) {
layer.open({
title: '调整兑换券',
title: '调整积分',
skin: 'layer-tips-class',
type: 1,
area: ['800px'],
@ -868,7 +868,7 @@
return ;
}
if (point*1 + data.field.adjust_num*1 < 0) {
layer.msg('兑换券不可以为负数');
layer.msg('积分不可以为负数');
repeat_flag_point = false;
return ;
}
@ -901,7 +901,7 @@
return ;
}
if (balance*1 + data.field.adjust_num*1 < 0) {
layer.msg('当前储值消费券不可以为负数');
layer.msg('当前储值余额不可以为负数');
repeat_flag_balance = false;
return ;
}
@ -1202,7 +1202,7 @@
<script type="text/html" id="tableTitleBalance">
{if !empty($balance)}
<div class="prompt-block balance">
消费券
余额
<div class="prompt">
<i class="iconfont iconwenhao1 required growth"></i>
<div class="growth-box reason-box reason-growth prompt-box">
@ -1215,13 +1215,13 @@
</div>
</div>
{else /}
消费券
余额
{/if}
</script>
<script type="text/html" id="tableTitlePoint">
{if !empty($point)}
<div class="prompt-block">
兑换券
积分
<div class="prompt">
<i class="iconfont iconwenhao1 required growth"></i>
<div class="growth-box reason-box reason-growth prompt-box">
@ -1234,7 +1234,7 @@
</div>
</div>
{else /}
兑换券
积分
{/if}
</script>
<script type="text/html" id="tableTitleGrowth">

12
app/shop/view/membercluster/cluster_list.html
View File

@ -54,7 +54,7 @@
<a class="layui-btn" lay-event="more">批量处理</a>
<div class="more-operation">
<a class="operation" lay-event="recive_coupon">发放优惠券</a>
<a class="operation" lay-event="adjust_balance">调整消费券</a>
<a class="operation" lay-event="adjust_balance">调整余额</a>
<a class="operation" lay-event="adjust_integral">调整积分</a>
<a class="operation" lay-event="export_cluster_member">导出</a>
</div>
@ -97,7 +97,7 @@
<div class="layui-input-block">
<input type="number" value="0" placeholder="请输入调整数额" name="adjust_num" lay-verify="num" class="layui-input len-short">
</div>
<span class="word-aux">调整数额与当前储值消费券相加不能小于0</span>
<span class="word-aux">调整数额与当前储值余额相加不能小于0</span>
</div>
<div class="layui-form-item">
@ -205,7 +205,7 @@
case 'delete': //删除
delCluster(data.cluster_id);
break;
case 'adjust_balance': //调整消费券
case 'adjust_balance': //调整余额
adjustBalance(data);
break;
case 'adjust_integral': //调整积分
@ -262,11 +262,11 @@
});
}
// 调整消费券
// 调整余额
function adjustBalance(e){
laytpl($("#balance").html()).render(e, function(html) {
layer.open({
title: '调整储值消费券',
title: '调整储值余额',
skin: 'layer-tips-class',
type: 1,
area: ['800px'],
@ -330,7 +330,7 @@
return ;
}
if (data.field.adjust_num < 0) {
layer.msg('当前储值消费券不可以为负数');
layer.msg('当前储值余额不可以为负数');
repeat_flag_balance = false;
return ;
}

4
app/shop/view/memberlevel/level_list.html
View File

@ -102,7 +102,7 @@
var text = '<div class="level-equity">';
if (data.is_free_shipping == 1) text += '<div>购物享商品包邮</div>';
if (data.consume_discount != 100) text += '<div>购物享' + (data.consume_discount / 10) + '折优惠</div>';
if (data.point_feedback > 0) text += '<div>购物享' + data.point_feedback + '倍兑换券回馈</div>';
if (data.point_feedback > 0) text += '<div>购物享' + data.point_feedback + '倍积分回馈</div>';
text += '</div>'
return text;
}else{
@ -117,7 +117,7 @@
templet: function (data) {
if(parseInt(data.level_id) > 0) {
var text = '<div class="level-equity">';
if (data.send_balance > 0) text += '<div>获赠' + data.send_balance + '兑换券</div>';
if (data.send_balance > 0) text += '<div>获赠' + data.send_balance + '积分</div>';
if (data.send_balance > 0) text += '<div>获赠' + data.send_balance + '元红包</div>';
if (data.send_coupon != '') text += '<div>获赠' + data.send_coupon.split(',').length + '张优惠券</div>';
text += '</div>'

2
app/shop/view/memberwithdraw/config.html
View File

@ -9,7 +9,7 @@
<div class="layui-input-block">
<input type="checkbox" name="is_use" lay-filter="is_use" value="1" lay-skin="switch" {if !empty($config) && $config.is_use==1 } checked {/if} >
</div>
<div class="word-aux">会员可以将<span class="text-color">现金消费券账户</span>的金额申请提现</div>
<div class="word-aux">会员可以将<span class="text-color">现金余额账户</span>的金额申请提现</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">提现审核：</label>

2
app/shop/view/memberwithdraw/lists.html
View File

@ -22,7 +22,7 @@
<div class="layui-card-body">
<div class="content">
<p class="title">现金消费券（元）</p>
<p class="title">现金余额（元）</p>
<p class="money">{$member_balance_sum.balance_money}</p>
</div>
<div class="content">

2
app/shop/view/order/detail.html
View File

@ -392,7 +392,7 @@
{/if}
{if $order_detail["balance_money"] > 0}
<div>
<p>消费券：<span>￥{$order_detail["balance_money"]}</span></p>
<p>余额：<span>￥{$order_detail["balance_money"]}</span></p>
</div>
{/if}

2
app/shop/view/storeorder/detail.html
View File

@ -292,7 +292,7 @@
{/if}
{if $order_detail["balance_money"] > 0}
<div>
<p>消费券：<span>￥{$order_detail["balance_money"]}</span></p>
<p>余额：<span>￥{$order_detail["balance_money"]}</span></p>
</div>
{/if}
<div>

2
app/shop/view/virtualorder/detail.html
View File

@ -316,7 +316,7 @@
{/if}
{if $order_detail["balance_money"] > 0}
<div>
<p>消费券：<span>￥{$order_detail["balance_money"]}</span></p>
<p>余额：<span>￥{$order_detail["balance_money"]}</span></p>
</div>
{/if}
<div>

2
app/shopapi/controller/Member.php
View File

@ -214,7 +214,7 @@ class Member extends BaseApi
}
/**
* 调整消费券
* 调整余额
*/
public function modifyBalance()
{