git

app/admin/controller/store/StoreProduct.php

@@ -276,6 +276,7 @@ class StoreProduct extends AuthController
             ['activity', []],
             ['max_integral',0],
             ['is_integral',0],
+            ['is_beauty',0],
         ]);
         foreach ($data['activity'] as $k => $v) {
             if ($v == '秒杀') {

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

@@ -765,7 +765,7 @@
 <!--                                            </div>-->
 <!--                                        </div>-->
 <!--                                    </div>-->
-
+<!--
                                     <div class="layui-col-xs12 layui-col-sm4 layui-col-md4">
                                         <div class="grid-demo grid-demo-bg1">
                                             <div class="layui-form-item">
@@ -791,7 +791,7 @@
                                                 </div>
                                             </div>
                                         </div>
-                                    </div>
+                                    </div>-->
                                     <div class="layui-col-xs12 layui-col-sm4 layui-col-md4">
                                         <div class="grid-demo grid-demo-bg1">
                                             <div class="layui-form-item">
@@ -821,16 +821,17 @@
                                     <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="radio" name="is_best" lay-filter="is_best" value="1" title="开启"
-                                                           :checked="formData.is_best == 1 ? true : false">
-                                                    <input type="radio" name="is_best" lay-filter="is_best" value="0" title="关闭"
-                                                           :checked="formData.is_best == 0 ? true : false">
+                                                    <input type="radio" name="is_beauty" lay-filter="is_beauty" value="1" title="开启"
+                                                           :checked="formData.is_beauty == 1 ? true : false">
+                                                    <input type="radio" name="is_beauty" lay-filter="is_beauty" value="0" title="关闭"
+                                                           :checked="formData.is_beauty == 0 ? true : false">
                                                 </div>
                                             </div>
                                         </div>
                                     </div>
+                                    <!--
                                     <div class="layui-col-xs12 layui-col-sm4 layui-col-md4">
                                         <div class="grid-demo grid-demo-bg1">
                                             <div class="layui-form-item">
@@ -856,7 +857,7 @@
                                                 </div>
                                             </div>
                                         </div>
-                                    </div>
+                                    </div>-->
 
                                 </div>
                             </div>
@@ -975,7 +976,7 @@
             activity:{'秒杀':'#1E9FFF','砍价':'#189688','拼团':'#FEB900'},
             attr: [],//临时属性
             newRule: false,//是否添加新规则
-            radioRule: ['is_sub','is_show', 'is_hot', 'is_benefit', 'is_new','is_good' ,'is_best', 'spec_type','is_gold','is_integral'],//radio 当选规则
+            radioRule: ['is_sub','is_show', 'is_hot', 'is_benefit', 'is_new','is_good' ,'is_beauty', 'spec_type','is_gold','is_integral'],//radio 当选规则
             rule: { //多图选择规则
                 slider_image: {
                     maxLength: 5

app/api/controller/store/StoreCartController.php

@@ -34,7 +34,7 @@ class StoreCartController
      */
     public function add(Request $request)
     {
-        list($productId, $cartNum, $uniqueId, $combinationId, $secKillId, $bargainId, $new,$is_gold,$is_integral) = UtilService::postMore([
+        list($productId, $cartNum, $uniqueId, $combinationId, $secKillId, $bargainId, $new,$is_gold,$is_integral,$is_beauty) = UtilService::postMore([
             ['productId',0],//普通产品编号
             ['cartNum',1], //购物车数量
             ['uniqueId',''],//属性唯一值
@@ -44,10 +44,11 @@ class StoreCartController
             ['new',1], // 1 加入购物车直接购买  0 加入购物车
             ['is_gold',0],
             ['is_integral',0],
+            ['is_beauty',0],
         ], $request, true);
         if (!$productId || !is_numeric($productId)) return app('json')->fail('参数错误');
         if ($bargainId && StoreBargainUserHelp::getSurplusPrice($bargainId, $request->uid())) return app('json')->fail('请先砍价');
-        $res = StoreCart::setCart($request->uid(), $productId, $cartNum, $uniqueId, 'product', $new, $combinationId, $secKillId, $bargainId,$is_gold,$is_integral);
+        $res = StoreCart::setCart($request->uid(), $productId, $cartNum, $uniqueId, 'product', $new, $combinationId, $secKillId, $bargainId,$is_gold,$is_integral,$is_beauty);
         if (!$res) return app('json')->fail(StoreCart::getErrorInfo());
         else  return app('json')->successful('ok', ['cartId' => $res->id]);
     }

app/api/controller/store/StoreProductController.php

@@ -45,6 +45,7 @@ class StoreProductController
             [['type', 0], 0],
             ['is_gold',0],
             ['is_integral',0],
+            ['is_beauty',0],
         ], $request);
         return app('json')->successful(StoreProduct::getProductList($data, $request->uid()));
     }

app/models/store/StoreCart.php

@@ -41,7 +41,7 @@ class StoreCart extends BaseModel
         return time();
     }
 
-    public static function setCart($uid, $product_id, $cart_num = 1, $product_attr_unique = '', $type = 'product', $is_new = 0, $combination_id = 0, $seckill_id = 0, $bargain_id = 0,$is_gold=0,$is_integral=0)
+    public static function setCart($uid, $product_id, $cart_num = 1, $product_attr_unique = '', $type = 'product', $is_new = 0, $combination_id = 0, $seckill_id = 0, $bargain_id = 0,$is_gold=0,$is_integral=0,$is_beauty=0)
     {
         if ($cart_num < 1) $cart_num = 1;
         if (!$product_attr_unique) {
@@ -75,7 +75,7 @@ class StoreCart extends BaseModel
             return $cart;
         } else {
             $add_time = time();
-            return self::create(compact('uid', 'product_id', 'cart_num', 'product_attr_unique', 'is_new', 'type', 'combination_id', 'add_time', 'bargain_id', 'seckill_id','is_gold','is_integral'));
+            return self::create(compact('uid', 'product_id', 'cart_num', 'product_attr_unique', 'is_new', 'type', 'combination_id', 'add_time', 'bargain_id', 'seckill_id','is_gold','is_integral','is_beauty'));
         }
     }
 
@@ -214,8 +214,16 @@ class StoreCart extends BaseModel
                             }
                             $cart['vip_truePrice'] = 0;
                         } else {
-                            $cart['truePrice'] = (float)StoreProduct::setLevelPrice($attrInfo['price'], $uid, true);
-                            $cart['vip_truePrice'] = (float)StoreProduct::setLevelPrice($attrInfo['price'], $uid);
+                            if($cart['is_beauty']) {
+                                $cart['truePrice'] = (float)StoreProduct::setLevelPrice($attrInfo['price'], $uid, true);
+                                $cart['vip_truePrice'] = (float)StoreProduct::setLevelPrice($attrInfo['price'], $uid);
+                            }
+                            else
+                            {
+                                $cart['truePrice'] = $attrInfo['price'];
+                                $cart['vip_truePrice'] = 0;
+                            }
+
                         }
                         $cart['trueStock'] = $attrInfo['stock'];
                         $cart['costPrice'] = $attrInfo['cost'];
@@ -223,7 +231,7 @@ class StoreCart extends BaseModel
                         $valid[] = $cart;
                     }
                 } else {
-                    if ($cart['combination_id'] || $cart['seckill_id'] || $cart['bargain_id'] || $cart['is_gold']) {
+                    if ($cart['combination_id'] || $cart['seckill_id'] || $cart['bargain_id'] || $cart['is_gold']  || $cart['is_integral']) {
                         $cart['truePrice'] = $cart['productInfo']['price'];
                         $cart['vip_truePrice'] = 0;
                         if ($cart['bargain_id']) {
@@ -232,8 +240,15 @@ class StoreCart extends BaseModel
                         $cart['productInfo']['attrInfo']['weight'] = $product['weight'];
                         $cart['productInfo']['attrInfo']['volume'] = $product['volume'];
                     } else {
-                        $cart['truePrice'] = (float)StoreProduct::setLevelPrice($cart['productInfo']['price'], $uid, true);
-                        $cart['vip_truePrice'] = (float)StoreProduct::setLevelPrice($cart['productInfo']['price'], $uid);
+                        if($cart['is_beauty']) {
+                            $cart['truePrice'] = (float)StoreProduct::setLevelPrice($cart['productInfo']['price'], $uid, true);
+                            $cart['vip_truePrice'] = (float)StoreProduct::setLevelPrice($cart['productInfo']['price'], $uid);
+                        }
+                        else
+                        {
+                            $cart['truePrice'] = $attrInfo['price'];
+                            $cart['vip_truePrice'] = 0;
+                        }
                     }
                     $cart['trueStock'] = $cart['productInfo']['stock'];
                     $cart['costPrice'] = $cart['productInfo']['cost'];

app/models/store/StoreOrder.php

@@ -2211,10 +2211,19 @@ class StoreOrder extends BaseModel
         if($sp_userInfo && $sp_userInfo['level']>0)
         {
             $sp_brokeragePrice = bcdiv(bcmul($order['total_price'],sys_config('recommend'), 2), 100, 2);
-            $balance = bcadd($sp_userInfo['brokerage_price'], $sp_brokeragePrice, 2);
-            $mark = $userInfo['nickname'] . '推荐奖' . floatval($sp_brokeragePrice) . "元,订单号:" . $order['order_id'];
-            $res1 = UserBill::income('推荐奖', $sp_userInfo['uid'], 'now_money', 'brokerage', $sp_brokeragePrice, $order['id'], $balance, $mark, 1);
-            User::where('uid', $sp_userInfo['uid'])->inc('brokerage_price', $sp_brokeragePrice)->update();
+            $sp_brokeragePrice1 = bcdiv(bcmul($order['total_price'],sys_config('recommend_balance'), 2), 100, 2);
+            $sum = bcadd($sp_brokeragePrice,$sp_brokeragePrice1);
+            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);
+                $mark = $userInfo['nickname'] . '推荐奖-红利' . floatval($sp_brokeragePrice) . "元,订单号:" . $order['order_id'];
+                $res = UserBill::income('推荐奖-红利', $sp_userInfo['uid'], 'now_money', 'brokerage', $sp_brokeragePrice, $order['id'], $balance, $mark, 1);
+                $mark1 = $userInfo['nickname'] . '推荐奖-余额' . floatval($sp_brokeragePrice1) . "元,订单号:" . $order['order_id'];
+                $res1 = UserBill::income('推荐奖-余额', $sp_userInfo['uid'], 'now_money', 'brokerage', $sp_brokeragePrice1, $order['id'], $balance1, $mark1, 1);
+                $mark2 = $userInfo['nickname'] . '推荐奖-扣金券' . floatval($sum) . "元,订单号:" . $order['order_id'];
+                $res2 = UserBill::expend('推荐奖-扣金券', $sp_userInfo['uid'], 'integral', 'recommend', $sum, $order['id'], bcsub($sp_userInfo['integral'],$sum,2), $mark2, 1);
+                User::where('uid', $sp_userInfo['uid'])->inc('brokerage_price', $sp_brokeragePrice)->inc('now_money', floatval($sp_brokeragePrice1))->dec("integral",$sum)->update();
+            }
         }
         try {
             //处理级差

app/models/store/StoreProduct.php

@@ -109,6 +109,7 @@ class StoreProduct extends BaseModel
         if ($news != 0) $model->where('is_new', 1);
         if (isset($data['is_gold']) && $data['is_gold']>-1) $model->where('is_gold', $data['is_gold']);
         if (isset($data['is_integral']) && $data['is_integral']>-1) $model->where('is_integral', $data['is_integral']);
+        if (isset($data['is_beauty']) && $data['is_beauty']>-1) $model->where('is_beauty', $data['is_beauty']);
         $baseOrder = '';
         if ($priceOrder) $baseOrder = $priceOrder == 'desc' ? 'price DESC' : 'price ASC';
 //        if($salesOrder) $baseOrder = $salesOrder == 'desc' ? 'sales DESC' : 'sales ASC';//真实销量