commit

app/api/controller/user/UserBillController.php

@@ -292,12 +292,12 @@ class UserBillController
                             array(
                                 'url' => $urlCode,     //二维码资源
                                 'stream' => 0,
-                                'left' => 114,
-                                'top' => 790,
+                                'left' => 215,
+                                'top' => 920,
                                 'right' => 0,
                                 'bottom' => 0,
-                                'width' => 120,
-                                'height' => 120,
+                                'width' => 320,
+                                'height' => 320,
                                 'opacity' => 100
                             )
                         ),

app/models/store/StoreProduct.php

@@ -114,7 +114,7 @@ class StoreProduct extends BaseModel
         if ($salesOrder) $baseOrder = $salesOrder == 'desc' ? 'sales DESC' : 'sales ASC';//虚拟销量
         if ($baseOrder) $baseOrder .= ', ';
         $model->order($baseOrder . 'sort DESC, add_time DESC');
-        $list = $model->page((int)$page, (int)$limit)->field('id,store_name,cate_id,image,IFNULL(sales,0) + IFNULL(ficti,0) as sales,price,stock')->select()->each(function ($item) use ($uid, $type) {
+        $list = $model->page((int)$page, (int)$limit)->field('id,store_name,cate_id,image,IFNULL(sales,0) + IFNULL(ficti,0) as sales,price,stock,ot_price')->select()->each(function ($item) use ($uid, $type) {
             if ($type) {
                 $item['is_att'] = StoreProductAttrValueModel::where('product_id', $item['id'])->count() ? true : false;
                 if ($uid) $item['cart_num'] = StoreCart::where('is_pay', 0)->where('is_del', 0)->where('is_new', 0)->where('type', 'product')->where('product_id', $item['id'])->where('uid', $uid)->value('cart_num');

app/models/user/User.php

@@ -344,7 +344,7 @@ class User extends BaseModel
                     $brokerage_price = ($orderInfo['pay_price'] * sys_config('shopowner')/100 * 0.7) * 0.3 * 0.95;// 到账佣金
                     $integral =   ($orderInfo['pay_price'] * sys_config('shopowner')/100 * 0.7) * 0.3 * 0.05;// 到账积分
 
-                    UserBill::income('获得推广佣金', $uid1, 'now_money', 'brokerage', $brokerage_price, $orderInfo['id'], $user1['brokerage_price'] + $brokerage_price, '店长平级佣金奖励', 0);
+                    UserBill::income('获得推广佣金', $uid1, 'now_money', 'brokerage', $brokerage_price, $orderInfo['id'], $user1['brokerage_price'] + $brokerage_price, '店长平级佣金奖励');
                     UserBill::income('获得推广积分', $uid1, 'integral', 'Level', $integral, $orderInfo['id'], $user1['integral'] + $integral, '店长平级积分奖励', 0);
                     self::bcInc($uid1, 'brokerage_price', $brokerage_price, 'uid'); //那二代店长业绩的百分之30
                     self::bcInc($uid1, 'integral', $integral, 'uid'); //那二代店长业绩的百分之30
@@ -354,8 +354,8 @@ class User extends BaseModel
                     $integral =   ($orderInfo['pay_price'] *  sys_config('shopowner')/100 * 0.7) * 0.05;// 到账积分
 
 
-                    UserBill::income('获得推广佣金', $uid2, 'now_money', 'brokerage', $brokerage_price, $orderInfo['id'], $user2['brokerage_price'] + $brokerage_price, '店长平级佣金奖励', 0);
-                    UserBill::income('获得推广积分', $uid2, 'integral', 'Level', $integral, $orderInfo['id'], $user2['brokerage_price'] + $integral, '店长平级积分奖励', 0);
+                    UserBill::income('获得推广佣金', $uid2, 'now_money', 'brokerage', $brokerage_price, $orderInfo['id'], $user2['brokerage_price'] + $brokerage_price, '店长平级佣金奖励');
+                    UserBill::income('获得推广积分', $uid2, 'integral', 'Level', $integral, $orderInfo['id'], $user2['brokerage_price'] + $integral, '店长平级积分奖励');
                     self::bcInc($uid2, 'brokerage_price',$brokerage_price, 'uid'); //那二代店长业绩的百分之30
                     self::bcInc($uid2, 'brokerage_price', $integral, 'uid'); //那二代店长业绩的百分之30
                 }
@@ -911,6 +911,18 @@ class User extends BaseModel
         }
     }
 
+
+    /**
+     * 获取ID
+     * @param $key
+     * @return mixed
+     */
+    public static function getkeytoid($key)
+    {
+        $rs = self::order('uid DESC')->find();
+        return $rs['uid']+1;
+    }
+
     /**
      * 联创分红
      * @return void