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

添加：取消订单用户惩罚

This commit is contained in:
wuhui_zzw 2023-03-03 17:34:23 +08:00
parent 4d5e63bfa0
commit be11c30a78
6 changed files with 48 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,8 +49,8 @@ class Config extends BaseModel
'contribution_points_ratio' => $data['contribution_points_ratio'],
'settlement_points_to_balance_money_ratio' => $data['settlement_points_to_balance_money_ratio'],
'settlement_points_to_point_ratio' => $data['settlement_points_to_point_ratio'],
'violation_unpaid' => $data['violation_unpaid'],
'violation_hour' => $data['violation_hour'],
// 'violation_unpaid' => $data['violation_unpaid'],
// 'violation_hour' => $data['violation_hour'],
'upgrade_agree' => $data['upgrade_agree'],
];
$config->setConfig($basics_data, '分销基本配置', $is_use, [['site_id', '=', $site_id], ['app_module', '=', 'shop'], ['config_key', '=', 'FENXIAO_BASICS_CONFIG']]);

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

@ -61,8 +61,8 @@ class Config extends BaseShop
'contribution_points_ratio' => input('contribution_points_ratio', 0),
'settlement_points_to_balance_money_ratio' => input('settlement_points_to_balance_money_ratio', 0),
'settlement_points_to_point_ratio' => input('settlement_points_to_point_ratio', 0),
'violation_unpaid' => (int)input('violation_unpaid', 0),
'violation_hour' => (int)input('violation_hour', 0),
// 'violation_unpaid' => (int)input('violation_unpaid', 0),
// 'violation_hour' => (int)input('violation_hour', 0),
'upgrade_agree' => input('upgrade_agree', ''),
];
$res = $model->setFenxiaoBasicsConfig($data, 1, $this->site_id);

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

@ -101,33 +101,6 @@
</div>
</div>
</div>
<!-- 违规设置 -->
<div class="layui-card card-common card-brief">
<div class="layui-card-header">
<span class="card-title">违规设置</span>
</div>
<div class="layui-card-body">
<div class="layui-form-item">
<label class="layui-form-label">未支付次数：</label>
<div class="layui-input-block">
<div class="layui-input-inline">
<input type="number" name="violation_unpaid" class="layui-input ns-len-mid" value="{$basics_info.violation_unpaid ?? 0}" />
</div>
</div>
<div class="word-aux ">用户在秒杀专区购买商品后，多少次为支付则进行违规惩罚！</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">惩罚时间：</label>
<div class="layui-input-block">
<div class="layui-input-inline">
<input type="number" name="violation_hour" class="layui-input ns-len-mid" value="{$basics_info.violation_hour ?? 0}" />
</div>
<div class="layui-form-mid">小时</div>
</div>
<div class="word-aux ">惩罚时间内不能进入抢购专区</div>
</div>
</div>
</div>
<!-- 每日转换设置 -->
<div class="layui-card card-common card-brief">
<div class="layui-card-header">

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

@ -269,8 +269,20 @@ class Futures extends BaseModel{
'violation_num' => Db::raw('violation_num+1'),
'total_violation_num' => Db::raw('total_violation_num+1'),
]);
// 判断：如果当前次数已经到达限制 进行惩罚操作
$futuresUserInfo = Db::name('futures_user')
->field('violation_num,site_id,punish_time')
->where('member_id',$date['member_id'])
->find();
$basics = (new Futures())->getBasicsConfig($futuresUserInfo['site_id'])[ 'data' ][ 'value' ];
$violationHour = $basics['violation_hour'] ?? 0;
$violationUnpaid = $basics['violation_unpaid'] ?? 0;
if($violationUnpaid > 0 && $futuresUserInfo['violation_num'] >= $violationUnpaid){
$startTime = $futuresUserInfo['punish_time'] > time() ? $futuresUserInfo['punish_time'] : time();
Db::name('futures_user')
->where('member_id',$date['member_id'])
->update(['punish_time' => strtotime("+{$violationHour} hours", $startTime)]);
}
return $this->success();
}

28
addon/futures/shop/view/config/basics.html
View File

@ -121,7 +121,33 @@
<div class="layui-form-mid layui-word-aux">%</div>
</div>
</div>
<!-- TODO 特殊账号回购设置-->
</div>
<!-- 违规设置 -->
<div class="layui-card card-common card-brief">
<div class="layui-card-header">
<span class="card-title">违规设置</span>
</div>
<div class="layui-card-body">
<div class="layui-form-item">
<label class="layui-form-label">未支付次数：</label>
<div class="layui-input-block">
<div class="layui-input-inline">
<input type="number" name="violation_unpaid" class="layui-input ns-len-mid" value="{$info.violation_unpaid ?? 0}" />
</div>
</div>
<div class="word-aux ">用户在秒杀专区购买商品后，多少次为支付则进行违规惩罚！</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">惩罚时间：</label>
<div class="layui-input-block">
<div class="layui-input-inline">
<input type="number" name="violation_hour" class="layui-input ns-len-mid" value="{$info.violation_hour ?? 0}" />
</div>
<div class="layui-form-mid">小时</div>
</div>
<div class="word-aux ">惩罚时间内不能进入抢购专区</div>
</div>
</div>
</div>
<div class="form-row">
<button class="layui-btn" lay-submit lay-filter="save">保存</button>

5
addon/futures/shop/view/user/send_goods.html
View File

@ -119,11 +119,12 @@
layer.msg('请选择商品！');
return false;
}
if(field['info[unit_price]'] < goods_info['price']){
if(parseFloat(field['info[unit_price]']) < parseFloat(goods_info['price'])){
layer.msg('商品价格不能低于售卖价格！');
return false;
}
if(field['info[unit_price]'] >= goods_info['market_price']){
if(parseFloat(field['info[unit_price]']) >= parseFloat(goods_info['market_price'])){
console.log(field['info[unit_price]'],goods_info['market_price']);
layer.msg('商品价格必须低于原价(划线价)！');
return false;
}