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

【修复】发布失败 

【增加】用户现金、猕猴桃操作
This commit is contained in:
liqianjin 2023-04-21 18:31:48 +08:00
parent 0686a82e56
commit c3252e528a
5 changed files with 194 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addon/futures/model/Futures.php
View File

@ -108,10 +108,10 @@ class Futures extends BaseModel{
public function release($id, $price, $agree_split_order = 0){
$date = model('futures')->getInfo([['id', '=', $id]]);
if(empty($date) || $date['status'] !== 1){
return $this->error('','发布失败');
return $this->error('','发布失败-db');
}
if(!Cache::store('redis_concurrent')->delete('addon_futures_stock_'.$id)){
return $this->error('','发布失败');
return $this->error('','发布失败-chche'.'addon_futures_stock_'.$id);
}
$basics = $this->getBasicsConfig($date['site_id'])['data']['value'];
model('futures')->startTrans();
@ -150,6 +150,7 @@ class Futures extends BaseModel{
$service_price = $price * $basics['service_price'] / 100;
$technical_range=$service_price*$basics['technical_range']/100;
if(model('member')->getValue(['member_id'=>$date['seller_uid']],'balance_money')<$service_price){
Cache::store('redis_concurrent')->set('addon_futures_stock_'.$id,'1');
return error(-800, '您余额不足!');
}
model('futures')->update([

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

@ -284,6 +284,10 @@ class FuturesOrderCreate extends OrderCreate
}
}
if($data['futures_user_info'] == NULL){
return error(-1,'注册错误，请使用小程序注册');
}
// 判断用户是否有足够多的购买机会
if($data['futures_user_info']['business_num'] >= $basics['order_restrictions_num'] && $data['futures_user_info']['is_special'] == 0){
return error(-1,'下单次数达到限制，需提货恢复下单');

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

@ -66,6 +66,7 @@ class MemberAccount extends BaseModel
$from_type[ 'balance' ][ 'adjust' ] = [ 'type_name' => '调整', 'type_url' => '' ];
$from_type[ 'balance_money' ][ 'adjust' ] = [ 'type_name' => '调整', 'type_url' => '' ];
$from_type[ 'diamond' ][ 'adjust' ] = [ 'type_name' => '调整', 'type_url' => '' ];
$from_type[ 'balance' ][ 'order' ] = [ 'type_name' => '消费', 'type_url' => '' ];
$from_type[ 'balance_money' ][ 'order' ] = [ 'type_name' => '消费', 'type_url' => '' ];

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

@ -489,6 +489,30 @@ class Member extends BaseShop
$member_account_model = new MemberAccountModel();
return $member_account_model->addMemberAccount($this->site_id, $member_id, 'balance', $adjust_num, 'adjust', 0, $remark ? $remark : '商家调整');
}
/**
* 余额调整（不可提现）
*/
public function adjustBalanceMoney()
{
$member_id = input('member_id', 0);
$adjust_num = input('adjust_num', 0);
$remark = input('remark', '商家调整');
$this->addLog("会员余额调整id:" . $member_id . "金额" . $adjust_num);
$member_account_model = new MemberAccountModel();
return $member_account_model->addMemberAccount($this->site_id, $member_id, 'balance_money', $adjust_num, 'adjust', 0, $remark ? $remark : '商家调整');
}
/**
* 余额调整（不可提现）
*/
public function adjustDiamond()
{
$member_id = input('member_id', 0);
$adjust_num = input('adjust_num', 0);
$remark = input('remark', '商家调整');
$this->addLog("会员余额调整id:" . $member_id . "金额" . $adjust_num);
$member_account_model = new MemberAccountModel();
return $member_account_model->addMemberAccount($this->site_id, $member_id, 'diamond', $adjust_num, 'adjust', 0, $remark ? $remark : '商家调整');
}
/**
* 积分调整

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

@ -327,6 +327,8 @@
<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_balance_money">调整现金余额</a>
<a class="operation" lay-event="adjust_diamond">调整猕猴桃</a>
<a class="operation" lay-event="adjust_integral">调整积分</a>
<a class="operation" lay-event="blacklist">黑名单</a>
</div>
@ -397,6 +399,70 @@
</div>
</script>
<!-- 余额弹框html -->
<script type="text/html" id="balance_money">
<div class="layui-form">
<div class="layui-form-item">
<label class="layui-form-label">当前现金余额：</label>
<div class="layui-input-block account-value">{{ d.balance_money }}</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">调整数额：</label>
<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>
</div>
<div class="layui-form-item">
<label class="layui-form-label">备注：</label>
<div class="layui-input-block len-long">
<textarea class="layui-textarea" name="remark" placeholder="请输入备注" maxlength="150"></textarea>
</div>
</div>
<div class="form-row">
<button class="layui-btn" lay-submit lay-filter="saveBalanceMoney">确定</button>
</div>
<input type="hidden" name="member_id" value="{{d.member_id}}" />
<input type="hidden" name="balance_money" value="{{ d.balance_money }}" />
</div>
</script>
<!-- 余额弹框html -->
<script type="text/html" id="diamond">
<div class="layui-form">
<div class="layui-form-item">
<label class="layui-form-label">当前猕猴桃余额：</label>
<div class="layui-input-block account-value">{{ d.diamond }}</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">调整数额：</label>
<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>
</div>
<div class="layui-form-item">
<label class="layui-form-label">备注：</label>
<div class="layui-input-block len-long">
<textarea class="layui-textarea" name="remark" placeholder="请输入备注" maxlength="150"></textarea>
</div>
</div>
<div class="form-row">
<button class="layui-btn" lay-submit lay-filter="saveDiamond">确定</button>
</div>
<input type="hidden" name="member_id" value="{{d.member_id}}" />
<input type="hidden" name="diamond" value="{{ d.diamond }}" />
</div>
</script>
<!-- 办理会员 -->
<script type="text/html" id="set_member">
<div class="layer-member">
@ -690,6 +756,12 @@
case 'adjust_balance': //调整余额
adjustBalance(data);
break;
case 'adjust_balance_money': //调整余额
adjustBalanceMoney(data);
break;
case 'adjust_diamond': //调整余额
adjustDiamond(data);
break;
case 'adjust_integral': //调整积分
adjustIntegral(data);
break;
@ -844,6 +916,30 @@
});
});
}
// 调整余额
function adjustBalanceMoney(e){
laytpl($("#balance_money").html()).render(e, function(html) {
layer.open({
title: '调整现金余额',
skin: 'layer-tips-class',
type: 1,
area: ['800px'],
content: html
});
});
}
// 调整余额
function adjustDiamond(e){
laytpl($("#diamond").html()).render(e, function(html) {
layer.open({
title: '调整猕猴桃',
skin: 'layer-tips-class',
type: 1,
area: ['800px'],
content: html
});
});
}
//调整积分
function adjustIntegral(e){
@ -922,6 +1018,72 @@
});
});
var repeat_flag_balance = false;
form.on('submit(saveBalanceMoney)', function(data) {
if (repeat_flag_balance) return false;
repeat_flag_balance = true;
var balance = data.field.balance;
if (data.field.adjust_num == 0) {
layer.msg('调整数值不能为0');
repeat_flag_balance = false;
return ;
}
if (balance*1 + data.field.adjust_num*1 < 0) {
layer.msg('当前现金余额不可以为负数');
repeat_flag_balance = false;
return ;
}
$.ajax({
type: "POST",
url: ns.url("shop/member/adjustBalanceMoney"),
data: data.field,
dataType: 'JSON',
success: function(res) {
layer.msg(res.message);
repeat_flag_balance = false;
if (res.code == 0) {
layer.closeAll('page');
table.reload();
}
}
});
});
var repeat_flag_balance = false;
form.on('submit(saveDiamond)', function(data) {
if (repeat_flag_balance) return false;
repeat_flag_balance = true;
var balance = data.field.balance;
if (data.field.adjust_num == 0) {
layer.msg('调整数值不能为0');
repeat_flag_balance = false;
return ;
}
if (balance*1 + data.field.adjust_num*1 < 0) {
layer.msg('当前你猴桃余额不可以为负数');
repeat_flag_balance = false;
return ;
}
$.ajax({
type: "POST",
url: ns.url("shop/member/adjustDiamond"),
data: data.field,
dataType: 'JSON',
success: function(res) {
layer.msg(res.message);
repeat_flag_balance = false;
if (res.code == 0) {
layer.closeAll('page');
table.reload();
}
}
});
});
form.on('submit(repass)', function(data) {