From 7cc8876a0b17c6d38cd084d3a44948b92a43116d Mon Sep 17 00:00:00 2001 From: liqianjin <949671634@qq.com> Date: Fri, 5 May 2023 14:41:50 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E4=BD=8D?= =?UTF-8?q?=E7=BD=AE=E8=B5=A0=E9=80=81bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addon/fenxiao/model/FenxiaoOrder.php | 8 ++++---- addon/fenxiao/shop/view/fenxiao/lists.html | 2 +- app/pay/controller/LqjTest.php | 10 ++++++++++ app/shop/view/goods/add_goods.html | 12 ++++++------ app/shop/view/goods/edit_goods.html | 12 ++++++------ 5 files changed, 27 insertions(+), 17 deletions(-) diff --git a/addon/fenxiao/model/FenxiaoOrder.php b/addon/fenxiao/model/FenxiaoOrder.php index 230e1df..ea2b330 100644 --- a/addon/fenxiao/model/FenxiaoOrder.php +++ b/addon/fenxiao/model/FenxiaoOrder.php @@ -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; } diff --git a/addon/fenxiao/shop/view/fenxiao/lists.html b/addon/fenxiao/shop/view/fenxiao/lists.html index dc6e085..a5b25ef 100644 --- a/addon/fenxiao/shop/view/fenxiao/lists.html +++ b/addon/fenxiao/shop/view/fenxiao/lists.html @@ -145,7 +145,7 @@
- 核销数额不可小于等于0，核销数额与当前购房券相减不能小于0 + 充值积分 diff --git a/app/pay/controller/LqjTest.php b/app/pay/controller/LqjTest.php index a55140f..139f868 100644 --- a/app/pay/controller/LqjTest.php +++ b/app/pay/controller/LqjTest.php @@ -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')); + } } \ No newline at end of file diff --git a/app/shop/view/goods/add_goods.html b/app/shop/view/goods/add_goods.html index 2a5d486..fc30b3c 100644 --- a/app/shop/view/goods/add_goods.html +++ b/app/shop/view/goods/add_goods.html @@ -648,9 +648,9 @@
-
%
+ -
下单赠送积分，得消费额百分比
+
下单赠送积分
@@ -658,9 +658,9 @@
-
%
+
-
下单赠送贡献值，得消费额百分比
+
下单赠送贡献值
@@ -668,9 +668,9 @@
-
%
+
-
下单赠送购房券，得消费额百分比
+
下单赠送购房券
diff --git a/app/shop/view/goods/edit_goods.html b/app/shop/view/goods/edit_goods.html index 7cc0977..6321683 100644 --- a/app/shop/view/goods/edit_goods.html +++ b/app/shop/view/goods/edit_goods.html @@ -718,9 +718,9 @@
-
%
+ -
下单赠送积分，得消费额百分比
+
下单赠送积分
@@ -728,9 +728,9 @@
-
%
+
-
下单赠送贡献值，得消费额百分比
+
下单赠送贡献值
@@ -738,9 +738,9 @@
-
%
+
-
下单赠送购房券，得消费额百分比
+
下单赠送购房券