dxtc
/
coupon-admin
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

setter

master
wangxinglong 2022-03-21 18:03:43 +08:00
parent 118a111279
commit 49cdc157d3
5 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controller/api/Coupon.php
View File

@ -315,8 +315,6 @@ class Coupon extends Base
return $this->json(4001, "商家已禁用"); return $this->json(4001, "商家已禁用");
} }
try { try {
//检查优惠券状态 //检查优惠券状态
CouponRepository::getInstance()->checkCouponMainReceiveStatus($couponMain); CouponRepository::getInstance()->checkCouponMainReceiveStatus($couponMain);

12
app/controller/manager/Coupon.php
View File

@ -224,12 +224,12 @@ class Coupon extends Base
$data['commission_agency'] = input("item.commission_agency/d", 0,"abs"); $data['commission_agency'] = $this->data["distributionProportion"]["commission_agency"];
$data['commission_admin'] = input("item.commission_admin/d", 0,"abs"); $data['commission_admin'] = $this->data["distributionProportion"]["commission_admin"];
$data['commission_consumer'] = input("item.commission_consumer/d", 0,"abs"); $data['commission_consumer'] = $this->data["distributionProportion"]["commission_consumer"];
$data['commission_dis_admin'] = input("item.commission_dis_admin/d", 0,"abs"); $data['commission_dis_admin'] = $this->data["distributionProportionUser"]["commission_dis_admin"];
$data['commission_dis_distribution'] = input("item.commission_dis_distribution/d", 0,"abs"); $data['commission_dis_distribution'] = $this->data["distributionProportionUser"]["commission_dis_distribution"];
$data['commission_dis_distributed'] = input("item.commission_dis_distributed/d", 0,"abs"); $data['commission_dis_distributed'] = $this->data["distributionProportionUser"]["commission_dis_distributed"];
$totalCommission = $data['commission_agency'] + $data['commission_admin'] + $data['commission_consumer']; $totalCommission = $data['commission_agency'] + $data['commission_admin'] + $data['commission_consumer'];
if ($totalCommission != 100) { if ($totalCommission != 100) {

10
app/traits/CouponTrait.php
View File

@ -162,10 +162,14 @@ trait CouponTrait
//白名单 //白名单
if(!empty($couponMain->white_list)){ if(!empty($couponMain->white_list)){
if (empty($account->real_name) || empty($account->mobile)) { if (
throw new RepositoryException("请先授权手机号和真实姓名"); //empty($account->real_name) ||
empty($account->mobile)) {
throw new RepositoryException("请先授权手机号");
} }
if (false === strpos($couponMain->white_list, $account->mobile . "-" . $account->real_name)) { if (false === strpos($couponMain->white_list, $account->mobile
//. "-" . $account->real_name
)) {
throw new RepositoryException("您没有在该优惠券白名单内"); throw new RepositoryException("您没有在该优惠券白名单内");
} }
} }

20
view/manager/coupon/add.html
View File

@ -149,9 +149,9 @@
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">白名单</label> <label class="layui-form-label">白名单</label>
<div class="layui-input-inline " style="width: 450px"> <div class="layui-input-inline " style="width: 450px">
<textarea name="item[white_list]" rows="20" placeholder="1800000000-张三" class="layui-textarea"></textarea> <textarea name="item[white_list]" rows="20" placeholder="1800000000" class="layui-textarea"></textarea>
</div> </div>
<div class="layui-form-mid layui-word-aux">填写后只有白名单能领取 一排填写一个 如:手机号-姓名 或者安格式粘贴到输入框中</div> <div class="layui-form-mid layui-word-aux">填写后只有白名单能领取 一排填写一个 如:手机号 或者安格式粘贴到输入框中</div>
</div> </div>
<!-- <fieldset class="layui-elem-field layui-field-title site-title layui-hide">--> <!-- <fieldset class="layui-elem-field layui-field-title site-title layui-hide">-->
@ -218,11 +218,11 @@
<fieldset class="layui-elem-field layui-field-title site-title"> <fieldset class="layui-elem-field layui-field-title site-title layui-hide">
<legend><a name="compatibility">请填写完整的整数 总和为100</a></legend> <legend><a name="compatibility">请填写完整的整数 总和为100</a></legend>
</fieldset> </fieldset>
<div class="layui-form-itemBox2 between-center"> <div class="layui-form-itemBox2 between-center layui-hide">
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">渠道商占比(%)</label> <label class="layui-form-label">渠道商占比(%)</label>
<div class="layui-input-block"> <div class="layui-input-block">
@ -232,7 +232,7 @@
</div> </div>
<div class="layui-form-itemBox2 between-center"> <div class="layui-form-itemBox2 between-center layui-hide">
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">平台占比(%)</label> <label class="layui-form-label">平台占比(%)</label>
<div class="layui-input-block"> <div class="layui-input-block">
@ -242,7 +242,7 @@
</div> </div>
<div class="layui-form-itemBox2 between-center"> <div class="layui-form-itemBox2 between-center layui-hide">
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">消费者占比(%)</label> <label class="layui-form-label">消费者占比(%)</label>
<div class="layui-input-block"> <div class="layui-input-block">
@ -252,11 +252,11 @@
</div> </div>
<fieldset class="layui-elem-field layui-field-title site-title"> <fieldset class="layui-elem-field layui-field-title site-title layui-hide">
<legend><a name="compatibility">(开启分销状态)请填写完整的整数 总和为100</a></legend> <legend><a name="compatibility">(开启分销状态)请填写完整的整数 总和为100</a></legend>
</fieldset> </fieldset>
<div class="layui-form-itemBox2 between-center"> <div class="layui-form-itemBox2 between-center layui-hide">
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">平台占比(%)</label> <label class="layui-form-label">平台占比(%)</label>
<div class="layui-input-block"> <div class="layui-input-block">
@ -266,7 +266,7 @@
</div> </div>
<div class="layui-form-itemBox2 between-center"> <div class="layui-form-itemBox2 between-center layui-hide">
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">(领券)分销者占比(%)</label> <label class="layui-form-label">(领券)分销者占比(%)</label>
<div class="layui-input-block"> <div class="layui-input-block">
@ -276,7 +276,7 @@
</div> </div>
<div class="layui-form-itemBox2 between-center"> <div class="layui-form-itemBox2 between-center layui-hide">
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">(核销)分销者占比(%)</label> <label class="layui-form-label">(核销)分销者占比(%)</label>
<div class="layui-input-block"> <div class="layui-input-block">

18
view/manager/coupon/edit.html
View File

@ -152,7 +152,7 @@
<div class="layui-input-inline " style="width: 450px"> <div class="layui-input-inline " style="width: 450px">
<textarea name="item[white_list]" rows="20" class="layui-textarea">{$item['white_list']}</textarea> <textarea name="item[white_list]" rows="20" class="layui-textarea">{$item['white_list']}</textarea>
</div> </div>
<div class="layui-form-mid layui-word-aux">填写后只有白名单能领取 一排填写一个 如:手机号-姓名 或者安格式粘贴到输入框中</div> <div class="layui-form-mid layui-word-aux">填写后只有白名单能领取 一排填写一个 如:手机号 或者安格式粘贴到输入框中</div>
</div> </div>
<!-- <fieldset class="layui-elem-field layui-field-title site-title layui-hide">--> <!-- <fieldset class="layui-elem-field layui-field-title site-title layui-hide">-->
<!-- <legend><a >处罚规则</a></legend>--> <!-- <legend><a >处罚规则</a></legend>-->
@ -227,11 +227,11 @@
</div> </div>
</div> </div>
<fieldset class="layui-elem-field layui-field-title site-title"> <fieldset class="layui-elem-field layui-field-title site-title layui-hide">
<legend><a name="compatibility">请填写完整整数 总和为100</a></legend> <legend><a name="compatibility">请填写完整整数 总和为100</a></legend>
</fieldset> </fieldset>
<div class="layui-form-itemBox2 between-center"> <div class="layui-form-itemBox2 between-center layui-hide">
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">渠道商占比(%)</label> <label class="layui-form-label">渠道商占比(%)</label>
<div class="layui-input-block"> <div class="layui-input-block">
@ -241,7 +241,7 @@
</div> </div>
<div class="layui-form-itemBox2 between-center"> <div class="layui-form-itemBox2 between-center layui-hide">
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">平台占比(%)</label> <label class="layui-form-label">平台占比(%)</label>
<div class="layui-input-block"> <div class="layui-input-block">
@ -251,7 +251,7 @@
</div> </div>
<div class="layui-form-itemBox2 between-center"> <div class="layui-form-itemBox2 between-center layui-hide">
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">消费者占比(%)</label> <label class="layui-form-label">消费者占比(%)</label>
<div class="layui-input-block"> <div class="layui-input-block">
@ -260,11 +260,11 @@
</div> </div>
</div> </div>
<fieldset class="layui-elem-field layui-field-title site-title"> <fieldset class="layui-elem-field layui-field-title site-title layui-hide">
<legend><a name="compatibility">(开启分销状态)请填写完整整数 总和为100</a></legend> <legend><a name="compatibility">(开启分销状态)请填写完整整数 总和为100</a></legend>
</fieldset> </fieldset>
<div class="layui-form-itemBox2 between-center"> <div class="layui-form-itemBox2 between-center layui-hide">
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">平台占比(%)</label> <label class="layui-form-label">平台占比(%)</label>
<div class="layui-input-block"> <div class="layui-input-block">
@ -274,7 +274,7 @@
</div> </div>
<div class="layui-form-itemBox2 between-center"> <div class="layui-form-itemBox2 between-center layui-hide">
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">(领券)分销者占比(%)</label> <label class="layui-form-label">(领券)分销者占比(%)</label>
<div class="layui-input-block"> <div class="layui-input-block">
@ -284,7 +284,7 @@
</div> </div>
<div class="layui-form-itemBox2 between-center"> <div class="layui-form-itemBox2 between-center layui-hide">
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">(核销)分销者占比(%)</label> <label class="layui-form-label">(核销)分销者占比(%)</label>
<div class="layui-input-block"> <div class="layui-input-block">