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

【修改】位置赠送bug

This commit is contained in:
liqianjin 2023-05-05 14:41:50 +08:00
parent 8c4884122a
commit 7cc8876a0b
5 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -322,16 +322,16 @@ class FenxiaoOrder extends BaseModel
$goods_info = model('goods')->getInfo([['goods_id', '=', $order['goods_id']]]);
$fenxiao_account = new FenxiaoAccount();
$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', '购物赠送购房券');
$fenxiao_account->addAccount($i_fenxiao['fenxiao_id'], $i_fenxiao['fenxiao_name'], 'points',$order['num'] * $goods_info['order_give_points_ratio'], $order['order_id'],'points', '购物赠送积分');
$fenxiao_account->addAccount($i_fenxiao['fenxiao_id'], $i_fenxiao['fenxiao_name'], 'contribution',$order['num'] * $goods_info['order_give_contribution_ratio'], $order['order_id'],'contribution', '购物赠送贡献值');
$fenxiao_account->addAccount($i_fenxiao['fenxiao_id'], $i_fenxiao['fenxiao_name'], 'house_purchase',$order['num'] * $goods_info['order_give_house_purchase_ratio'], $order['order_id'],'house_purchase', '购物赠送购房券');
$parent_fenxiao['parent'] = $i_fenxiao['parent'];
for($i = 0;$i < 4;$i++){
if($parent_fenxiao['parent'] <= 0){
break;
}
$parent_fenxiao = model('fenxiao')->getInfo(['fenxiao_id' => $parent_fenxiao['parent']], 'fenxiao_id,fenxiao_name,parent,grand_parent');
$parent_fenxiao = model('fenxiao')->getInfo(['fenxiao_id' => $parent_fenxiao['parent']], 'fenxiao_id,fenxiao_name,parent,grand_parent,site_id,member_id');
if(!$parent_fenxiao){
break;
}

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

@ -145,7 +145,7 @@
<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>
<span class="word-aux">充值积分</span>
</div>
<!-- <div class="layui-form-item">-->

10
app/pay/controller/LqjTest.php
View File

@ -12,6 +12,7 @@
*/
namespace app\pay\controller;
use addon\fenxiao\model\FenxiaoOrder;
use app\Controller;
use addon\aliapp\model\CloudPay;
class LqjTest extends Controller
@ -91,4 +92,13 @@ class LqjTest extends Controller
var_dump($res);
}
}
public function testcalculate(){
// dd(model('order')->getInfo([['order_id', '=', 23]]));
$fenxiao_order = new FenxiaoOrder();
$fenxiao_order->calculate(model('order')->getInfo([['order_id', '=', 23]]));
}
public function testcount30dayA10w(){
dd(event('count30dayA10w'));
}
}

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

@ -648,9 +648,9 @@
<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 class="layui-form-mid">%</div>-->
</div>
<div class="word-aux ">下单赠送积分，得消费额百分比</div>
<div class="word-aux ">下单赠送积分</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">下单赠送贡献值：</label>
@ -658,9 +658,9 @@
<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 class="layui-form-mid">%</div>-->
</div>
<div class="word-aux ">下单赠送贡献值，得消费额百分比</div>
<div class="word-aux ">下单赠送贡献值</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">下单赠送购房券：</label>
@ -668,9 +668,9 @@
<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 class="layui-form-mid">%</div>-->
</div>
<div class="word-aux ">下单赠送购房券，得消费额百分比</div>
<div class="word-aux ">下单赠送购房券</div>
</div>
</div>

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

@ -718,9 +718,9 @@
<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 class="layui-form-mid">%</div>-->
</div>
<div class="word-aux ">下单赠送积分，得消费额百分比</div>
<div class="word-aux ">下单赠送积分</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">下单赠送贡献值：</label>
@ -728,9 +728,9 @@
<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 class="layui-form-mid">%</div>-->
</div>
<div class="word-aux ">下单赠送贡献值，得消费额百分比</div>
<div class="word-aux ">下单赠送贡献值</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">下单赠送购房券：</label>
@ -738,9 +738,9 @@
<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 class="layui-form-mid">%</div>-->
</div>
<div class="word-aux ">下单赠送购房券，得消费额百分比</div>
<div class="word-aux ">下单赠送购房券</div>
</div>
</div>