diff --git a/app/controller/api/Coupon.php b/app/controller/api/Coupon.php index 5b58ca0..3c815ec 100644 --- a/app/controller/api/Coupon.php +++ b/app/controller/api/Coupon.php @@ -457,7 +457,7 @@ class Coupon extends Base } $redpackData['failure_reason'] = json_encode($result,JSON_UNESCAPED_UNICODE); //否则失败 记录失败原因 - Log::info("企业发起付款【分销者红包】失败:" . json_encode($result,JSON_UNESCAPED_UNICODE)); + Log::info("企业发起付款【领券分销者红包】失败:" . json_encode($result,JSON_UNESCAPED_UNICODE)); //默认回滚 Db::rollback(); //失败也要写入红包记录 @@ -982,7 +982,7 @@ class Coupon extends Base //if($couponMain["is_distribution"] == CouponMain::COMMON_ON){ if($couponMain['commission_dis_distributed'] < $couponMain['commission_dis_distribution']){ - //检测 【被分销者】部分是否最少0.3元 + //检测 【核销分销者】部分是否最少0.3元 $distributedMoney = ($couponMain['commission_dis_distributed'] / 100) * $couponMain['deduction_money']; if ($distributedMoney != 0 && $distributedMoney < CouponMain::min_redpack_money) { return $this->json(4002, @@ -991,7 +991,7 @@ class Coupon extends Base . "元"); } }else{ - //检测 【分销者】部分是否最少0.3元 + //检测 【领券分销者】部分是否最少0.3元 $distributionMoney = ($couponMain['commission_dis_distribution'] / 100) * $couponMain['deduction_money']; if ($distributionMoney != 0 && $distributionMoney < CouponMain::min_redpack_money) { return $this->json(4002, diff --git a/app/controller/manager/Config.php b/app/controller/manager/Config.php index 4204374..273757f 100644 --- a/app/controller/manager/Config.php +++ b/app/controller/manager/Config.php @@ -220,7 +220,7 @@ class Config extends Base $validate = $this->validateByApi($data, [ 'admin|平台占比' => 'require|number', 'distribution|(领券)分销者占比' => 'require|number', - 'distributed|(核销)被分销者占比' => 'require|number', + 'distributed|(核销)分销者占比' => 'require|number', ]); if ($validate !== true) { diff --git a/app/controller/manager/Coupon.php b/app/controller/manager/Coupon.php index 9d39078..a4334c7 100644 --- a/app/controller/manager/Coupon.php +++ b/app/controller/manager/Coupon.php @@ -259,18 +259,18 @@ class Coupon extends Base $distributionMoney = ($data['commission_dis_distribution'] / 100) * $data['deduction_money']; if ($distributionMoney != 0 && $distributionMoney < CouponMain::min_redpack_money) { return $this->json(4002, - "开启分销:【分销者】红包不足" + "开启分销:【领券分销者】红包不足" . CouponMain::min_redpack_money . "元,扣除金额最低" . (CouponMain::min_redpack_money * (100 / ($data['commission_dis_distribution']))) . "元"); } }else{ - //检测【被分销者】部分是否最少0.3元 + //检测【核销分销者】部分是否最少0.3元 $distributedMoney = ($data['commission_dis_distributed'] / 100) * $data['deduction_money']; if ($distributedMoney != 0 && $distributedMoney < CouponMain::min_redpack_money) { return $this->json(4002, - "开启分销:【被分销者】红包不足" + "开启分销:【核销分销者】红包不足" . CouponMain::min_redpack_money . "元,扣除金额最低" . (CouponMain::min_redpack_money * (100 / ($data['commission_dis_distributed']))) @@ -423,25 +423,25 @@ class Coupon extends Base } } if($data['commission_dis_distribution'] < $data['commission_dis_distributed']){ - //检测【分销者】部分是否最少0.3元 + //检测【领券分销者】部分是否最少0.3元 $distributionMoney = ($data['commission_dis_distribution']/100) * $couponMain['deduction_money']; if ($distributionMoney != 0 && $distributionMoney < CouponMain::min_redpack_money) { return $this->json(4002, - "开启分销:【分销者】红包不足" + "开启分销:【领券分销者】红包不足" .CouponMain::min_redpack_money - ."元,(领券)分销者占比最低" . + ."元,【领券分销者】占比最低" . (round((CouponMain::min_redpack_money / ($data['deduction_money'])) * 100, 2)) . "%" ); } }else{ - //检测【被分销者】部分是否最少0.3元 + //检测【核销分销者】部分是否最少0.3元 $distributedMoney = ($data['commission_dis_distributed']/100) * $couponMain['deduction_money']; if ($distributedMoney != 0 && $distributedMoney < CouponMain::min_redpack_money) { return $this->json(4002, - "开启分销:【被分销者】红包不足" + "开启分销:【核销分销者】红包不足" .CouponMain::min_redpack_money - ."元,(核销)被分销者占比最低" . + ."元,【核销分销者】占比最低" . (round((CouponMain::min_redpack_money / ($data['deduction_money'])) * 100, 2)) . "%"); } @@ -456,7 +456,7 @@ class Coupon extends Base return $this->json(4002, "关闭分销:【消费者】红包不足" .CouponMain::min_redpack_money - ."元,消费者占比最低" . + ."元,【消费者】占比最低" . (round((CouponMain::min_redpack_money / ($couponMain['deduction_money'])) * 100, 2)) . "%"); } @@ -467,7 +467,7 @@ class Coupon extends Base return $this->json(4002, "关闭分销:【渠道商】红包不足" .CouponMain::min_redpack_money - ."元,渠道商占比最低" . + ."元,【渠道商】占比最低" . (round((CouponMain::min_redpack_money / ($couponMain['deduction_money'])) * 100, 2)) . "%"); } @@ -575,26 +575,26 @@ class Coupon extends Base } if($item['commission_dis_distribution'] < $item['commission_dis_distributed'] ){ - //检测【分销者】部分是否最少0.3元 + //检测【领券分销者】部分是否最少0.3元 $distributionMoney = ($item['commission_dis_distribution'] / 100) * $item['deduction_money']; if ($distributionMoney != 0 && $distributionMoney < CouponMain::min_redpack_money) { return $this->json(4002, - "【{$item['name']}】开启分销后:【分销者】红包不足" + "【{$item['name']}】开启分销后:【领券分销者】红包不足" . CouponMain::min_redpack_money - . "元,(领券)分销者占比最低" . + . "元,【领券分销者】占比最低" . (round((CouponMain::min_redpack_money / ($item['deduction_money'])) * 100, 2)) . "%" ); } }else{ - //检测【被分销者】部分是否最少0.3元 + //检测【核销分销者】部分是否最少0.3元 $distributedMoney = ($item['commission_dis_distributed'] / 100) * $item['deduction_money']; if ($distributedMoney != 0 && $distributedMoney < CouponMain::min_redpack_money) { return $this->json(4002, - "【{$item['name']}】开启分销后:【被分销者】红包不足" + "【{$item['name']}】开启分销后:【核销分销者】红包不足" . CouponMain::min_redpack_money - . ",(核销)被分销者占比最低" . + . ",【核销分销者】占比最低" . (round((CouponMain::min_redpack_money / ($item['deduction_money'])) * 100, 2)) . "%"); } @@ -608,7 +608,7 @@ class Coupon extends Base "【{$item['name']}】开启分销后:【渠道商】红包不足" . CouponMain::min_redpack_money - . "元,渠道商占比最低" . + . "元,【渠道商】占比最低" . (round((CouponMain::min_redpack_money / ($item['deduction_money'])) * 100, 2)) . "%" ); @@ -620,7 +620,7 @@ class Coupon extends Base return $this->json(4002, "【{$item['name']}】开启分销后:【消费者】红包不足" . CouponMain::min_redpack_money - . ",消费者占比最低" . + . ",【消费者】占比最低" . (round((CouponMain::min_redpack_money / ($item['deduction_money'])) * 100, 2)) . "%"); } diff --git a/app/model/Redpack.php b/app/model/Redpack.php index 025fe34..5f97799 100644 --- a/app/model/Redpack.php +++ b/app/model/Redpack.php @@ -5,8 +5,8 @@ namespace app\model; class Redpack extends Base { - const userTypeDistribution = "distribution";//分销者 - const userTypeDistributed = "distributed";//被分销者 + const userTypeDistribution = "distribution";//领券分销者 + const userTypeDistributed = "distributed";//核销分销者 const userTypeAgency = "agency";// 渠道商 /** * 获取分销红包记录 diff --git a/public/static/manager/js/bill.js b/public/static/manager/js/bill.js index 7a41fe7..d5e7a6a 100644 --- a/public/static/manager/js/bill.js +++ b/public/static/manager/js/bill.js @@ -69,7 +69,7 @@ layui.use(['laytpl', 'table', 'jquery', 'form', 'miniTab', 'xmSelect',"laydate"] "金额: " + d.agency_money + ":" d.admin_money + " :" + d.consumer_money; } else { - disstr = "分销者:平台:被分销者" + + disstr = "领券分销者:平台:核销分销者" + " 比例: " + d.commission_dis_distribution + ":" + d.commission_dis_admin + ":" + d.commission_dis_distributed + "金额: " + d.distribution_money + ":" d.admin_money + " :" + d.consumer_money; diff --git a/view/manager/config/distribution_proportion_user.html b/view/manager/config/distribution_proportion_user.html index 3176318..9625fa2 100644 --- a/view/manager/config/distribution_proportion_user.html +++ b/view/manager/config/distribution_proportion_user.html @@ -27,7 +27,7 @@
- +
diff --git a/view/manager/coupon/add.html b/view/manager/coupon/add.html index 709e8e6..6d73e4a 100644 --- a/view/manager/coupon/add.html +++ b/view/manager/coupon/add.html @@ -278,7 +278,7 @@
- +
diff --git a/view/manager/coupon/edit.html b/view/manager/coupon/edit.html index 84f750d..2d14e81 100644 --- a/view/manager/coupon/edit.html +++ b/view/manager/coupon/edit.html @@ -286,7 +286,7 @@
- +
diff --git a/view/manager/index/dashboard.html b/view/manager/index/dashboard.html index 821fa4a..1a60cb4 100644 --- a/view/manager/index/dashboard.html +++ b/view/manager/index/dashboard.html @@ -1,82 +1,6 @@ {layout name="manager/layout" /}
-
-
-
-
-
-
- -
-
-
-

新增客户（人）

- {$count['new'] ?? 0} -
-
-
-
-
-
-
-
-
- -
-
-
-

新增预约（人）

- {$count['appointment'] ?? 0} -
-
-
-
- -
-
-
-
-
- -
-
-
- -

待处理预约（人）

- {$count['appointment_waiting'] ?? 0} - -
-
-
-
- -
-
-
-
-
- -
-
-
-

今日在线（人）

- {$count['online'] ?? 0} -
-
-
-
-
- -
-
-
分销排行榜 - 查看全部 -
- -
-
常用功能
@@ -84,40 +8,35 @@
- +
消费者管理
+
+ + + +
优惠券列表
+
+
+ + + +
流水查看
+
+
+ + + +
商家认证
+
-
- - - -
渠道管理
-
-
- - - -
预约管理
-
-
- - - -
报告管理
-
-
- - - -
分销排行榜
-
+