diff --git a/addon/fenxiao/model/Config.php b/addon/fenxiao/model/Config.php index 0e9a903b..d09a7477 100644 --- a/addon/fenxiao/model/Config.php +++ b/addon/fenxiao/model/Config.php @@ -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']]); diff --git a/addon/fenxiao/shop/controller/Config.php b/addon/fenxiao/shop/controller/Config.php index ef56b786..be545805 100644 --- a/addon/fenxiao/shop/controller/Config.php +++ b/addon/fenxiao/shop/controller/Config.php @@ -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); diff --git a/addon/fenxiao/shop/view/config/basics.html b/addon/fenxiao/shop/view/config/basics.html index 0255456a..f0e85b1c 100644 --- a/addon/fenxiao/shop/view/config/basics.html +++ b/addon/fenxiao/shop/view/config/basics.html @@ -101,33 +101,6 @@ - -
-
- 违规设置 -
-
-
- -
-
- -
-
-
用户在秒杀专区购买商品后,多少次为支付则进行违规惩罚!
-
-
- -
-
- -
-
小时
-
-
惩罚时间内不能进入抢购专区
-
-
-
diff --git a/addon/futures/model/Futures.php b/addon/futures/model/Futures.php index d600af3a..1e1ebc0e 100644 --- a/addon/futures/model/Futures.php +++ b/addon/futures/model/Futures.php @@ -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(); } diff --git a/addon/futures/shop/view/config/basics.html b/addon/futures/shop/view/config/basics.html index df8ff4ac..4f1368b7 100644 --- a/addon/futures/shop/view/config/basics.html +++ b/addon/futures/shop/view/config/basics.html @@ -121,7 +121,33 @@
%
- + + +
+
+ 违规设置 +
+
+
+ +
+
+ +
+
+
用户在秒杀专区购买商品后,多少次为支付则进行违规惩罚!
+
+
+ +
+
+ +
+
小时
+
+
惩罚时间内不能进入抢购专区
+
+
diff --git a/addon/futures/shop/view/user/send_goods.html b/addon/futures/shop/view/user/send_goods.html index 86c59a09..705c9855 100644 --- a/addon/futures/shop/view/user/send_goods.html +++ b/addon/futures/shop/view/user/send_goods.html @@ -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; }