会员专区显示PV和贡献值、积分的问题

app/common/repositories/store/product/ProductRepository.php

@@ -992,26 +992,26 @@ class ProductRepository extends BaseRepository
         }
 
         if($res['mer_id'] == 496){
-         
+
             $s = 0;
-            
+
             if($res['price']==1180){
                 $s = 1000;
             }else if($res['price']==10620){
                 $s = 9000;
             }else if($res['price']==11800){
                 $s = 10000;
-            }else if($res['price'] == '2360'){
+            }else if($res['price'] == 2360){
                 $s= 2000;
-            }else if($res['price'] == '9440'){
+            }else if($res['price'] == 9440){
                 $s = 8000;
             }
-            
+
             $res['yanglao'] = round($s * 0.035,2);
         }
 
 
-       
+
 
         $res['pv']=($k['pv']);
         $res['jifen']=($k['jifen']);
@@ -1646,7 +1646,7 @@ class ProductRepository extends BaseRepository
 
             //plate_mer_profit 产品获得的佣金 数据库添加商品已经算好的佣金
 
-           // $pv=decimal2($product['plate_mer_profit']*0.5);//pv=佣金的50%
+            // $pv=decimal2($product['plate_mer_profit']*0.5);//pv=佣金的50%
             // $dui_jifen=decimal2($product['plate_mer_profit']*0.4);
             // $dui_jingdou=decimal2($product['plate_mer_profit']*0.5);
             // $dui_price=$total_price-$dui_jifen;//用积分兑换，所需要的现金 佣金的*40%
@@ -1665,16 +1665,20 @@ class ProductRepository extends BaseRepository
             // $jfduihuan='';
             // $jdduihuan='';
 
-           
+
             //$v['vr'] = 0;
             $num_yl = 0;
-            
+
             if($product['price'] == '1180'){
                 $num_yl = 1000;
             }else if($product['price'] == '10620'){
                 $num_yl = 9000;
             }else if($product['price'] == '11800'){
                 $num_yl = 10000;
+            }else if($product['price'] == '2360'){
+                $num_yl = 2000;
+            }else if($product['price'] == '9440'){
+                $num_yl = 8000;
             }
 
             if($product['mer_id'] == 496){
@@ -1683,14 +1687,14 @@ class ProductRepository extends BaseRepository
                 $pv=$num_yl;
                 //$v['vr']=$v['price'];
                 //1:为会员专区,
-               
-                $fzone_paytype= [ 
+
+                $fzone_paytype= [
                     1=>[
                         1=>$product['price'],//VR
                         2=>$product['price']//现金
                     ]
-                ];   
-             
+                ];
+
             }else if($product['mer_id'] == 439){
                 //精彩生活和商贸区
                 $jf = $product['price'] - round($product['concession_pri']*0.3, 2) . ' + ' . round($product['concession_pri']*0.3, 2);
@@ -1712,10 +1716,10 @@ class ProductRepository extends BaseRepository
                     $jcprice1 = $product['price'] - round($product['concession_pri']*0.35, 2);
                     $jcjd1 = round($product['concession_pri']*0.35, 2);
 
-                    
+
                     //支付组合
                     // $fzone_paytype= [
-                     
+
                     //     2=>[
                     //         1=>[$jcvr,$jcjf],//VR+积分
                     //         2=>[$jcprice,$jcjf1],//现金+积分
@@ -1738,7 +1742,7 @@ class ProductRepository extends BaseRepository
                 }
             }else if($product['mer_id'] == 476){
                 //复购区
-                
+
             }
 
 
@@ -1784,7 +1788,7 @@ class ProductRepository extends BaseRepository
      * 计算商品的养老金
      * @param int $good_id
      * @param int $price
-    * @param int $dc
+     * @param int $dc
      * @param null $product_attr_unique
      * @return string
      */
@@ -1823,7 +1827,7 @@ class ProductRepository extends BaseRepository
 //                if ($mer_id == 496) {
 //                    $yanglao = $total_price * 5 / 100;
 //                } else {
-                    $yanglao = $total_price * $shop_bonus_setting['yanglao_rate'] / 100;
+                $yanglao = $total_price * $shop_bonus_setting['yanglao_rate'] / 100;
 //                }
             }
             $yanglao= decimal2($yanglao);
@@ -1902,7 +1906,7 @@ class ProductRepository extends BaseRepository
                         'gong_sku_id'      => $value['sku_id'],
                         'price'            => $value['edit_price'],
                         'plate_mer_profit' => $plate_mer_profit,
-						'concession_pri'   => $plate_mer_profit,
+                        'concession_pri'   => $plate_mer_profit,
                         'cost'             => $attrInfo[$value['sku_id']]['cost'],
                         'ot_price'         => $attrInfo[$value['sku_id']]['ot_price'],
                         'gong_pension'     => $attrInfo[$value['sku_id']]['gong_pension']
@@ -1936,7 +1940,7 @@ class ProductRepository extends BaseRepository
                 'cost'             => $updateData[0]['cost'],
                 'ot_price'         => $updateData[0]['ot_price'],
                 'plate_mer_profit' => $updateData[0]['plate_mer_profit'],
-				'concession_pri'   => $updateData[0]['plate_mer_profit'],
+                'concession_pri'   => $updateData[0]['plate_mer_profit'],
                 'is_show'          => 0,
                 'yanglaojin_scale' => $yanglaojin_scale,
                 'type'             => $type

app/controller/api/merchant/sxy/Access.php

@@ -754,6 +754,41 @@ class Access
 
     //小程序支付
     public function pay_wechat_mp(StoreGroupOrderRepository $groupOrderRepository){
+
+        $oid = Request::param('oid','');
+
+
+        $store_order_data = Db::name('store_order')->where('group_order_id',$oid)->find();
+
+        $array_fzone_paytype = json_decode(  $store_order_data['fzone_paytype'],true);
+        if(!empty($array_fzone_paytype['type'])){
+
+            //a3 会员专区的现金+VR支付
+            if($array_fzone_paytype['type'] == 'a3'){
+
+                $userdata = Db::name('user')->where('uid',$store_order_data['uid'])->find();
+                //查询用户的VR是否足够
+                $vr_pri = $userdata['vr'] - $array_fzone_paytype['other'];
+                if($vr_pri < 0){
+                    return app('json')->fail('VR不足，请重试!');
+                }
+            }
+            //b2 精彩生活区的现金+积分支付
+            if($array_fzone_paytype['type'] == 'b2'){
+
+                //查询用户的积分是否足够
+                $score_pri = $userdata['score'] - $array_fzone_paytype['other'];
+                if($score_pri < 0){
+                    return app('json')->fail('积分不足，请重试!');
+                }
+            }
+
+
+        }else{
+            return app('json')->fail('数据异常，请重新下单,并选择支付方式!');
+        }
+
+
         try {
             log::info("微信小程序回调");
             Db::name('log')->insert(['data'=>'汇付订单支付pay_wechat_mp-66666666---发起支付']);