1

app/admin/controller/store/StoreProduct.php

@@ -86,7 +86,6 @@ class StoreProduct extends AuthController
 
         if ($type == null) $type = 1;
         $adminInfo = $this->adminInfo;
-        @file_put_contents('quanju.txt',  json_encode($adminInfo)."-管理员信息\r\n", 8);
 
         $mer_id = $adminInfo['mer_id'];
         $this->assign('mer_id', $mer_id); // 传递 mer_id
@@ -515,7 +514,7 @@ class StoreProduct extends AuthController
             Form::number('postage', '邮费', $product->getData('postage'))->min(0)->col(8),
             Form::number('sales', '销量', $product->getData('sales'))->min(0)->precision(0)->col(8)->readonly(1),
             Form::number('ficti', '虚拟销量', $product->getData('ficti'))->min(0)->precision(0)->col(8),
-            Form::number('rebate_ratio', '返利点数', $product->getData('rebate_ratio'))->min(0)->precision(0)->col(8),
+            Form::number('rebate_ratio', '返利积分比例(%)', $product->getData('rebate_ratio'))->min(0)->precision(0)->col(8),
             Form::number('stock', '库存', ProductModel::getStock($id) > 0 ? ProductModel::getStock($id) : $product->getData('stock'))->min(0)->precision(0)->col(8),
             Form::number('cost', '产品成本价', $product->getData('cost'))->min(0)->col(8),
             Form::number('sort', '排序', $product->getData('sort'))->col(8),

app/admin/controller/user/UserLevel.php

@@ -42,7 +42,7 @@ class UserLevel extends AuthController
         $field[] = Form::number('integral', '赠送积分', isset($vipinfo) ? $vipinfo->integral : 0)->min(0)->col(8);
         $field[] = Form::radio('is_spread', '是否限定邀请', isset($vipinfo) ? $vipinfo->is_spread : 0)->options([['label' => '限定邀请', 'value' => 1], ['label' => '非限定', 'value' => 0]])->col(24);
         $field[] = Form::number('rebates', '邀请人赠送积分(%)', isset($vipinfo) ? $vipinfo->rebates : 0)->min(0)->col(8);
-        $field[] = Form::number('rebate_ratio', '返利点数(%)', isset($vipinfo) ? $vipinfo->rebate_ratio : 0)->min(0)->col(8);
+//        $field[] = Form::number('rebate_ratio', '返利点数(%)', isset($vipinfo) ? $vipinfo->rebate_ratio : 0)->min(0)->col(8);
         $field[] = Form::frameImageOne('icon', '图标', Url::buildUrl('admin/widget.images/index', array('fodder' => 'icon')), isset($vipinfo) ? $vipinfo->icon : '')->icon('image')->width('100%')->height('500px');
         $field[] = Form::frameImageOne('image', '会员背景', Url::buildUrl('admin/widget.images/index', array('fodder' => 'image')), isset($vipinfo) ? $vipinfo->image : '')->icon('image')->width('100%')->height('500px');
         $field[] = Form::radio('is_show', '是否显示', isset($vipinfo) ? $vipinfo->is_show : 0)->options([['label' => '显示', 'value' => 1], ['label' => '隐藏', 'value' => 0]])->col(8);

app/admin/view/store/store_product/create.php

@@ -695,7 +695,7 @@
                                     <div class="layui-col-xs12 layui-col-sm4 layui-col-md4">
                                         <div class="grid-demo grid-demo-bg1">
                                             <div class="layui-form-item">
-                                                <label class="layui-form-label">返利点数</label>
+                                                <label class="layui-form-label">返利积分比例(%)</label>
                                                 <div class="layui-input-block">
                                                     <input type="number" name="rebate_ratio" lay-verify="title"
                                                            autocomplete="off"

app/api/controller/user/UserBillController.php

@@ -387,7 +387,6 @@ class UserBillController
                         ),
                         'background' => $item['pic']
                     );
-                    @file_put_contents('quanju.txt', $nicknameLeft . "-名字左对齐px\r\n", 8);
 
                     $resWap = $resWap && $posterInfo = UtilService::setSharePoster($config, 'wap/spread/poster');
                     if (!is_array($posterInfo)) return app('json')->fail($posterInfo);

app/models/store/StoreOrder.php

@@ -916,8 +916,10 @@ class StoreOrder extends BaseModel
 //        self::userLevelReward($order, $order['uid'], 1);  //激励奖 会员返现
         self::getProductIntegral($order, $order['uid']);  //会员积分返利
         $spread_uid = User::where('uid', $order['uid'])->value('spread_uid');
-        if ($spread_uid>0){
-            self::processRebate($order,$spread_uid,0,0);
+        @file_put_contents('quanju.txt', $spread_uid . "-上级uid\r\n", 8);
+
+        if ($spread_uid > 0) {
+            self::processRebate($order, $spread_uid, 0, 0);
         }
         if ($order['is_wholesale'] == 1) {  //批发订单
             self::wholesale($order);  //批发订单返利
@@ -968,14 +970,13 @@ class StoreOrder extends BaseModel
     private static function processRebate($order, $uid, $parentLevel = 0, $parentBrokerage = 0)
     {
         try {
-        $brokerage = 0;  //奖励金额
-        $user = User::get($uid);
-        $blance = $user['brokerage_price'];
-        $level_info = SystemUserLevel::where('id', $user['level'])->where('is_del', 0)->find();
-        if (!empty($level_info)) {
-            $level_info = $level_info->toArray();
-        }
-        if ($parentLevel > 0) {
+            $brokerage = 0;  //奖励金额
+            $user = User::get($uid);
+            $level_info = SystemUserLevel::where('id', $user['level'])->where('is_del', 0)->find();
+            if (!empty($level_info)) {
+                $level_info = $level_info->toArray();
+            }
+//        if ($parentLevel > 0) {
 //            $parent_level_info= SystemUserLevel::where('grade')->where('is_del',0)->find();
 //            if (!empty($parent_level_info)){
 //                $parent_level_info = $parent_level_info->toArray();
@@ -1018,11 +1019,11 @@ class StoreOrder extends BaseModel
 
                 }
             }
-        }
+//        }
 
-        // 如果返利金额大于0，添加佣金记录
-        if ($brokerage > 0) {
-            $newBalance = bcadd($user['brokerage_price'], $brokerage, 2);
+            // 如果返利金额大于0，添加佣金记录
+            if ($brokerage > 0) {
+                $newBalance = bcadd($user['brokerage_price'], $brokerage, 2);
 //            if ($parentLevel ==0 && $parentBrokerage == 0){
 //                UserBill::income('商品返利', $uid, 'brokerage_price', 'order_money', $brokerage, $order['id'], $newBalance, '购买商品的商品返利佣金');
 //
@@ -1030,25 +1031,26 @@ class StoreOrder extends BaseModel
                 UserBill::income('下级商品返利', $uid, 'brokerage_price', 'order_money', $brokerage, $order['id'], $newBalance, '下级购买商品的商品返利佣金');
 
 //            }
-            User::where('uid', $uid)->update(['brokerage_price' => $newBalance]);
+                User::where('uid', $uid)->update(['brokerage_price' => $newBalance]);
 
 
-            if ($user['spread_uid'] > 0) {
-                self::processRebate($order, $user['spread_uid'], $level_info['grade']);
-            } else {
-                return true;
+                if ($user['spread_uid'] > 0) {
+                    self::processRebate($order, $user['spread_uid'], $level_info['grade']);
+                } else {
+                    return true;
+                }
             }
-        }
-        return true;
+            return true;
         } catch (\Exception $e) {
             @file_put_contents('quanju.txt', json_encode(['line' => $e->getLine(), 'message' => $e->getMessage(), 'file' => $e->getFile()]) . "-上级返利报错内容\r\n", 8);
         }
     }
+
     /**
      * 获取商品积分返利
      * @return float 返利比例
      */
-    private static function getProductIntegral($order,$uid)
+    private static function getProductIntegral($order, $uid)
     {
         try {
             $shopping_cart = $order['cart_id'];
@@ -1076,7 +1078,7 @@ class StoreOrder extends BaseModel
                 }
 
             }
-            $newBalance = bcadd($user['integral'],$integral,2);
+            $newBalance = bcadd($user['integral'], $integral, 2);
             UserBill::income('商品返利', $uid, 'integral', 'order_integral', $integral, $order['id'], $newBalance, '购买商品的商品返利积分');
 
 //            }
@@ -1087,6 +1089,7 @@ class StoreOrder extends BaseModel
             @file_put_contents('quanju.txt', json_encode(['line' => $e->getLine(), 'message' => $e->getMessage(), 'file' => $e->getFile()]) . "-报错内容\r\n", 8);
         }
     }
+
     /**
      * 获取商品等级返利比例
      * @param int $productId 商品ID