zhongyuanhaiju
/
admin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

中原海居问题处理 

//1，推荐的A位20%和D位5%直接赠送消费券
//2，用户注册时送的800积分，改为弹窗领取
//3，后台可以给会员充值积分
//4，会员30天内，直推上10万销量自动后台能看到，人工确定区县代理。count30dayA10w
//5，后台产品设置里，赠送的积分，购房券，贡献值要单个产品可以设置
This commit is contained in:
liqianjin 2023-04-23 18:20:22 +08:00
parent 76e336129a
commit 6f74702ea5
17 changed files with 325 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addon/fenxiao/api/controller/Fenxiao.php
View File

@ -250,11 +250,11 @@ class Fenxiao extends BaseApi
[ '', 'exp', Db::raw("( (fo.one_fenxiao_id = {$fenxiao_info['fenxiao_id']} AND fo.two_fenxiao_id = {$fenxiao_id}) OR (fo.two_fenxiao_id = {$fenxiao_info['fenxiao_id']} AND fo.three_fenxiao_id = {$fenxiao_id})) OR fo.member_id = {$sub_fenxiao_info['member_id']}") ]
];
} elseif (!empty($sub_member_id)) {
$is_sub_member = model('member')->getCount([ [ 'member_id', '=', $sub_member_id ], [ 'fenxiao_id', '=', $fenxiao_info[ 'fenxiao_id' ] ] ]);
$is_sub_member = model('member')->getCount([ [ 'member_id', '=', $sub_member_id ] ]);//, [ 'fenxiao_id', '=', $fenxiao_info[ 'fenxiao_id' ] ]
if (!$is_sub_member) return $this->response($this->error('', 'NOT_EXIST_FENXIAO_RELATION'));
$condition = [
[ 'fo.one_fenxiao_id', '=', $fenxiao_info[ 'fenxiao_id' ] ],
// [ 'fo.one_fenxiao_id', '=', $fenxiao_info[ 'fenxiao_id' ] ],
[ 'fo.member_id', '=', $sub_member_id ]
];
}

3
addon/fenxiao/config/event.php
View File

@ -88,6 +88,9 @@ return [
'AreaMonthlyReward'=>[ //区域代理月结
'addon\fenxiao\event\AutoAreaMonthlyReward', //区域代理月结
],
'count30dayA10w'=>[ //日计算会员30天内，直推上10万销量
'addon\fenxiao\event\count30dayA10w',
],
],
'subscribe' => [

23
addon/fenxiao/event/count30dayA10w.php Normal file
View File

@ -0,0 +1,23 @@
<?php
/**
* SAAS应用系统 --- 十年开发经验汇集巨献!
* ==========================================================
* Copy right 2020-2050 成都众联思索科技有限公司,保留所有权利。
* ----------------------------------------------------------
* 官方网址: https://www.zoomtk.com
* 这不是自由软件！未经允许不得用于商业目或程序代码摘取及修改。
* 任何企业和个人未经允许对程序代码以任何形式任何目的再发布传播。
* 唯一发布渠道www.zoomtk.com;非官方渠道统一视为侵权行为。
* ==========================================================
*/
namespace addon\fenxiao\event;
use addon\fenxiao\model\FenxiaoOrder;
class count30dayA10w
{
public function handle()
{
$fenxiao_order_model = new FenxiaoOrder();
$res = $fenxiao_order_model->count30dayA10w();
return $res;
}
}

2
addon/fenxiao/model/Config.php
View File

@ -43,8 +43,10 @@ class Config extends BaseModel
'order_give_house_purchase_ratio' => $data['order_give_house_purchase_ratio'],
'order_give_a_points_ratio' => $data['order_give_a_points_ratio'],
'order_give_a_contribution_ratio' => $data['order_give_a_contribution_ratio'],
'order_give_a_balance_money_ratio' => $data['order_give_a_balance_money_ratio'],
'order_give_d_points_ratio' => $data['order_give_d_points_ratio'],
'order_give_d_contribution_ratio' => $data['order_give_d_contribution_ratio'],
'order_give_d_balance_money_ratio' => $data['order_give_d_balance_money_ratio'],
'no_contribution_points_ratio' => $data['no_contribution_points_ratio'],
'contribution_points_ratio' => $data['contribution_points_ratio'],
'settlement_points_to_balance_money_ratio' => $data['settlement_points_to_balance_money_ratio'],

46
addon/fenxiao/model/FenxiaoOrder.php
View File

@ -22,6 +22,32 @@ use think\facade\Log;
*/
class FenxiaoOrder extends BaseModel
{
public function count30dayA10w(){
$nowTime = time();
$fenxiao_list = model('fenxiao')->getList(
[
['o.create_time', '<' ,$nowTime],
['o.create_time', '>' ,$nowTime - 30 * 24 * 60 * 60],
],
'pf.fenxiao_id,pf.fenxiao_name, sum(o.order_money) as sum_order_money',
'',
'f',
[
['order o','o.member_id = f.member_id','right'],
['fenxiao pf','pf.fenxiao_id = f.parent','left'],
],
'f.parent'
);
foreach($fenxiao_list as $fenxiao){
if($fenxiao['fenxiao_id'] == NULL){
continue;
}
if($fenxiao['sum_order_money'] >= 100000){
model('fenxiao')->update(['is_30day_a_10w' => 1], [['fenxiao_id', '=', $fenxiao['fenxiao_id']]]);
}
}
return $this->success();
}
/***
* 区域代理结算
* 月结
@ -293,10 +319,12 @@ class FenxiaoOrder extends BaseModel
if ($i_fenxiao) {
$config_model = new Config();
$basic_config = $config_model->getFenxiaoBasicsConfig($order['site_id'])['data']['value'];
$goods_info = model('goods')->getInfo([['goods_id', '=', $order['goods_id']]]);
$fenxiao_account = new FenxiaoAccount();
$fenxiao_account->addAccount($i_fenxiao['fenxiao_id'], $i_fenxiao['fenxiao_name'], 'points', $order['real_goods_money'] * $basic_config['order_give_points_ratio'] /100, $order['order_id'],'points', '购物赠送积分');
$fenxiao_account->addAccount($i_fenxiao['fenxiao_id'], $i_fenxiao['fenxiao_name'], 'contribution', $order['real_goods_money'] * $basic_config['order_give_contribution_ratio'] /100, $order['order_id'],'contribution', '购物赠送贡献值');
$fenxiao_account->addAccount($i_fenxiao['fenxiao_id'], $i_fenxiao['fenxiao_name'], 'house_purchase', $order['real_goods_money'] * $basic_config['order_give_house_purchase_ratio'] /100, $order['order_id'],'house_purchase', '购物赠送购房券');
$menber_account = new MemberAccount();
$fenxiao_account->addAccount($i_fenxiao['fenxiao_id'], $i_fenxiao['fenxiao_name'], 'points', $order['real_goods_money'] * $goods_info['order_give_points_ratio'] /100, $order['order_id'],'points', '购物赠送积分');
$fenxiao_account->addAccount($i_fenxiao['fenxiao_id'], $i_fenxiao['fenxiao_name'], 'contribution', $order['real_goods_money'] * $goods_info['order_give_contribution_ratio'] /100, $order['order_id'],'contribution', '购物赠送贡献值');
$fenxiao_account->addAccount($i_fenxiao['fenxiao_id'], $i_fenxiao['fenxiao_name'], 'house_purchase', $order['real_goods_money'] * $goods_info['order_give_house_purchase_ratio'] /100, $order['order_id'],'house_purchase', '购物赠送购房券');
$parent_fenxiao['parent'] = $i_fenxiao['parent'];
for($i = 0;$i < 4;$i++){
@ -308,12 +336,16 @@ class FenxiaoOrder extends BaseModel
break;
}
if($i == 0){
$fenxiao_account->addAccount($parent_fenxiao['fenxiao_id'], $parent_fenxiao['fenxiao_name'], 'points', $order['real_goods_money'] * $basic_config['order_give_a_points_ratio'] /100, $order['order_id'],'points', '用户下单分享A位置获赠积分');
$fenxiao_account->addAccount($parent_fenxiao['fenxiao_id'], $parent_fenxiao['fenxiao_name'], 'contribution', $order['real_goods_money'] * $basic_config['order_give_a_contribution_ratio'] /100, $order['order_id'],'contribution', '用户下单分享A位置获赠贡献值');
// $fenxiao_account->addAccount($parent_fenxiao['fenxiao_id'], $parent_fenxiao['fenxiao_name'], 'points', $order['real_goods_money'] * $basic_config['order_give_a_points_ratio'] /100, $order['order_id'],'points', '用户下单分享A位置获赠积分');
// $fenxiao_account->addAccount($parent_fenxiao['fenxiao_id'], $parent_fenxiao['fenxiao_name'], 'contribution', $order['real_goods_money'] * $basic_config['order_give_a_contribution_ratio'] /100, $order['order_id'],'contribution', '用户下单分享A位置获赠贡献值');
$menber_account->addMemberAccount($parent_fenxiao[ 'site_id' ], $parent_fenxiao['member_id'], 'balance_money', $order['real_goods_money'] * $basic_config['order_give_a_balance_money_ratio'] /100, 'order_give_a', '下单A位置得消费券', '下单A位置得消费券');
}
if($i == 3){
$fenxiao_account->addAccount($parent_fenxiao['fenxiao_id'], $parent_fenxiao['fenxiao_name'], 'points', $order['real_goods_money'] * $basic_config['order_give_d_points_ratio'] /100, $order['order_id'],'points', '用户下单分享D位置获赠积分');
$fenxiao_account->addAccount($parent_fenxiao['fenxiao_id'], $parent_fenxiao['fenxiao_name'], 'contribution', $order['real_goods_money'] * $basic_config['order_give_d_contribution_ratio'] /100, $order['order_id'],'contribution', '用户下单分享D位置获赠贡献值');
// $fenxiao_account->addAccount($parent_fenxiao['fenxiao_id'], $parent_fenxiao['fenxiao_name'], 'points', $order['real_goods_money'] * $basic_config['order_give_d_points_ratio'] /100, $order['order_id'],'points', '用户下单分享D位置获赠积分');
// $fenxiao_account->addAccount($parent_fenxiao['fenxiao_id'], $parent_fenxiao['fenxiao_name'], 'contribution', $order['real_goods_money'] * $basic_config['order_give_d_contribution_ratio'] /100, $order['order_id'],'contribution', '用户下单分享D位置获赠贡献值');
$menber_account->addMemberAccount($parent_fenxiao[ 'site_id' ], $parent_fenxiao['member_id'], 'balance_money', $order['real_goods_money'] * $basic_config['order_give_d_balance_money_ratio'] /100, 'order_give_d', '下单D位置得消费券', '下单D位置得消费券');
}
}
}

2
addon/fenxiao/shop/controller/Config.php
View File

@ -55,8 +55,10 @@ class Config extends BaseShop
'order_give_house_purchase_ratio' => input('order_give_house_purchase_ratio', 0),
'order_give_a_points_ratio' => input('order_give_a_points_ratio', 0),
'order_give_a_contribution_ratio' => input('order_give_a_contribution_ratio', 0),
'order_give_a_balance_money_ratio' => input('order_give_a_balance_money_ratio', 0),
'order_give_d_points_ratio' => input('order_give_d_points_ratio', 0),
'order_give_d_contribution_ratio' => input('order_give_d_contribution_ratio', 0),
'order_give_d_balance_money_ratio' => input('order_give_d_balance_money_ratio', 0),
'no_contribution_points_ratio' => input('no_contribution_points_ratio', 0),
'contribution_points_ratio' => input('contribution_points_ratio', 0),
'settlement_points_to_balance_money_ratio' => input('settlement_points_to_balance_money_ratio', 0),

20
addon/fenxiao/shop/controller/Fenxiao.php
View File

@ -143,6 +143,10 @@ class Fenxiao extends BaseShop
if (!empty($status)) {
$condition[] = [ 'f.status', '=', $status ];
}
$is_30day_a_10w = input('is_30day_a_10w', '');
if (!empty($is_30day_a_10w)) {
$condition[] = [ 'f.is_30day_a_10w', '=', $is_30day_a_10w ];
}
$page = input('page', 1);
$page_size = input('page_size', PAGE_LIST_ROWS);
$list = $model->getFenxiaoPageList($condition, $page, $page_size, 'f.create_time desc');
@ -157,6 +161,8 @@ class Fenxiao extends BaseShop
$basics = $config_model->getFenxiaoBasicsConfig($this->site_id);
$this->assign("basics_info", $basics[ 'data' ][ 'value' ]);
$this->assign("is_30day_a_10w", input('is_30day_a_10w',0));
// $this->forthMenu();
return $this->fetch('fenxiao/lists');
}
@ -697,4 +703,18 @@ class Fenxiao extends BaseShop
$fenxiao_account_model = new FenxiaoAccount();
return $fenxiao_account_model->addAccount($fenxiao['fenxiao_id'], $fenxiao['fenxiao_name'], 'house_purchase', -$adjust_num, $fenxiao['fenxiao_id'], 'house_purchase', $remark);
}
/**
* 积分
*/
public function adjustPoints()
{
$fenxiao_id = input('fenxiao_id', 0);
$adjust_num = input('adjust_num', 0);
// $remark = input('remark', '商家调整');
$remark = '后台充值';
// $this->addLog("会员消费券调整id:" . $member_id . "金额" . $adjust_num);
$fenxiao = model('fenxiao')->getInfo(['fenxiao_id' => $fenxiao_id, 'site_id' => $this->site_id], 'fenxiao_id,fenxiao_name,parent,grand_parent');
$fenxiao_account_model = new FenxiaoAccount();
return $fenxiao_account_model->addAccount($fenxiao['fenxiao_id'], $fenxiao['fenxiao_name'], 'points', $adjust_num, $fenxiao['fenxiao_id'], 'points', $remark);
}
}

132
addon/fenxiao/shop/view/config/basics.html
View File

@ -21,76 +21,96 @@
</div>
<div class="word-aux ">新用户赠送积分</div>
</div>
<!-- <div class="layui-form-item">-->
<!-- <label class="layui-form-label">下单赠送积分：</label>-->
<!-- <div class="layui-input-block">-->
<!-- <div class="layui-input-inline">-->
<!-- <input type="number" name="order_give_points_ratio" class="layui-input ns-len-mid" value="{$basics_info.order_give_points_ratio??0}" />-->
<!-- </div>-->
<!-- <div class="layui-form-mid">%</div>-->
<!-- </div>-->
<!-- <div class="word-aux ">下单赠送积分，得消费额百分比</div>-->
<!-- </div>-->
<!-- <div class="layui-form-item">-->
<!-- <label class="layui-form-label">下单赠送贡献值：</label>-->
<!-- <div class="layui-input-block">-->
<!-- <div class="layui-input-inline">-->
<!-- <input type="number" name="order_give_contribution_ratio" class="layui-input ns-len-mid" value="{$basics_info.order_give_contribution_ratio??0}" />-->
<!-- </div>-->
<!-- <div class="layui-form-mid">%</div>-->
<!-- </div>-->
<!-- <div class="word-aux ">下单赠送贡献值，得消费额百分比</div>-->
<!-- </div>-->
<!-- <div class="layui-form-item">-->
<!-- <label class="layui-form-label">下单赠送购房券：</label>-->
<!-- <div class="layui-input-block">-->
<!-- <div class="layui-input-inline">-->
<!-- <input type="number" name="order_give_house_purchase_ratio" class="layui-input ns-len-mid" value="{$basics_info.order_give_house_purchase_ratio??0}" />-->
<!-- </div>-->
<!-- <div class="layui-form-mid">%</div>-->
<!-- </div>-->
<!-- <div class="word-aux ">下单赠送购房券，得消费额百分比</div>-->
<!-- </div>-->
<!-- <div class="layui-form-item">-->
<!-- <label class="layui-form-label">下单A位置得积分：</label>-->
<!-- <div class="layui-input-block">-->
<!-- <div class="layui-input-inline">-->
<!-- <input type="number" name="order_give_a_points_ratio" class="layui-input ns-len-mid" value="{$basics_info.order_give_a_points_ratio??0}" />-->
<!-- </div>-->
<!-- <div class="layui-form-mid">%</div>-->
<!-- </div>-->
<!-- <div class="word-aux ">下单分享A位置得积分，得消费额百分比</div>-->
<!-- </div>-->
<!-- <div class="layui-form-item">-->
<!-- <label class="layui-form-label">下单A位置得贡献值：</label>-->
<!-- <div class="layui-input-block">-->
<!-- <div class="layui-input-inline">-->
<!-- <input type="number" name="order_give_a_contribution_ratio" class="layui-input ns-len-mid" value="{$basics_info.order_give_a_contribution_ratio??0}" />-->
<!-- </div>-->
<!-- <div class="layui-form-mid">%</div>-->
<!-- </div>-->
<!-- <div class="word-aux ">下单分享A位置得贡献值，得消费额百分比</div>-->
<!-- </div>-->
<div class="layui-form-item">
<label class="layui-form-label">下单赠送积分：</label>
<label class="layui-form-label">下单A位置得消费券：</label>
<div class="layui-input-block">
<div class="layui-input-inline">
<input type="number" name="order_give_points_ratio" class="layui-input ns-len-mid" value="{$basics_info.order_give_points_ratio??0}" />
<input type="number" name="order_give_a_balance_money_ratio" class="layui-input ns-len-mid" value="{$basics_info.order_give_a_balance_money_ratio??0}" />
</div>
<div class="layui-form-mid">%</div>
</div>
<div class="word-aux ">下单赠送积分，得消费额百分比</div>
<div class="word-aux ">下单分享A位置得消费券，得消费额百分比</div>
</div>
<!-- <div class="layui-form-item">-->
<!-- <label class="layui-form-label">下单D位置得积分：</label>-->
<!-- <div class="layui-input-block">-->
<!-- <div class="layui-input-inline">-->
<!-- <input type="number" name="order_give_d_points_ratio" class="layui-input ns-len-mid" value="{$basics_info.order_give_d_points_ratio??0}" />-->
<!-- </div>-->
<!-- <div class="layui-form-mid">%</div>-->
<!-- </div>-->
<!-- <div class="word-aux ">下单分享D位置得积分，得消费额百分比</div>-->
<!-- </div>-->
<div class="layui-form-item">
<label class="layui-form-label">下单赠送贡献值：</label>
<label class="layui-form-label">下单D位置得消费券：</label>
<div class="layui-input-block">
<div class="layui-input-inline">
<input type="number" name="order_give_contribution_ratio" class="layui-input ns-len-mid" value="{$basics_info.order_give_contribution_ratio??0}" />
<input type="number" name="order_give_d_balance_money_ratio" class="layui-input ns-len-mid" value="{$basics_info.order_give_d_balance_money_ratio??0}" />
</div>
<div class="layui-form-mid">%</div>
</div>
<div class="word-aux ">下单赠送贡献值，得消费额百分比</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">下单赠送购房券：</label>
<div class="layui-input-block">
<div class="layui-input-inline">
<input type="number" name="order_give_house_purchase_ratio" class="layui-input ns-len-mid" value="{$basics_info.order_give_house_purchase_ratio??0}" />
</div>
<div class="layui-form-mid">%</div>
</div>
<div class="word-aux ">下单赠送购房券，得消费额百分比</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">下单A位置得积分：</label>
<div class="layui-input-block">
<div class="layui-input-inline">
<input type="number" name="order_give_a_points_ratio" class="layui-input ns-len-mid" value="{$basics_info.order_give_a_points_ratio??0}" />
</div>
<div class="layui-form-mid">%</div>
</div>
<div class="word-aux ">下单分享A位置得积分，得消费额百分比</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">下单A位置得贡献值：</label>
<div class="layui-input-block">
<div class="layui-input-inline">
<input type="number" name="order_give_a_contribution_ratio" class="layui-input ns-len-mid" value="{$basics_info.order_give_a_contribution_ratio??0}" />
</div>
<div class="layui-form-mid">%</div>
</div>
<div class="word-aux ">下单分享A位置得贡献值，得消费额百分比</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">下单D位置得积分：</label>
<div class="layui-input-block">
<div class="layui-input-inline">
<input type="number" name="order_give_d_points_ratio" class="layui-input ns-len-mid" value="{$basics_info.order_give_d_points_ratio??0}" />
</div>
<div class="layui-form-mid">%</div>
</div>
<div class="word-aux ">下单分享D位置得积分，得消费额百分比</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">下单D位置得贡献值：</label>
<div class="layui-input-block">
<div class="layui-input-inline">
<input type="number" name="order_give_d_contribution_ratio" class="layui-input ns-len-mid" value="{$basics_info.order_give_d_contribution_ratio??0}" />
</div>
<div class="layui-form-mid">%</div>
</div>
<div class="word-aux ">下单分享D位置得贡献值，得消费额百分比</div>
<div class="word-aux ">下单分享D位置得消费券，得消费额百分比</div>
</div>
<!-- <div class="layui-form-item">-->
<!-- <label class="layui-form-label">下单D位置得贡献值：</label>-->
<!-- <div class="layui-input-block">-->
<!-- <div class="layui-input-inline">-->
<!-- <input type="number" name="order_give_d_contribution_ratio" class="layui-input ns-len-mid" value="{$basics_info.order_give_d_contribution_ratio??0}" />-->
<!-- </div>-->
<!-- <div class="layui-form-mid">%</div>-->
<!-- </div>-->
<!-- <div class="word-aux ">下单分享D位置得贡献值，得消费额百分比</div>-->
<!-- </div>-->
<div class="layui-card-header">
<span class="card-title">每日转换设置</span>
</div>

81
addon/fenxiao/shop/view/fenxiao/lists.html
View File

@ -123,6 +123,38 @@
</div>
</script>
<!-- 余额弹框html -->
<script type="text/html" id="point">
<div class="layui-form">
<div class="layui-form-item">
<label class="layui-form-label">当前积分：</label>
<div class="layui-input-block account-value">{{ d.points }}</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">充值数额：</label>
<div class="layui-input-block">
<input type="number" value="0" placeholder="请输入充值数额" name="adjust_num" lay-verify="num" class="layui-input len-short">
</div>
<span class="word-aux">核销数额不可小于等于0，核销数额与当前购房券相减不能小于0</span>
</div>
<!-- <div class="layui-form-item">-->
<!-- <label class="layui-form-label">备注：</label>-->
<!-- <div class="layui-input-block len-long">-->
<!-- <textarea class="layui-textarea" name="remark" placeholder="请输入备注" maxlength="150"></textarea>-->
<!-- </div>-->
<!-- </div>-->
<div class="form-row">
<button class="layui-btn" lay-submit lay-filter="savePoints">确定</button>
</div>
<input type="hidden" name="fenxiao_id" value="{{d.fenxiao_id}}" />
<input type="hidden" name="house_purchase" value="{{ d.house_purchase }}" />
</div>
</script>
<!-- 用户信息 -->
<script type="text/html" id="account">
<div class="layui-elip">当前佣金：{{d.account}}</div>
@ -177,6 +209,7 @@
<div class="table-btn">
<a class="layui-btn" lay-event="detail">查看</a>
<a class="layui-btn" lay-event="adjust_house_purchase">核销购房券</a>
<a class="layui-btn" lay-event="adjust_points">充值积分</a>
{{# if(d.status == 1){ }}
<a class="layui-btn" lay-event="frozen">冻结</a>
<!-- <a class="layui-btn" lay-event="change">上级分销商变更</a> -->
@ -210,7 +243,7 @@
table = new Table({
elem: '#fenxiao_list',
url: ns.url("fenxiao://shop/fenxiao/lists"),
url: ns.url("fenxiao://shop/fenxiao/lists",{is_30day_a_10w:1}),
cols: [
[{
title: '会员信息',
@ -381,6 +414,9 @@
case 'adjust_house_purchase': //调整消费券
adjustBalance(data);
break;
case 'adjust_points': //调整积分
adjustPoint(data);
break;
}
});
var repeat_flag_balance = false;
@ -408,6 +444,37 @@
layer.msg(res.message);
repeat_flag_balance = false;
if (res.code == 0) {
layer.closeAll('page');
table.reload();
}
}
});
});
form.on('submit(savePoints)', function(data) {
if (repeat_flag_balance) return false;
repeat_flag_balance = true;
var house_purchase = data.field.house_purchase;
if (data.field.adjust_num <= 0) {
layer.msg('充值数值不能为负数');
repeat_flag_balance = false;
return ;
}
// if (house_purchase*1 - data.field.adjust_num*1 < 0) {
// layer.msg('购房券不足，不可以为负数');
// repeat_flag_balance = false;
// return ;
// }
$.ajax({
type: "POST",
url: ns.url("fenxiao://shop/fenxiao/adjustPoints"),
data: data.field,
dataType: 'JSON',
success: function(res) {
layer.msg(res.message);
repeat_flag_balance = false;
if (res.code == 0) {
layer.closeAll('page');
table.reload();
@ -467,6 +534,18 @@
});
});
}
// 调整消费券
function adjustPoint(e){
laytpl($("#point").html()).render(e, function(html) {
layer.open({
title: '充值积分',
skin: 'layer-tips-class',
type: 1,
area: ['800px'],
content: html
});
});
}
</script>
{/block}

6
app/model/goods/Goods.php
View File

@ -145,6 +145,9 @@ class Goods extends BaseModel
'support_trade_type' => $data[ 'support_trade_type' ] ?? '',
'sale_channel' => $data[ 'sale_channel' ] ?? 'all',
'sale_store' => $data[ 'sale_store' ] ?? 'all',
'order_give_points_ratio' => $data[ 'order_give_points_ratio' ] ?? '0',
'order_give_contribution_ratio' => $data[ 'order_give_contribution_ratio' ] ?? '0',
'order_give_house_purchase_ratio' => $data[ 'order_give_house_purchase_ratio' ] ?? '0',
);
$goods_id = model('goods')->add(array_merge($goods_data, $common_data));
@ -340,6 +343,9 @@ class Goods extends BaseModel
'support_trade_type' => $data[ 'support_trade_type' ] ?? '',
'sale_channel' => $data[ 'sale_channel' ] ?? 'all',
'sale_store' => $data[ 'sale_store' ] ?? 'all',
'order_give_points_ratio' => $data[ 'order_give_points_ratio' ] ?? '0',
'order_give_contribution_ratio' => $data[ 'order_give_contribution_ratio' ] ?? '0',
'order_give_house_purchase_ratio' => $data[ 'order_give_house_purchase_ratio' ] ?? '0',
);
model('goods')->update(array_merge($goods_data, $common_data), [ [ 'goods_id', '=', $goods_id ], [ 'goods_class', '=', $this->goods_class[ 'id' ] ] ]);
$goods_stock = 0;

3
app/model/member/MemberAccount.php
View File

@ -125,6 +125,9 @@ class MemberAccount extends BaseModel
$from_type[ 'balance_money' ][ 'goufang_to_balance' ] = [ 'type_name' => '购房券转换', 'type_url' => '' ];
$from_type[ 'balance_money' ][ 'transfer' ] = [ 'type_name' => '会员互转', 'type_url' => '' ];
$from_type[ 'balance_money' ][ 'order_give_a' ] = [ 'type_name' => '下单A位置得消费券', 'type_url' => '' ];
$from_type[ 'balance_money' ][ 'order_give_d' ] = [ 'type_name' => '下单D位置得消费券', 'type_url' => '' ];
$this->from_type = $from_type;
}

6
app/shop/controller/Goods.php
View File

@ -308,6 +308,9 @@ class Goods extends BaseShop
'sale_channel' => input('sale_channel','all'),
'sale_store' => input('sale_store','all'),
'is_unify_pirce' => input('is_unify_pirce','1'),
'order_give_points_ratio' => input('order_give_points_ratio','0'),
'order_give_contribution_ratio' => input('order_give_contribution_ratio','0'),
'order_give_house_purchase_ratio' => input('order_give_house_purchase_ratio','0'),
];
$goods_model = new GoodsModel();
$res = $goods_model->addGoods($data);
@ -445,6 +448,9 @@ class Goods extends BaseShop
'sale_channel' => input('sale_channel','all'),
'sale_store' => input('sale_store','all'),
'is_unify_pirce' => input('is_unify_pirce','1'),
'order_give_points_ratio' => input('order_give_points_ratio','0'),
'order_give_contribution_ratio' => input('order_give_contribution_ratio','0'),
'order_give_house_purchase_ratio' => input('order_give_house_purchase_ratio','0'),
];
$res = $goods_model->editGoods($data);

31
app/shop/view/goods/add_goods.html
View File

@ -641,6 +641,37 @@
</div>
</div>
{/if}
<div class="layui-form-item">
<label class="layui-form-label">下单赠送积分：</label>
<div class="layui-input-block">
<div class="layui-input-inline">
<input type="number" name="order_give_points_ratio" class="layui-input ns-len-mid" value="{$basics_info.order_give_points_ratio??0}" />
</div>
<div class="layui-form-mid">%</div>
</div>
<div class="word-aux ">下单赠送积分，得消费额百分比</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">下单赠送贡献值：</label>
<div class="layui-input-block">
<div class="layui-input-inline">
<input type="number" name="order_give_contribution_ratio" class="layui-input ns-len-mid" value="{$basics_info.order_give_contribution_ratio??0}" />
</div>
<div class="layui-form-mid">%</div>
</div>
<div class="word-aux ">下单赠送贡献值，得消费额百分比</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">下单赠送购房券：</label>
<div class="layui-input-block">
<div class="layui-input-inline">
<input type="number" name="order_give_house_purchase_ratio" class="layui-input ns-len-mid" value="{$basics_info.order_give_house_purchase_ratio??0}" />
</div>
<div class="layui-form-mid">%</div>
</div>
<div class="word-aux ">下单赠送购房券，得消费额百分比</div>
</div>
</div>
</div>

31
app/shop/view/goods/edit_goods.html
View File

@ -711,6 +711,37 @@
</div>
</div>
{/if}
<div class="layui-form-item">
<label class="layui-form-label">下单赠送积分：</label>
<div class="layui-input-block">
<div class="layui-input-inline">
<input type="number" name="order_give_points_ratio" class="layui-input ns-len-mid" value="{$goods_info.order_give_points_ratio??0}" />
</div>
<div class="layui-form-mid">%</div>
</div>
<div class="word-aux ">下单赠送积分，得消费额百分比</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">下单赠送贡献值：</label>
<div class="layui-input-block">
<div class="layui-input-inline">
<input type="number" name="order_give_contribution_ratio" class="layui-input ns-len-mid" value="{$goods_info.order_give_contribution_ratio??0}" />
</div>
<div class="layui-form-mid">%</div>
</div>
<div class="word-aux ">下单赠送贡献值，得消费额百分比</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">下单赠送购房券：</label>
<div class="layui-input-block">
<div class="layui-input-inline">
<input type="number" name="order_give_house_purchase_ratio" class="layui-input ns-len-mid" value="{$goods_info.order_give_house_purchase_ratio??0}" />
</div>
<div class="layui-form-mid">%</div>
</div>
<div class="word-aux ">下单赠送购房券，得消费额百分比</div>
</div>
</div>
</div>

BIN
app/shop/view/public/img/login/new_member.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 133 KiB

2
app/shop/view/public/js/goods_list.js
View File

@ -726,7 +726,7 @@ function refreshTable() {
function add() {
// location.href = ns.url('shop/goods/addGoods');
location.href = ns.url('cardservice://shop/card/addgoods');
location.href = ns.url('shop/goods/addgoods');
// var html = $("#selectAddGoods").html();
// laytpl(html).render({}, function (html) {
// layer.open({

BIN
public/uniapp/form/banner.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 71 KiB

After

Width:  |  Height:  |  Size: 163 KiB