diff --git a/app/common.php b/app/common.php index a6e78bc..c5a5254 100644 --- a/app/common.php +++ b/app/common.php @@ -846,7 +846,7 @@ if (!function_exists('get_distance')) { } /** - * 格式化优惠券的使用周期 + * 格式化签到券的使用周期 * */ if (!function_exists('encodeCouponCycle')) { function encodeCouponCycle(array $week) diff --git a/app/controller/api/Business.php b/app/controller/api/Business.php index f43bb1a..6b3048c 100644 --- a/app/controller/api/Business.php +++ b/app/controller/api/Business.php @@ -345,7 +345,7 @@ class Business extends Base } /** - * 商家优惠券详情 + * 商家签到券详情 * */ public function couponDetail() { @@ -357,10 +357,10 @@ class Business extends Base $couponMainId = input("id/d"); $couponMain = CouponMain::findOne(["id"=>$couponMainId]); if(empty($couponMain)){ - return $this->json(4001,"优惠券不存在"); + return $this->json(4001,"签到券不存在"); } if(!$business = BusinessRepository::getInstance()->findOneByWhere(["code"=>$couponMain["business_code"]])){ - return $this->json(4001,"优惠券商家信息不存在"); + return $this->json(4001,"签到券商家信息不存在"); } $list = $business->toArray(); diff --git a/app/controller/api/Consumer.php b/app/controller/api/Consumer.php index f9f5645..dfe90fc 100644 --- a/app/controller/api/Consumer.php +++ b/app/controller/api/Consumer.php @@ -123,7 +123,7 @@ class Consumer extends Base $item->distance_text = $distance . "m"; } - //是否收藏了该优惠券的商家 + //是否收藏了该签到券的商家 $item->isFlow = in_array($item->business_code,$flowArray); $item->couponId = $item->id; diff --git a/app/controller/api/Coupon.php b/app/controller/api/Coupon.php index b6d5610..edf0efc 100644 --- a/app/controller/api/Coupon.php +++ b/app/controller/api/Coupon.php @@ -71,7 +71,7 @@ class Coupon extends Base // switch ($type) { // case 'all': -// // 全部持有优惠券 +// // 全部持有签到券 // $sortOrder = ['sort_weight' => 'desc', 'end_time' => 'asc']; // break; // case 'notUsed': @@ -135,7 +135,7 @@ class Coupon extends Base $time = time(); $res['list'] ->each(function ($item) use($time){ - //重置优惠券名称 + //重置签到券名称 if(isset($item->couponMain) && $item->couponMain){ $item->couponName = $item->couponMain->name; $item->image_url = $this->request->domain() . $item->couponMain->image_url; @@ -265,7 +265,7 @@ class Coupon extends Base $item->status = $status; - //重置优惠券名称 + //重置签到券名称 if(isset($item->couponMain) && $item->couponMain){ $item->couponName = $item->couponMain->name; $item->image_url = $this->request->domain() . $item->couponMain->image_url; @@ -283,7 +283,7 @@ class Coupon extends Base } /** - * 领取优惠券 + * 领取签到券 * */ public function receiveCoupon() { @@ -308,7 +308,7 @@ class Coupon extends Base return $q->with("business")->lock(true); }); if(!isset($couponMain->business)||empty($couponMain->business)){ - return $this->json(4001, "优惠券所属商家不存在"); + return $this->json(4001, "签到券所属商家不存在"); } if($couponMain->business->enable != BusinessModel::COMMON_OFF){ @@ -316,7 +316,7 @@ class Coupon extends Base } try { - //检查优惠券状态 + //检查签到券状态 CouponRepository::getInstance()->checkCouponMainReceiveStatus($couponMain); }catch (RepositoryException $e){ return $this->json(4001,$e->getMessage()); @@ -355,10 +355,10 @@ class Coupon extends Base ]; //如果商家指派了渠道商 分销人重新定义为空 if ($couponMain->business->is_assign == BusinessModel::COMMON_ON){ - $data["is_distribution_coupon"] = couponMain::COMMON_OFF;//是否是分销优惠券 + $data["is_distribution_coupon"] = couponMain::COMMON_OFF;//是否是分销签到券 $data["distribution_user_code"] = '';//分销人user_code }else{ - $data["is_distribution_coupon"] = couponMain::COMMON_ON;//是否是分销优惠券 + $data["is_distribution_coupon"] = couponMain::COMMON_ON;//是否是分销签到券 $data["distribution_user_code"] = $distributionUserCode;//分销人user_code } @@ -371,11 +371,11 @@ class Coupon extends Base Db::commit(); return $this->json(); }catch (RepositoryException $e){ - Log::error("优惠券领取失败RepositoryException:".$e->getMessage()); + Log::error("签到券领取失败RepositoryException:".$e->getMessage()); Db::rollback(); return $this->json(5001,"领取失败"); }catch (Exception $e){ - Log::error("优惠券领取失败:".$e->getMessage()); + Log::error("签到券领取失败:".$e->getMessage()); Db::rollback(); return $this->json(5001,"领取失败"); } @@ -383,7 +383,7 @@ class Coupon extends Base } /** - * 核验优惠券 程序----核心操作---- + * 核验签到券 程序----核心操作---- * */ public function verification() { @@ -409,31 +409,31 @@ class Coupon extends Base }); if(empty($coupon)){ - return $this->json(4001, "优惠券不存在"); + return $this->json(4001, "签到券不存在"); } if($coupon->consumer_code != $account->user_code ){ return $this->json(4001, "参数错误"); } if($coupon->is_verificated != CouponModel::is_verificated_off){ - return $this->json(4001, "优惠券已验证"); + return $this->json(4001, "签到券已验证"); } if($coupon->status != CouponMain::status_on){ - return $this->json(4001, "优惠券已停用"); + return $this->json(4001, "签到券已停用"); } if($coupon->on_shelf != CouponMain::on_shelf_on){ - return $this->json(4001, "优惠券下架"); + return $this->json(4001, "签到券下架"); } if(!isset($coupon->couponMain) || empty($coupon->couponMain)){ - return $this->json(4001, "商家优惠券信息错误"); + return $this->json(4001, "商家签到券信息错误"); } if(strtotime($coupon->couponMain->end_time) < $time){ - return $this->json(4001, "优惠券已过期"); + return $this->json(4001, "签到券已过期"); } //$usingRule = UsingRule::findOne(["coupon_id"=>$coupon->couponMain->id]); //if(empty($usingRule)){ - // return $this->json(4001, "商家优惠券使用规则信息错误"); + // return $this->json(4001, "商家签到券使用规则信息错误"); //} //一天的开始时间 @@ -494,7 +494,7 @@ class Coupon extends Base } $businessModel = $business["model"]; - // 指定时间段内发布的优惠券个数 + // 指定时间段内发布的签到券个数 $TimeListModeReleaseCount = BusinessRepository::getInstance() ->getTimeListModeReleaseCount($business["code"],$business["time_limit_start"],$business["time_limit_end"]); @@ -582,7 +582,7 @@ class Coupon extends Base //开始数据操作 Db::startTrans(); try { - // 1. 修改优惠券状态 + // 1. 修改签到券状态 $coupon->save([ "is_verificated" => CouponModel::is_verificated_on, "used_time" => date("Y-m-d H:i:s" ,$time), @@ -597,7 +597,7 @@ class Coupon extends Base // $couponBill = CouponBill::getUserOne($account->user_code,$coupon->couponMain->id,$coupon->id); // if(empty($couponBill)){ - //2. 写入优惠券流水 + //2. 写入签到券流水 $couponBillData = [ "coupon_main_id" => $coupon->couponMain->id, "coupon_id" => $coupon->id, @@ -639,7 +639,7 @@ class Coupon extends Base "business_code" => $business->code, "business_name" => $business->business_name, "balance" => $business->balance - $deductionMoney, - "reason" => sprintf("[%s]验证优惠券[%s]扣除[%s]",$account->nick_name, $coupon->couponMain->name,$deductionMoney), + "reason" => sprintf("[%s]验证签到券[%s]扣除[%s]",$account->nick_name, $coupon->couponMain->name,$deductionMoney), "coupon_main_id" => $coupon->couponMain->id, "coupon_id" => $coupon->id, "bill_id" => $couponBill->id, @@ -680,7 +680,7 @@ class Coupon extends Base 'openid' => $agencyRedpackUser->open_id, 'check_name' => 'NO_CHECK',// NO_CHECK：不校验真实姓名, FORCE_CHECK：强校验真实姓名 'amount' => $agencyPayAmount , //单位为分，不小于300 - 'desc' => '用户核销优惠券,渠道商奖励', + 'desc' => '用户核销签到券,渠道商奖励', ]; // 写入红包 @@ -731,7 +731,7 @@ class Coupon extends Base 'openid' => $consumerRedpackUser->open_id, 'check_name' => 'NO_CHECK',// NO_CHECK：不校验真实姓名, FORCE_CHECK：强校验真实姓名 'amount' => $consumerAmount, //单位为分，不小于300 - 'desc' => '验证优惠券签到奖励', + 'desc' => '验证签到券签到奖励', ]; // 写入红包 @@ -781,7 +781,7 @@ class Coupon extends Base 'openid' => $distributionRedpackUser->open_id, 'check_name' => 'NO_CHECK',// NO_CHECK：不校验真实姓名, FORCE_CHECK：强校验真实姓名 'amount' => $confirmDistributionMoney * 100, //单位为分，不小于300 - 'desc' => '优惠券分销奖励', + 'desc' => '签到券分销奖励', ]; // 写入红包 @@ -831,7 +831,7 @@ class Coupon extends Base Db::commit(); return $this->json( 0, - "优惠券签到使用成功,您获得{$returnConsumerMoney}元红包,已存入您的零钱", + "签到券签到使用成功,您获得{$returnConsumerMoney}元红包,已存入您的零钱", [ "redpack" =>$returnConsumerMoney, "user_coupon_id" =>$couponId, @@ -841,13 +841,13 @@ class Coupon extends Base Db::rollback(); return $this->json(5001, "Repository服务器错误"); }catch (\Exception $e){ - Log::error('核销优惠券失败:'.$e->getMessage()); + Log::error('核销签到券失败:'.$e->getMessage()); Db::rollback(); return $this->json(5002, "服务器错误"); } } /** - * 发布优惠券 + * 发布签到券 * */ public function add() { @@ -889,11 +889,11 @@ class Coupon extends Base if ($hasCouponMax > 0) { $hasCouponCount = CouponRepository::getInstance()->getBusinessOnShelfOnCount($account->business->code); if ($hasCouponCount > $hasCouponMax) { - return $this->json(4001, "商家持有优惠券不能超过{$hasCouponMax}"); + return $this->json(4001, "商家持有签到券不能超过{$hasCouponMax}"); } } - //验证通过 不管是商家还是工作人员 都可以发布优惠券 + //验证通过 不管是商家还是工作人员 都可以发布签到券 $couponMain = [ "name" => $data['name'] ?? '', "business_code" => $account->business->code, @@ -931,7 +931,7 @@ class Coupon extends Base //$usingRule = input("using_rule/a"); $businessModel = $account->business["model"]; - // 指定时间段内发布的优惠券个数 + // 指定时间段内发布的签到券个数 $TimeListModeReleaseCount = BusinessRepository::getInstance() ->getTimeListModeReleaseCount($account->business["code"],$account->business["time_limit_start"],$account->business["time_limit_end"]); @@ -959,7 +959,7 @@ class Coupon extends Base //检查类型 if(CouponTypeModel::checkType($couponMain['type']) !== true){ - return $this->json(4001, '优惠券类型不存在'); + return $this->json(4001, '签到券类型不存在'); } $type = CouponRepository::getInstance()->getCouponTypeAll(); $type = array_column($type->toArray(), null, "id"); @@ -1021,7 +1021,7 @@ class Coupon extends Base //} - //未领取的优惠券 + //未领取的签到券 $NotClaimedMoney = CouponRepository::getInstance()->getBusinessNotClaimedCoupon($account->business["code"]); // if( // $account->business["model"] == BusinessModel::model_ordinary @@ -1073,7 +1073,7 @@ class Coupon extends Base } /** - * 修改优惠券 + * 修改签到券 * */ public function edit() { @@ -1097,14 +1097,14 @@ class Coupon extends Base $couponMain = CouponMain::findById($couponMainId,[]); if (empty($couponMain)) { - return $this->json(4001, "优惠券不存在"); + return $this->json(4001, "签到券不存在"); } //if (!isset($couponMain->usingRule)||empty($couponMain->usingRule)) { - // return $this->json(4001, "优惠券信息错误"); + // return $this->json(4001, "签到券信息错误"); //} $data = input(); - //验证通过 不管是商家还是工作人员 都可以修改优惠券 只能修改指定字段 + //验证通过 不管是商家还是工作人员 都可以修改签到券 只能修改指定字段 $couponMainData = [ "name" => $data['name'] ?? '', "type" => $data['type'] ?? 0, @@ -1132,7 +1132,7 @@ class Coupon extends Base //检查类型 if(CouponTypeModel::checkType($couponMainData['type']) !== true){ - return $this->json(4001, '优惠券类型不存在'); + return $this->json(4001, '签到券类型不存在'); } $type = CouponRepository::getInstance()->getCouponTypeAll(); $type = array_column($type->toArray(), null, "id"); @@ -1156,7 +1156,7 @@ class Coupon extends Base } /** - * 商家管理优惠券 + * 商家管理签到券 * */ public function getPageList() { @@ -1212,7 +1212,7 @@ class Coupon extends Base } /** - * 优惠券的领取 使用记录列表 + * 签到券的领取 使用记录列表 * */ public function getShopCouponList() { @@ -1237,10 +1237,10 @@ class Coupon extends Base $couponMain = CouponMain::findById($couponMainId); if(empty($couponMain)){ - return $this->json(4001, "优惠券不存在"); + return $this->json(4001, "签到券不存在"); } if($couponMain->business_code != $account->business->code){ - return $this->json(4001, "优惠券参数信息错误"); + return $this->json(4001, "签到券参数信息错误"); } $page = $this->request->param('page/d', 1); @@ -1257,7 +1257,7 @@ class Coupon extends Base } switch ($type) { case 'all': - // 全部持有优惠券 + // 全部持有签到券 $sortOrder = [ 'end_time' => 'asc']; break; case 'notUsed': @@ -1296,7 +1296,7 @@ class Coupon extends Base } /** - * 获取优惠券详情 + * 获取签到券详情 * */ public function getCouponMainInfo() { @@ -1307,14 +1307,14 @@ class Coupon extends Base }]); }); if(empty($couponMain)){ - return $this->json(4001,"优惠券不存在"); + return $this->json(4001,"签到券不存在"); } return $this->json(0,"success",$couponMain->toArray()); } /** - * 已使用优惠券 评分 + * 已使用签到券 评分 * */ public function score() { diff --git a/app/controller/api/User.php b/app/controller/api/User.php index 684a4d7..c9e31b3 100644 --- a/app/controller/api/User.php +++ b/app/controller/api/User.php @@ -168,7 +168,7 @@ class User extends Base throw new ValidateException('用户无效！没有相关的商户信息记录'); } - // 指定时间段内发布的优惠券个数 + // 指定时间段内发布的签到券个数 $TimeListModeReleaseCount = BusinessRepository::getInstance() ->getTimeListModeReleaseCount($account->business["code"],$account->business["time_limit_start"],$account->business["time_limit_end"]); diff --git a/app/controller/manager/Agency.php b/app/controller/manager/Agency.php index 62ee95e..73cb84f 100644 --- a/app/controller/manager/Agency.php +++ b/app/controller/manager/Agency.php @@ -306,7 +306,7 @@ class Agency extends Base $list["list"]->each(function ($item) { //管理的商家数 $item->business_count = BusinessRepository::getInstance()->agencyHasBusinessCount($item['business_code']); - //管理的商家的优惠券数 + //管理的商家的签到券数 $item->coupon_count = BusinessRepository::getInstance()->agencyHasCouponCount($item['business_code']); }); return $this->json(0, 'success', $list); diff --git a/app/controller/manager/Business.php b/app/controller/manager/Business.php index b0ea82a..d7f2d66 100644 --- a/app/controller/manager/Business.php +++ b/app/controller/manager/Business.php @@ -60,12 +60,12 @@ class Business extends Base } $list = $repo->businessList($whereMap, $page, $size, $orders); $list["list"]->each(function ($item) { - //得到当前商家的所有优惠券 + //得到当前商家的所有签到券 $date = date("Y-m-d H:i:s"); - //优惠券总数 + //签到券总数 $item->coupon_total_count = CouponMain::where(["business_code" => $item->business_code])->sum("count"); - //进行中优惠券总数 + //进行中签到券总数 $item->coupon_doing_count = CouponMain::where(["business_code" => $item->business_code]) ->whereTime("start_time", "<", $date) ->whereTime("end_time", ">", $date) @@ -73,16 +73,16 @@ class Business extends Base ->where("on_shelf", CouponMain::on_shelf_on) ->sum("count"); - //进行中优惠券总数 + //进行中签到券总数 $item->coupon_receive_count = CouponMain::where(["business_code" => $item->business_code])->sum("received_count"); - //过期未使用优惠券总数 + //过期未使用签到券总数 $item->coupon_be_overdue_count = Coupon::where(["business_code" => $item->business_code]) ->where("is_verificated", "=", Coupon::is_verificated_off) ->whereTime("end_time", "<", $date) ->count(); - //已使用优惠券总数 + //已使用签到券总数 $item->coupon_used_count = Coupon::where(["business_code" => $item->business_code]) ->where("is_verificated", "=", Coupon::is_verificated_on) ->count(); @@ -107,7 +107,7 @@ class Business extends Base /** - * 商家优惠券列表 + * 商家签到券列表 * * @return Json|View * @throws Exception @@ -236,7 +236,7 @@ class Business extends Base 'time_limit_start|时限商家模式【开始时间】' => 'requireIf:model,'.BusinessModel::model_time_limit.'|date', 'time_limit_end|时限商家模式【结束时间】' => 'requireIf:model,'.BusinessModel::model_time_limit.'|date|after:'.date("Y-m-d",strtotime("+1 day")), - 'time_limit_release_count|时限商家模式可发布优惠券个数' => 'requireIf:model,'.BusinessModel::model_time_limit.'|>:0', + 'time_limit_release_count|时限商家模式可发布签到券个数' => 'requireIf:model,'.BusinessModel::model_time_limit.'|>:0', ]); if ($validate !== true) { diff --git a/app/controller/manager/Consumer.php b/app/controller/manager/Consumer.php index 6b06e71..b7bfcc7 100644 --- a/app/controller/manager/Consumer.php +++ b/app/controller/manager/Consumer.php @@ -39,11 +39,11 @@ class Consumer extends Base } $list = $repo->findList($whereMap, [], $page, $size, null, $orders); $list["list"]->each(function ($item) { - //优惠券领取总数 + //签到券领取总数 $item->coupon_total_count = Coupon::where(["consumer_code" => $item->user_code])->count("id"); - //优惠券使用总数 + //签到券使用总数 $item->coupon_used_count = Coupon::where(["consumer_code" => $item->user_code])->where("is_verificated", Coupon::is_verificated_on)->count("id"); - //优惠券未使用总数 + //签到券未使用总数 $item->coupon_not_use_count = Coupon::where(["consumer_code" => $item->user_code])->where("is_verificated", Coupon::is_verificated_off)->count("id"); //优惠红包总金额 @@ -70,7 +70,7 @@ class Consumer extends Base $consumer = Account::findOne(["id" => $id], [], function ($q) { return $q->with("tag"); }); - //只查询优惠券持有 + //只查询签到券持有 if ($this->request->isPost()) { $repo = AccountRepository::getInstance(); $page = $this->request->param('page/d', 1); @@ -101,12 +101,12 @@ class Consumer extends Base //评论总数数 $this->data["totalTheMonthComment"] = $rep->consumerTheMonthTotalComment($consumer["user_code"]); - //优惠券领取总数 + //签到券领取总数 $this->data["couponTotalCount"] = $rep->consumerTotalCoupon($consumer["user_code"]); - //优惠券使用总数 + //签到券使用总数 $this->data["couponUsedTotalCount"] = $rep->consumerUsedTotalCoupon($consumer["user_code"]); - //优惠券未使用总数 + //签到券未使用总数 $this->data["couponNotUsedTotalCount"] = $rep->consumerNotUsedTotalCoupon($consumer["user_code"]); $this->data["consumer"] = $consumer->toArray(); diff --git a/app/controller/manager/Coupon.php b/app/controller/manager/Coupon.php index e3a64ee..56cec18 100644 --- a/app/controller/manager/Coupon.php +++ b/app/controller/manager/Coupon.php @@ -25,7 +25,7 @@ use think\response\View; use think\facade\Config as CConfig; /** - * 优惠券相关 + * 签到券相关 **/ class Coupon extends Base { @@ -111,7 +111,7 @@ class Coupon extends Base $coupon = $repo->findById($id); if (empty($coupon)) { - return $this->json(4001, "优惠券不存在"); + return $this->json(4001, "签到券不存在"); } if (!in_array($on_shelf, [CouponMain::COMMON_OFF, CouponMain::COMMON_ON])) { @@ -158,14 +158,14 @@ class Coupon extends Base ->with('category'); }, "couponType"])->where("id", $id)->find(); if (empty($coupon)) { - return $this->error("优惠券不存在"); + return $this->error("签到券不存在"); } $this->data["coupon"] = $coupon; return $this->view(); } /** - * 发布优惠券 + * 发布签到券 * * @return Json|View * @throws Exception @@ -187,7 +187,7 @@ class Coupon extends Base return $this->json(4001, "商家已禁用"); } - // 指定时间段内发布的优惠券个数 + // 指定时间段内发布的签到券个数 $TimeListModeReleaseCount = BusinessRepository::getInstance() ->getTimeListModeReleaseCount($business["code"],$business["time_limit_start"],$business["time_limit_end"]); @@ -218,13 +218,13 @@ class Coupon extends Base if ($hasCouponMax > 0) { $hasCouponCount = CouponRepository::getInstance()->getBusinessOnShelfOnCount($business->code); if ($hasCouponCount > $hasCouponMax) { - return $this->json(4001, "商家持有商家优惠券不能超过{$hasCouponMax}"); + return $this->json(4001, "商家持有商家签到券不能超过{$hasCouponMax}"); } } //检查类型 if(CouponTypeModel::checkType($data['type']) !== true){ - return $this->json(4001, '优惠券类型不存在'); + return $this->json(4001, '签到券类型不存在'); } $type = CouponRepository::getInstance()->getCouponTypeAll(); @@ -324,7 +324,7 @@ class Coupon extends Base $totalMoney = $data['deduction_money'] * $data['count']; - //未领取的优惠券 + //未领取的签到券 $NotClaimedMoney = CouponRepository::getInstance()->getBusinessNotClaimedCoupon($business["code"]); // if( // $business["model"] == BusinessModel::model_ordinary @@ -400,10 +400,10 @@ class Coupon extends Base $data = input("item/a", []); //$usingRule = input("using_rule/a", []); if (empty($couponMain)) { - return $this->json(4001, "优惠券不存在"); + return $this->json(4001, "签到券不存在"); } if (!isset($couponMain->business) || empty($couponMain->business)) { - return $this->json(4001, "优惠券所属商家不存在"); + return $this->json(4001, "签到券所属商家不存在"); } $validate = new CouponRelease(); if (!$validate->scene("edit")->check($data)) { @@ -422,7 +422,7 @@ class Coupon extends Base //检查类型 if(CouponTypeModel::checkType($data['type']) !== true){ - return $this->json(4001, '优惠券类型不存在'); + return $this->json(4001, '签到券类型不存在'); } $type = CouponRepository::getInstance()->getCouponTypeAll(); $type = array_column($type->toArray(), null, "id"); @@ -535,7 +535,7 @@ class Coupon extends Base } if (empty($couponMain)) { - return $this->error("优惠券不存在"); + return $this->error("签到券不存在"); } $this->data['business'] = BusinessRepository::getInstance()->getBusinessAll(); $this->data['type'] = CouponRepository::getInstance()->getCouponTypeAll(); @@ -553,7 +553,7 @@ class Coupon extends Base $id = input("id/d"); $couponMain = CouponMain::findById($id); if(empty($couponMain)){ - return $this->json(4001,"优惠券不存在"); + return $this->json(4001,"签到券不存在"); } $qrData = $this->request->domain() . "/coupon_info?id={$id}&business_code={$couponMain['business_code']}" ; diff --git a/app/controller/manager/CouponType.php b/app/controller/manager/CouponType.php index 7e86e62..f37d672 100644 --- a/app/controller/manager/CouponType.php +++ b/app/controller/manager/CouponType.php @@ -17,7 +17,7 @@ use think\response\Json; use think\response\View; /** - * 优惠券类型 + * 签到券类型 * * Class CouponType * @package app\controller\manager @@ -110,7 +110,7 @@ class CouponType extends Base $couponMain = CouponMain::findOne([["type","in",$ids]]); if(!empty($couponMain)){ - return $this->json(4001,"该优惠券绑定了该类型,不能删除"); + return $this->json(4001,"该签到券绑定了该类型,不能删除"); } CouponTypeModel::destroy($ids); diff --git a/app/controller/manager/Statistical.php b/app/controller/manager/Statistical.php index e425deb..0c62d8d 100644 --- a/app/controller/manager/Statistical.php +++ b/app/controller/manager/Statistical.php @@ -99,7 +99,7 @@ class Statistical extends Base } /** - * 领取优惠券位置 + * 领取签到券位置 * */ public function receive(){ if($this->request->isPost()){ diff --git a/app/model/Coupon.php b/app/model/Coupon.php index 66165da..36d0a6a 100644 --- a/app/model/Coupon.php +++ b/app/model/Coupon.php @@ -8,7 +8,7 @@ use think\db\exception\DbException; use think\db\exception\ModelNotFoundException; /** - * 优惠券 + * 签到券 * Class Coupon * @package app\model */ diff --git a/app/model/CouponBill.php b/app/model/CouponBill.php index bfea99c..2ca71b7 100644 --- a/app/model/CouponBill.php +++ b/app/model/CouponBill.php @@ -8,7 +8,7 @@ use think\db\exception\DbException; use think\db\exception\ModelNotFoundException; /** - * 优惠券验证记录 各个角色的提成 + * 签到券验证记录 各个角色的提成 * Class Coupon * @package app\model */ diff --git a/app/model/CouponMain.php b/app/model/CouponMain.php index 26ba621..55e5afd 100644 --- a/app/model/CouponMain.php +++ b/app/model/CouponMain.php @@ -9,7 +9,7 @@ use think\db\exception\ModelNotFoundException; use think\Model; /** - * 优惠券主表 + * 签到券主表 * Class CouponMain * @package app\model */ diff --git a/app/model/CouponType.php b/app/model/CouponType.php index 85d3db6..9a02aac 100644 --- a/app/model/CouponType.php +++ b/app/model/CouponType.php @@ -9,7 +9,7 @@ use think\db\exception\DbException; use think\db\exception\ModelNotFoundException; /** - * 优惠券类型 + * 签到券类型 * Class CouponType * @package app\model */ diff --git a/app/model/Redpack.php b/app/model/Redpack.php index e21747b..7ba8c49 100644 --- a/app/model/Redpack.php +++ b/app/model/Redpack.php @@ -12,7 +12,7 @@ class Redpack extends Base * 获取分销红包记录 * @param string $userType 红包获取人的角色 * @param string $distributionUserCode 分销人/渠道商/被分销者 user_code - * @param mixed $couponMainId 分销的couponMain 优惠券id + * @param mixed $couponMainId 分销的couponMain 签到券id * 以上三个参数就可以确定 分销数据的唯一性 * */ public static function getDistributionRedpack($userType,$distributionUserCode,$couponMainId) diff --git a/app/model/Score.php b/app/model/Score.php index 7c7ad23..c8792ac 100644 --- a/app/model/Score.php +++ b/app/model/Score.php @@ -2,7 +2,7 @@ namespace app\model; /** - * 优惠券使用后商家打分 + * 签到券使用后商家打分 * Class Score * @package app\model */ diff --git a/app/model/UsingRule.php b/app/model/UsingRule.php index b56b7ff..b598518 100644 --- a/app/model/UsingRule.php +++ b/app/model/UsingRule.php @@ -1,7 +1,7 @@ id; //UsingRule::create($usingRule); //Business::where("code", $data["business_code"])->dec("balance", $totalMoney)->update(); @@ -102,7 +102,7 @@ class CouponRepository extends Repository } /** - * 写入一个领取优惠券 + * 写入一个领取签到券 * @param array $data * @return Coupon|Model */ diff --git a/app/repository/DictionaryRepository.php b/app/repository/DictionaryRepository.php index 58bc4d7..f51b414 100644 --- a/app/repository/DictionaryRepository.php +++ b/app/repository/DictionaryRepository.php @@ -159,7 +159,7 @@ class DictionaryRepository extends Repository } /** - * 获取一个优惠券的使用规则 + * 获取一个签到券的使用规则 * @param int $couponMainId * @return string * @throws \think\db\exception\DataNotFoundException @@ -172,10 +172,10 @@ class DictionaryRepository extends Repository if(empty($usingRule)){ return ''; } - return "
●
该优惠券可以在" . encodeCouponCycle($usingRule->cycle) . "进行使用
-
●
该优惠券可以在每天的" . $usingRule->day_start_time ."到" .$usingRule->day_end_time ."进行使用
-
●
该优惠券每天一共可以领取". $usingRule->day_total ."张
-
●
该优惠券每天每人可以领取". $usingRule->person_day_total ."张
-
●
该优惠券每人总共可以领取". $usingRule->person_total ."张
"; + return "
●
该签到券可以在" . encodeCouponCycle($usingRule->cycle) . "进行使用
+
●
该签到券可以在每天的" . $usingRule->day_start_time ."到" .$usingRule->day_end_time ."进行使用
+
●
该签到券每天一共可以领取". $usingRule->day_total ."张
+
●
该签到券每天每人可以领取". $usingRule->person_day_total ."张
+
●
该签到券每人总共可以领取". $usingRule->person_total ."张
"; } } \ No newline at end of file diff --git a/app/subscribe/Coupon.php b/app/subscribe/Coupon.php index 8e800b9..47e7e97 100644 --- a/app/subscribe/Coupon.php +++ b/app/subscribe/Coupon.php @@ -9,13 +9,13 @@ use think\facade\Log; class Coupon { /** - * 检查过期的优惠券修改状态 + * 检查过期的签到券修改状态 * */ public function onCouponStatusCheck() { $count = CouponMain::whereTime("end_time", "<", date("Y-m-d"))->where(["status" => CouponMain::status_on])->count(); if ($count) { - Log::info("修改了优惠券状态" . $count); + Log::info("修改了签到券状态" . $count); CouponMain::whereTime("end_time", "<", date("Y-m-d"))->update(["status" => CouponMain::status_off]); } } diff --git a/app/traits/CouponBillTrait.php b/app/traits/CouponBillTrait.php index 2c9ad07..d4e1683 100644 --- a/app/traits/CouponBillTrait.php +++ b/app/traits/CouponBillTrait.php @@ -8,7 +8,7 @@ use app\model\CouponBill; trait CouponBillTrait { - //消费者 验证优惠券获得的红包总数 + //消费者 验证签到券获得的红包总数 public function consumerCouponBillTotal($userCode) { return CouponBill::where("user_code",$userCode)->sum("consumer_money"); diff --git a/app/traits/CouponMainTrait.php b/app/traits/CouponMainTrait.php index 688a2b9..0e233bd 100644 --- a/app/traits/CouponMainTrait.php +++ b/app/traits/CouponMainTrait.php @@ -13,37 +13,37 @@ use think\facade\Db; trait CouponMainTrait { /** - * 检查优惠券状态是否可以领取 + * 检查签到券状态是否可以领取 * @param CouponMain $couponMain * @return bool */ public function checkCouponMainReceiveStatus(CouponMain $couponMain){ if (empty($couponMain)) { - throw new RepositoryException("优惠券不存在"); + throw new RepositoryException("签到券不存在"); } if ($couponMain->status != CouponMain::status_on) { - throw new RepositoryException("优惠券已停用"); + throw new RepositoryException("签到券已停用"); } if ($couponMain->on_shelf != CouponMain::on_shelf_on) { - throw new RepositoryException("优惠券已下架"); + throw new RepositoryException("签到券已下架"); } $time = time(); if (strtotime($couponMain->start_time) > $time) { - throw new RepositoryException("优惠券还未到开始使用时间"); + throw new RepositoryException("签到券还未到开始使用时间"); } if (strtotime($couponMain->end_time) < $time) { - throw new RepositoryException("优惠券已结束使用"); + throw new RepositoryException("签到券已结束使用"); } if ($couponMain->using_count <= 0) { - throw new RepositoryException("优惠券已经被领完了"); + throw new RepositoryException("签到券已经被领完了"); } return true; } /** - * 统计这个优惠券已经使用了多少张了 + * 统计这个签到券已经使用了多少张了 * @param $couponMainId * @return int */ @@ -55,7 +55,7 @@ trait CouponMainTrait } /** - * 获取商户没有被领取的优惠券 需要扣除多少钱 + * 获取商户没有被领取的签到券 需要扣除多少钱 * */ public function getBusinessNotClaimedCoupon($businessCode) { @@ -78,7 +78,7 @@ trait CouponMainTrait } /** - * 获取 发布优惠券的统计 + * 获取 发布签到券的统计 * 每条数据都走一遍 * * */ @@ -102,7 +102,7 @@ trait CouponMainTrait } /** - * 获取 验证优惠券的统计 + * 获取 验证签到券的统计 * 每条数据都走一遍 * * */ @@ -126,7 +126,7 @@ trait CouponMainTrait ; } /** - * 获取 验证优惠券的统计 + * 获取 验证签到券的统计 * 每条数据都走一遍 * * */ @@ -150,7 +150,7 @@ trait CouponMainTrait } /** - * 获取商家商家的优惠券 + * 获取商家商家的签到券 * */ public function getBusinessOnShelfOnCount($businessCode) { @@ -217,7 +217,7 @@ trait CouponMainTrait /** - * 优惠券列表 + * 签到券列表 * @param $whereMap * @param $page * @param $size @@ -248,7 +248,7 @@ trait CouponMainTrait } /** - * 获取指定商圈的优惠券 大屏使用 + * 获取指定商圈的签到券 大屏使用 * */ public function screen($circle_id) diff --git a/app/traits/CouponTrait.php b/app/traits/CouponTrait.php index 529b699..f40e35d 100644 --- a/app/traits/CouponTrait.php +++ b/app/traits/CouponTrait.php @@ -12,7 +12,7 @@ use app\model\Coupon; trait CouponTrait { - /**消费者持有优惠券总数 + /**消费者持有签到券总数 * @param string $userCode * * @@ -23,7 +23,7 @@ trait CouponTrait return Coupon::where("consumer_code", $userCode)->count("id"); } - /**消费者已使用优惠券总数 + /**消费者已使用签到券总数 * @param string $userCode * @return int */ @@ -33,7 +33,7 @@ trait CouponTrait } /** - * 消费者已使用优惠券总数 + * 消费者已使用签到券总数 * @param string $userCode * @return int */ @@ -43,7 +43,7 @@ trait CouponTrait } /** - * 消费者已使用优惠券总数 + * 消费者已使用签到券总数 * @param string $userCode * @return array * @throws \Exception @@ -56,7 +56,7 @@ trait CouponTrait } /** - * 查看某个优惠券的是否可以领取 0 可以领取 1 已领取不能再领取 + * 查看某个签到券的是否可以领取 0 可以领取 1 已领取不能再领取 * @param $accountCode * @param CouponMain $couponMain * @return int @@ -111,7 +111,7 @@ trait CouponTrait /** - * 查看某个优惠券的是否可以领取 0 可以领取 1 已领取不能再领取 + * 查看某个签到券的是否可以领取 0 可以领取 1 已领取不能再领取 * @param Account $account * @param CouponMain $couponMain * @return void @@ -170,7 +170,7 @@ trait CouponTrait if (false === strpos($couponMain->white_list, $account->mobile //. "-" . $account->real_name )) { - throw new RepositoryException("您没有在该优惠券白名单内"); + throw new RepositoryException("您没有在该签到券白名单内"); } } diff --git a/app/validate/CouponRelease.php b/app/validate/CouponRelease.php index bd9610c..61e9162 100644 --- a/app/validate/CouponRelease.php +++ b/app/validate/CouponRelease.php @@ -12,17 +12,17 @@ class CouponRelease extends Validate //'lng|经度' => 'require', //'lat|纬度' => 'require', 'count|总数' => 'require|number|>:0', - 'type|优惠券类型' => 'require|>:0', + 'type|签到券类型' => 'require|>:0', 'start_time|开始时间' => 'require|date', 'end_time|结束时间' => 'require|date|checkEndTime', - 'name|优惠券名称' => 'require|length:3,32', + 'name|签到券名称' => 'require|length:3,32', //'money|金额' => 'require|>:0|<=:5000', 'deduction_money|扣除金额' => 'require|>=:0|<=:100000', 'image_url|预览图' => 'require', //'using_rule|使用规则' => '', //'punishing_rule|处罚规则' => '', //'using_count|使用中' => '', - //'received_count|已领取的优惠券数量' => '', + //'received_count|已领取的签到券数量' => '', //'edition|发布的版本' => '', 'status|状态' => 'require|in:1,0', 'on_shelf|上架状态' => 'require|in:1,0', @@ -34,7 +34,7 @@ class CouponRelease extends Validate protected $message = [ 'business_code.require' => '商家信息错误', - 'type' => '优惠券类型错误', + 'type' => '签到券类型错误', 'status' => '状态错误', 'on_shelf' => '上架状态错误', 'on_screen' => '展示到商圈大屏状态错误', diff --git a/public/static/manager/js/bill.js b/public/static/manager/js/bill.js index d5e7a6a..f3313f3 100644 --- a/public/static/manager/js/bill.js +++ b/public/static/manager/js/bill.js @@ -12,7 +12,7 @@ layui.use(['laytpl', 'table', 'jquery', 'form', 'miniTab', 'xmSelect',"laydate"] if ($('.location-index-page').length > 0) { miniTab.listen(); var exportDataTitle= - ["用户昵称","核销编码","商家昵称","优惠券名称","持有比例(渠道商:平台:消费者)","金额","时间"] + ["用户昵称","核销编码","商家昵称","签到券名称","持有比例(渠道商:平台:消费者)","金额","时间"] ; var exportData =[]; // 渲染表格 @@ -52,7 +52,7 @@ layui.use(['laytpl', 'table', 'jquery', 'form', 'miniTab', 'xmSelect',"laydate"] {field: "nick_name",title: '用户昵称'}, {field: "user_coupon_id",width:120,title: '核销编码'}, {field: "business_name", title: '商家名称'}, - {field: "coupon_main_name", title: '优惠券名称'}, + {field: "coupon_main_name", title: '签到券名称'}, {templet:"#row-commission", title: '持有比例'}, {field: 'deduction_money', width: 200, title: '扣除金额'}, {field: 'create_time', width: 180, title: '时间'}, diff --git a/public/static/manager/js/bill_deduction.js b/public/static/manager/js/bill_deduction.js index 2684eab..262df45 100644 --- a/public/static/manager/js/bill_deduction.js +++ b/public/static/manager/js/bill_deduction.js @@ -13,7 +13,7 @@ layui.use(['laytpl', 'table', 'jquery', 'form', 'miniTab', 'xmSelect',"laydate"] miniTab.listen(); var exportDataTitle= [ - "消费者昵称","核销编码","扣款优惠券名称", + "消费者昵称","核销编码","扣款签到券名称", "所属商家名称","商家所属平台商", "扣款总额","当前余额", "消费者红包","平台商佣金", @@ -59,7 +59,7 @@ layui.use(['laytpl', 'table', 'jquery', 'form', 'miniTab', 'xmSelect',"laydate"] { field:"nick_name",title: '消费者昵称'}, { field:"user_coupon_id",title: '核销编码'}, {templet: "#row-avatar_url",field:"avatar_url",title: '消费者头像'}, - {field:"coupon_main_name",title: '扣款优惠券名称'}, + {field:"coupon_main_name",title: '扣款签到券名称'}, {field:"business_name",title: '所属商家名称'}, {field:"agency_business_name",title: '商家所属平台商'}, diff --git a/public/static/manager/js/business/business.js b/public/static/manager/js/business/business.js index dbaca6f..3f202af 100644 --- a/public/static/manager/js/business/business.js +++ b/public/static/manager/js/business/business.js @@ -44,10 +44,10 @@ layui.use(['laytpl', 'table', 'jquery', 'form', 'miniTab', 'xmSelect'], function {templet: '#row-cover', title: '头像', style: 'height: 90px;'}, {field:"account_nick_name", title: '昵称'}, {field: "business_name" ,title: '商家名称'}, - {field: 'coupon_total_count', title: '优惠券总数量'}, - {field: 'coupon_doing_count', title: '进行中优惠券数量'}, - {field: 'coupon_receive_count', title: '已领取优惠券数量'}, - {field: 'coupon_be_overdue_count', title: '过期未使用优惠券数量'}, + {field: 'coupon_total_count', title: '签到券总数量'}, + {field: 'coupon_doing_count', title: '进行中签到券数量'}, + {field: 'coupon_receive_count', title: '已领取签到券数量'}, + {field: 'coupon_be_overdue_count', title: '过期未使用签到券数量'}, {field: 'coupon_used_count', title: '已使用优惠数量'}, {field: 'coupon_profit_count', title: '为平台提供的总收益'}, diff --git a/public/static/manager/js/business/business_deduction_list.js b/public/static/manager/js/business/business_deduction_list.js index 33bc024..b9a92c5 100644 --- a/public/static/manager/js/business/business_deduction_list.js +++ b/public/static/manager/js/business/business_deduction_list.js @@ -57,7 +57,7 @@ layui.use(['laytpl', 'table', 'jquery', 'form', 'miniTab', 'xmSelect'], function return d.couponMain.name; } return ''; - }, title: '优惠券名称'}, + }, title: '签到券名称'}, {field: 'balance' , title: '当前余额'}, ]], done: function () { diff --git a/public/static/manager/js/channel.js b/public/static/manager/js/channel.js index 15e3341..a579d80 100644 --- a/public/static/manager/js/channel.js +++ b/public/static/manager/js/channel.js @@ -40,7 +40,7 @@ layui.use(['laytpl', 'table', 'jquery', 'form', 'miniTab', 'xmSelect'], function {field: 'id', width: 80, title: 'ID'}, {field: 'nickname', title: '昵称'}, {field: 'business_count', title: '下属商家数'}, - {field: 'coupon_count', title: '下属优惠券数'}, + {field: 'coupon_count', title: '下属签到券数'}, {field: 'create_time', title: '注册时间'}, {templet: '#row-status', title: '状态'}, diff --git a/public/static/manager/js/consumer/index.js b/public/static/manager/js/consumer/index.js index b182f61..4082fa2 100644 --- a/public/static/manager/js/consumer/index.js +++ b/public/static/manager/js/consumer/index.js @@ -45,9 +45,9 @@ layui.use(['laytpl', 'table', 'jquery', 'form', 'miniTab', 'xmSelect'], function {field: 'nick_name', title: '昵称'}, //{templet: '#row-gender', title: '性别'}, {field: 'mobile', title: '授权手机号'}, - {field: 'coupon_total_count', title: '优惠券领取数'}, - {field: 'coupon_used_count', title: '优惠券使用数'}, - {field: 'coupon_not_use_count', title: '优惠券未使用数'}, + {field: 'coupon_total_count', title: '签到券领取数'}, + {field: 'coupon_used_count', title: '签到券使用数'}, + {field: 'coupon_not_use_count', title: '签到券未使用数'}, {field: 'consumer_coupon_bill_total', title: '红包总收入'}, {field: 'login_time', title: '最近登录'}, diff --git a/public/static/manager/js/consumer/info.js b/public/static/manager/js/consumer/info.js index 9c1b9eb..bef013c 100644 --- a/public/static/manager/js/consumer/info.js +++ b/public/static/manager/js/consumer/info.js @@ -38,10 +38,10 @@ layui.use(['laytpl', 'table', 'jquery', 'form', 'miniTab', 'xmSelect'], function // {type: 'checkbox'}, {field: 'id' , width: 80, title: 'ID'}, {field: 'name', title: '名称'}, - {field: 'type_name', title: '优惠券类型'}, + {field: 'type_name', title: '签到券类型'}, {templet: '#row-received_map', title: '领取位置'}, {field: 'received_time', title: '领取时间'}, - // {field: 'money', title: '优惠券金额'}, + // {field: 'money', title: '签到券金额'}, {templet: function (d) { if(d.couponBill!=undefined&&d.couponBill){ return d.couponBill.consumer_money; diff --git a/route/api.php b/route/api.php index 606bd99..1b614da 100644 --- a/route/api.php +++ b/route/api.php @@ -11,11 +11,11 @@ use think\facade\Route; //Route::rule('account/loginByCode', "\\app\\controller\\api\\user@login");//用户登录 -//Route::rule('consumer/home', "\\app\\controller\\api\\consumer@home");//首页列表（优惠券列表） -//Route::rule('consumer/bannerList', "\\app\\controller\\api\\consumer@bannerList");//首页列表（优惠券列表） +//Route::rule('consumer/home', "\\app\\controller\\api\\consumer@home");//首页列表（签到券列表） +//Route::rule('consumer/bannerList', "\\app\\controller\\api\\consumer@bannerList");//首页列表（签到券列表） //Route::rule('dic/getDisList', "\\app\\controller\\api\\dictionary@getDisList");//距离选项列表 //Route::rule('dic/getBusinessTypeListByPid', "\\app\\controller\\api\\dictionary@getBusinessTypeList");//首页获取商家类型 -//Route::rule('dic/getCouponTypeList', "\\app\\controller\\api\\dictionary@getCouponTypeList");//首页获取优惠券类型 +//Route::rule('dic/getCouponTypeList', "\\app\\controller\\api\\dictionary@getCouponTypeList");//首页获取签到券类型 //Route::rule('dic/getBusinessTypeList', "\\app\\controller\\api\\business@getBusinessTypeList");//首页获取商家类型 //Route::rule('dic/getBusinessCircle', "\\app\\controller\\api\\business@getBusinessCircle");//首页获取商家商圈 //Route::rule('consumer/flowBusiness', "\\app\\controller\\api\\consumer@flowBusiness");//首页获取商家商圈 diff --git a/view/manager/bill/deduction.html b/view/manager/bill/deduction.html index 4e4901a..ab9526c 100644 --- a/view/manager/bill/deduction.html +++ b/view/manager/bill/deduction.html @@ -101,7 +101,7 @@
- +
diff --git a/view/manager/bill/index.html b/view/manager/bill/index.html index fd81044..5427ca5 100644 --- a/view/manager/bill/index.html +++ b/view/manager/bill/index.html @@ -129,7 +129,7 @@
- +
diff --git a/view/manager/business/business_coupon_list.html b/view/manager/business/business_coupon_list.html index 79539bd..13b6719 100644 --- a/view/manager/business/business_coupon_list.html +++ b/view/manager/business/business_coupon_list.html @@ -29,7 +29,7 @@
- +
diff --git a/view/manager/business/business_detail.html b/view/manager/business/business_detail.html index 2cc8d91..9f852bd 100644 --- a/view/manager/business/business_detail.html +++ b/view/manager/business/business_detail.html @@ -220,7 +220,7 @@
- 时限商家 当商家在有效期内发布优惠券次数达到设置次数，或者超出有效期，商家类型自动变成普通商家 + 时限商家 当商家在有效期内发布签到券次数达到设置次数，或者超出有效期，商家类型自动变成普通商家
diff --git a/view/manager/business/index.html b/view/manager/business/index.html index c38a881..7aa30f9 100644 --- a/view/manager/business/index.html +++ b/view/manager/business/index.html @@ -51,7 +51,7 @@