diff --git a/app/common.php b/app/common.php index bbf561d..12af546 100644 --- a/app/common.php +++ b/app/common.php @@ -124,7 +124,7 @@ function give_symbol(&$value,$symbol = '+') * @param $phoneNumber * @return string */ -function format_phone_number($phoneNumber) +function format_phone_number($phoneNumber):string { $prefix = substr($phoneNumber, 0, 3); $suffix = substr($phoneNumber, -4); @@ -146,22 +146,23 @@ function rand_avatar() * @param $number * @return string */ -function format_money($number) { - $units = array("万元", "亿元"); +function format_money($number):string +{ + $units = array('元',"万元", "亿元"); $unitMaxValue = 10000; // 单位最大值 $unitIndex = 0; // 单位索引 if ($number >= $unitMaxValue && $number % $unitMaxValue === 0) { - while (abs($number) >= $unitMaxValue && $unitIndex < count($units) - 1) { - $number = $number / $unitMaxValue; + while ($number >= $unitMaxValue && $unitIndex <= count($units) - 1) { + $number = round($number / $unitMaxValue); $unitIndex++; } - $formattedNumber = number_format($number, 0) . $units[$unitIndex]; + $formattedNumber = round($number, 0) . $units[$unitIndex]; } elseif ($number % $unitMaxValue === 0) { - $formattedNumber = $number / $unitMaxValue . $units[0]; + $formattedNumber = round($number / $unitMaxValue,0) . $units[0]; } else { - $formattedNumber = $number . '元'; + $formattedNumber = round($number,0) . '元'; } return $formattedNumber; diff --git a/app/controller/AdminZoneManage.php b/app/controller/AdminZoneManage.php index c9a83d8..487a0e1 100644 --- a/app/controller/AdminZoneManage.php +++ b/app/controller/AdminZoneManage.php @@ -5,6 +5,7 @@ namespace app\controller; use app\BaseController; use app\model\ZoneGoods; +use app\model\ZoneGoodsParam; use app\validate\Zone as ZoneValidate; use think\exception\ValidateException; use think\facade\Request; @@ -47,4 +48,40 @@ class AdminZoneManage extends BaseController return $this->renderError($validateException->getMessage()); } } + + /** + * 奖金设置列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + */ + public function goodsParamList() + { + $param = Request::param(); + + try { + validate(ZoneValidate::class)->scene('goodsParamList')->check($param); + + $zone_goods_id = $param['zone_goods_id']; + + $ZoneGoodsParam = new ZoneGoodsParam(); + $list = $ZoneGoodsParam->where('zone_goods_id',$zone_goods_id) + ->field('id,amount,image,probability') + ->order('amount','desc') + ->select() + ->toArray(); + foreach ($list as &$item) { + $item['probability'] = ($item['probability'] * 100) .'%'; + $item['amount_str'] = format_money($item['amount']); + $item['image'] = get_image_url($item['image']); + } + + return $this->renderSuccess('数据返回成功',['list' => $list]); + } catch (ValidateException $validateException) { + return $this->renderError($validateException->getMessage()); + } + + + } } diff --git a/app/validate/Zone.php b/app/validate/Zone.php index f32d02f..e6a0eb5 100644 --- a/app/validate/Zone.php +++ b/app/validate/Zone.php @@ -29,6 +29,7 @@ class Zone extends Validate protected $message = []; protected $scene = [ - 'changeStatus' => ['zone_goods_id','status'] + 'changeStatus' => ['zone_goods_id','status'], + 'goodsParamList' => ['zone_goods_id'], ]; } diff --git a/route/app.php b/route/app.php index e68f099..44678cb 100644 --- a/route/app.php +++ b/route/app.php @@ -82,6 +82,7 @@ Route::group('adminUser',function() { Route::group('adminZoneManage',function() { Route::post('zoneGoodsList','adminZoneManage/zoneGoodsList')->middleware(CheckAdmin::class)->allowCrossDomain(); Route::post('zoneGoodsChangeStatus','adminZoneManage/zoneGoodsChangeStatus')->middleware(CheckAdmin::class)->allowCrossDomain(); + Route::post('goodsParamList','adminZoneManage/goodsParamList'); }); # 支付(待开发)