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 @@
 			<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">-->
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 @@
 							<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>
 
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 @@
 							<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>