git

app/admin/controller/finance/UserExtract.php

@@ -28,6 +28,7 @@ class UserExtract extends AuthController
             ['nickname', ''],
             ['extract_type', ''],
             ['nireid', ''],
+            ['balance_type',''],
             ['date', ''],
         ], $this->request);
         $limitTimeList = [

app/admin/controller/system/SystemStore.php

@@ -99,7 +99,7 @@ class SystemStore extends AuthController
             if($is_show==1 && $Info['uid']>0)
             {
                 $user = User::find($Info['uid']);
-                if($user['level']<3) UserLevel::setUserLevel($Info['uid'],3);
+                if($user['level']<$Info['level']) UserLevel::setUserLevel($Info['uid'],$Info['level']);
             }
             return JsonService::successful($is_show == 1 ? '设置显示成功' : '设置隐藏成功');
         } else {

app/api/controller/user/UserExtractController.php

@@ -69,6 +69,7 @@ class UserExtractController
             ['bankname', ''],
             ['cardnum', ''],
             ['weixin', ''],
+            ['balance_type',0],
         ], $request);
         if (!preg_match('/^(([1-9][0-9]*)|(([0]\.\d{1,2}|[1-9][0-9]*\.\d{1,2})))$/', $extractInfo['money'])) return app('json')->fail('提现金额输入有误');
         //提现设置最低金额

app/models/store/StoreOrder.php

@@ -439,6 +439,7 @@ class StoreOrder extends BaseModel
                 'shipping_type' => $shipping_type,
                 'is_gold'=>input('is_gold',0),
                 'is_integral'=>input('is_integral',0),
+                'is_beauty'=>input('is_beauty',0),
             ];
             if ($shipping_type === 2) {
                 $orderInfo['verify_code'] = self::getStoreCode();
@@ -2212,7 +2213,7 @@ class StoreOrder extends BaseModel
         {
             $sp_brokeragePrice = bcdiv(bcmul($order['total_price'],sys_config('recommend'), 2), 100, 2);
             $sp_brokeragePrice1 = bcdiv(bcmul($order['total_price'],sys_config('recommend_balance'), 2), 100, 2);
-            $sum = bcadd($sp_brokeragePrice,$sp_brokeragePrice1);
+            $sum = bcadd($sp_brokeragePrice,$sp_brokeragePrice1,2);
             if(bcsub($sp_userInfo['integral'],$sum,2)>0) {
                 $balance = bcadd($sp_userInfo['brokerage_price'], $sp_brokeragePrice, 2);
                 $balance1 = bcadd($sp_userInfo['now_money'], $sp_brokeragePrice1, 2);

app/models/store/StoreProduct.php

@@ -58,7 +58,7 @@ class StoreProduct extends BaseModel
         return htmlspecialchars_decode($value);
     }
 
-    public static function getValidProduct($productId, $field = 'add_time,browse,cate_id,code_path,ficti,give_integral,id,image,is_sub,is_bargain,is_benefit,is_best,is_del,is_hot,is_new,is_postage,is_seckill,is_show,keyword,mer_id,mer_use,ot_price,postage,price,sales,slider_image,sort,stock,store_info,store_name,unit_name,vip_price,spec_type,IFNULL(sales,0) + IFNULL(ficti,0) as fsales,video_link,is_integral,max_integral,is_gold')
+    public static function getValidProduct($productId, $field = 'add_time,browse,cate_id,code_path,ficti,give_integral,id,image,is_sub,is_bargain,is_benefit,is_best,is_del,is_hot,is_new,is_postage,is_seckill,is_show,keyword,mer_id,mer_use,ot_price,postage,price,sales,slider_image,sort,stock,store_info,store_name,unit_name,vip_price,spec_type,IFNULL(sales,0) + IFNULL(ficti,0) as fsales,video_link,is_integral,max_integral,is_gold,is_beauty')
     {
         $Product = self::where('is_del', 0)->where('is_show', 1)->where('id', $productId)->field($field)->find();
         if ($Product) return $Product->toArray();
@@ -281,6 +281,9 @@ class StoreProduct extends BaseModel
             if (is_array($list)) return $list;
             return $isSingle ? $list : 0;
         }
+        if(isset($list['is_beauty']) && $list['is_beauty']==0) {
+            return $isSingle ? $list : 0;
+        }
         $levelId = UserLevel::getUserLevel($uid);
         if ($levelId) {
             $discount = UserLevel::getUserLevelInfo($levelId, 'discount');

app/models/user/UserExtract.php

@@ -79,7 +79,7 @@ class UserExtract extends BaseModel
         }
         $balance = bcsub($userInfo[$field],$data['money'],2);
         if($balance < 0) $balance=0;
-        $commission = sys_config('commission');
+        $commission = bcmul($data['money'],bcdiv(sys_config('commission',10),100,3),2);
         $insertData = [
             'uid' => $userInfo['uid'],
             'extract_type' => $data['extract_type'],