1

app/admin/controller/user/UserLevel.php

@@ -41,7 +41,7 @@ class UserLevel extends AuthController
         $field[] = Form::number('discount', '享受折扣', isset($vipinfo) ? $vipinfo->discount : 0)->min(0)->col(8);
         $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('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::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');

app/api/controller/order/StoreOrderController.php

@@ -139,6 +139,10 @@ class StoreOrderController
                 return app('json')->status('ORDER_EXIST', '订单生成失败，你已经参加该团了，请先支付订单', ['orderId' => StoreOrder::getStoreIdPink($pinkId, $request->uid())]);
         }
         $priceGroup = StoreOrder::cacheKeyCreateOrder($request->uid(), $key, $addressId, $payType, (int)$useIntegral, $couponId, $mark, $combinationId, $pinkId, $seckill_id, $bargainId, true, 0, $shipping_type);
+        if ($priceGroup['pay_postage']<0){
+            $priceGroup['pay_postage']=0;
+            $priceGroup['pay_type']=='到付';
+        }
         if ($priceGroup)
             return app('json')->status('NONE', 'ok', $priceGroup);
         else

app/models/store/StoreOrder.php

@@ -150,6 +150,9 @@ class StoreOrder extends BaseModel
                 $storePostage = 0;
             }
             if ($storeFreePostage <= $totalPrice) $storePostage = 0;//如果总价大于等于满额包邮 邮费等于0
+            if ($temp['collect_on_delivery']==1){
+                $storePostage = -1;
+            }
         }
         return compact('storePostage', 'storeFreePostage', 'totalPrice', 'costPrice', 'vipPrice', 'totalIntegral');
     }

app/models/user/UserLevel.php

@@ -109,6 +109,8 @@ class UserLevel extends BaseModel
             $res = self::create($data);
             if (!$res) return false;
             User::where('uid', $uid)->update(['level' => $level_id]);
+            UserLevelOrder::rebates($uid, $level_id , $res['id']);  //邀请返利
+            UserLevelOrder::give_integral($uid, $level_id , $res['id']); //赠送积分
             return $res;
         }
     }

app/models/user/UserLevelOrder.php

@@ -3,7 +3,6 @@
 namespace app\models\user;
 
 use app\admin\model\user\User as UserModel;
-use app\admin\model\user\UserBill;
 use app\admin\model\user\UserBill as UserBillAdmin;
 use app\admin\model\user\UserLevel;
 use app\admin\model\user\UserTaskFinish;
@@ -271,6 +270,7 @@ class UserLevelOrder extends BaseModel
         self::save_give_level($order['uid'], $order['level_id']);
 //        邀请返利
         self::rebates($order['uid'], $order['level_id'],$order['id']);
+        self::give_integral($order['uid'], $order['level_id'],$order['id']);
         $res = $res1;
 //        $res = $res1 && $resPink && UserSpread::setSpreadSure($order['uid']) && User::backOrderBrokerage($order);
         return false !== $res;
@@ -318,17 +318,10 @@ class UserLevelOrder extends BaseModel
             $res = $res && UserModel::where('uid', $uid)->update(['level' => $level_id]);
             if ($inserValue) $res && UserTaskFinish::insertAll($inserValue);
             $user = UserModel::where('uid', $uid)->find();
-            if ($systemLevel['integral']>0) {//赠送积分
-                    $edit['integral'] = bcadd($user['integral'], $systemLevel['integral'], 2);
-                    $res2 = UserBillAdmin::income('购买会员增加积分', $user['uid'], 'integral', 'system_add', $systemLevel['integral'], 0, $edit['integral'], '购买会员增加了' . floatval($systemLevel['integral']) . '积分');
-                    try {
-                        UserRepository::adminAddIntegral($user, $systemLevel['integral']);
-                    } catch (\Exception $e) {
-//                        BaseModel::rollbackTrans();
-                        return Json::fail($e->getMessage());
-                    }
-
-            }
+//            if ($systemLevel['integral']>0) {//赠送积分
+//
+//
+//            }
             if ($res) {
                 UserModel::commitTrans();
                 return Json::successful('购买成功');
@@ -345,13 +338,29 @@ class UserLevelOrder extends BaseModel
     public static function rebates($uid, $level_id,$order_id){
 //        $spread_id = User::where('uid', $uid)->value('spread_id');
         $userInfo = User::getUserInfo($uid);
+        $spread_Info = User::getUserInfo($userInfo['spread_uid']);
         $level_info=SystemUserLevel::where('id', $level_id)->find();
         if ($level_info['rebate']>0){
             $brokerage = bcmul($level_info['rebate'], $level_info['money'], 2);
-            $balance = bcadd($userInfo['now_money'], $brokerage, 2);
-            $mark = $userInfo['nickname'] . '成功消费' . floatval($level_info['money']) . '元,购买会员，奖励推广佣金' . floatval($brokerage);
-            $res1 = UserBill::income('获得推广佣金', $userInfo['spread_uid'], 'now_money', 'brokerage', $brokerage, $order_id, $balance, $mark);
-            $res2 = self::bcInc($userInfo['spread_uid'], 'now_money', $brokerage, 'uid');
+            $balance = bcadd($spread_Info['integral'], $brokerage, 2);
+            $mark = '下级用户'.$userInfo['nickname'] . '成为'.$level_info['name'].'，奖励推广积分' . floatval($brokerage);
+            $res1 = UserBill::income('获得推广积分', $userInfo['spread_uid'], 'integral', 'level_integral', $brokerage, $order_id, $balance, $mark);
+            $res2 = self::bcInc($userInfo['spread_uid'], 'integral', $brokerage, 'uid');
+        }
+        return true;
+    }
+    //    积分赠送
+    public static function give_integral($uid, $level_id,$order_id){
+//        $spread_id = User::where('uid', $uid)->value('spread_id');
+        $userInfo = User::getUserInfo($uid);
+//        $spread_Info = User::getUserInfo($userInfo['spread_uid']);
+        $level_info=SystemUserLevel::where('id', $level_id)->find();
+        if ($level_info['integral']>0){
+            $brokerage = bcadd($level_info['integral'], $level_info['money'], 2);
+            $balance = bcadd($userInfo['integral'], $brokerage, 2);
+            $mark = '用户'.$userInfo['nickname'] . '成为'.$level_info['name'].'，奖励积分' . floatval($brokerage);
+            $res1 = UserBill::income('获得推广积分', $userInfo['spread_uid'], 'integral', 'level_integral', $brokerage, $order_id, $balance, $mark);
+            $res2 = self::bcInc($uid, 'integral', $brokerage, 'uid');
         }
         return true;
     }