修改会员专区养老金和详情养老金和VR展示相关

app/common/repositories/store/order/StoreOrderRepository.php

@@ -2085,6 +2085,10 @@ class StoreOrderRepository extends BaseRepository
                 $num_yl = 9000;
             }else if($orderpri == '11800'){
                 $num_yl = 10000;
+            }else if($orderpri == '2360'){
+                $num_yl = 2000;
+            }else if($orderpri == '9440'){
+                $num_yl = 8000;
             }
 
             if($store_product_datas['mer_id'] == 496){

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

@@ -1001,6 +1001,10 @@ class ProductRepository extends BaseRepository
                 $s = 9000;
             }else if($res['price']==11800){
                 $s = 10000;
+            }else if($res['price'] == '2360'){
+                $s= 2000;
+            }else if($res['price'] == '9440'){
+                $s = 8000;
             }
             
             $res['yanglao'] = round($s * 0.035,2);

app/common/repositories/system/merchant/MerchantRepository.php

@@ -103,8 +103,8 @@ class MerchantRepository extends BaseRepository
         }
         unset($item);
         $merdata= [
-             ['className'=> 'el-icon-s-order', 'count'=>$count, 'field'=> '个', 'name'=> '商户总数']
-          ];
+            ['className'=> 'el-icon-s-order', 'count'=>$count, 'field'=> '个', 'name'=> '商户总数']
+        ];
         return compact('count', 'list','merdata');
     }
 
@@ -318,14 +318,14 @@ class MerchantRepository extends BaseRepository
         }
         $count = $query->count($this->dao->getPk());
         $list = $query->page($page, $limit)->setOption('field', [])
-                ->field('lat,lng,addr,mer_id,mer_banner,mer_name, mark,mer_avatar,product_score,service_score,postage_score,sales,status,create_time,category_id')
-                ->select()
-                ->each(function ($item) {
-                    $data = $item->showProduct->toArray();
-                    unset($item->showProduct);
-                    $recommend = array_slice($data, 0, 3);
-                    return $item['recommend'] = $recommend;
-                });
+            ->field('lat,lng,addr,mer_id,mer_banner,mer_name, mark,mer_avatar,product_score,service_score,postage_score,sales,status,create_time,category_id')
+            ->select()
+            ->each(function ($item) {
+                $data = $item->showProduct->toArray();
+                unset($item->showProduct);
+                $recommend = array_slice($data, 0, 3);
+                return $item['recommend'] = $recommend;
+            });
 
 
         return compact('count', 'list');
@@ -371,7 +371,7 @@ class MerchantRepository extends BaseRepository
             $merchant['like']=$like;
             $merchant['topping']=$topping;
         }
-        
+
 //        Db::name("merchant")->where("mer_id",$cartInfo['mer_id'])->inc('renqizhi', 1)
         $this->dao->addrenqi($id);
         if($merchant['content_pic']){
@@ -421,14 +421,14 @@ class MerchantRepository extends BaseRepository
         log::info($userInfo);
         log::info($type439);
         $list=app()->make(ProductRepository::class)->getApiSearch($merId, $where, $page, $limit, $userInfo,$type439);
-     
+
         $arr=[];
         foreach ($list["list"] as $v){
             $k= app()->make(ProductRepository::class)->pvParm($v['product_id']);
 //            $v['special_merchant']= merchantConfig($v['mer_id'], 'special_merchant');
-           
+
             log::info("==========yang= {$k['yanglao']} ");
-          
+
             $v['yanglao']='';
             $v['pv']='';
             $v['jifen']='';
@@ -436,17 +436,21 @@ class MerchantRepository extends BaseRepository
             $v['jfduihuan']='';
             $v['jdduihuan']='';
             //会员专区中VR或者现金和VR+现金形式
-          //支付组合
+            //支付组合
             $v['fzone_paytype'] = '';
             //$v['vr'] = 0;
             $num_yl = 0;
-            
+
             if($v['price'] == '1180'){
                 $num_yl = 1000;
             }else if($v['price'] == '10620'){
                 $num_yl = 9000;
             }else if($v['price'] == '11800'){
                 $num_yl = 10000;
+            }else if($v['price'] == '2360'){
+                $num_yl = 2000;
+            }else if($v['price'] == '9440'){
+                $num_yl = 8000;
             }
 
             if($merId == 496){
@@ -455,14 +459,14 @@ class MerchantRepository extends BaseRepository
                 $v['pv']=$num_yl;
                 //$v['vr']=$v['price'];
                 //1:为会员专区,
-               
+
                 $v['fzone_paytype']= [
                     1=>[
                         1=>$v['price'],//VR
                         2=>$v['price']//现金
                     ]
-                ];   
-             
+                ];
+
             }else if($merId == 439){
                 //精彩生活和商贸区
                 $jf = $v['price'] - round($v['concession_pri']*0.3, 2) . ' + ' . round($v['concession_pri']*0.3, 2);
@@ -476,7 +480,7 @@ class MerchantRepository extends BaseRepository
                     $v['gongxian'] = round($v['concession_pri'] * 0.35, 2);
                 }
             }
-            
+
 //            $v=($v,$k);
 //            array_push($v,$k);
             $arr[]=$v;
@@ -523,7 +527,7 @@ class MerchantRepository extends BaseRepository
         $query->with(['merchant'])->with(['issetCoupon']);
         $count = $query->count();
 //        echo DB::getlastsql();die;
-         $filed = 'product_id,mer_id,brand_id,unit_name,rate,reply_count,store_info,cate_id,ficti,image,slider_image,store_name,keyword,sort,is_show,sales,price,refusal,cost,ot_price,stock,is_gift_bag,care_count,status,is_used,create_time,seckill,plate_mer_profit,type';
+        $filed = 'product_id,mer_id,brand_id,unit_name,rate,reply_count,store_info,cate_id,ficti,image,slider_image,store_name,keyword,sort,is_show,sales,price,refusal,cost,ot_price,stock,is_gift_bag,care_count,status,is_used,create_time,seckill,plate_mer_profit,type';
         $list = $query->page($page, $limit)->setOption('field', [])->field($filed)->select();
         $ProductRepository=app()->make(ProductRepository::class);
 

app/controller/api/store/merchant/Taskordervr.php

@@ -70,6 +70,14 @@ class Taskordervr extends BaseController
         }
 
 
+
+        if($user_data['uid'] == $udatas['uid']){
+            return json(['code'=>400,'msg'=>'禁止付款账号和收款账号为同一人!','data'=>'']);
+        }
+
+
+
+
         $yue_vr =  $udatas['vr'] - $vr;
 
         if($yue_vr < 0){
@@ -79,22 +87,46 @@ class Taskordervr extends BaseController
         //return json(['code'=>400,'msg'=>$user_data['vr'] + $vr]);
         //支付s账号
         $user_res = Db::name("user")->where("uid",$uid)->update(['vr'=>$yue_vr]);
-        //收款账号
-        $jieshouuser_res = Db::name("user")->where("account",$phone)->update(['vr'=>$user_data['vr'] + $vr]);
-
-        if( $user_res){
-            return json(['code'=>200,'msg'=>'操作成功!','data'=>$user_res]);
+        if($user_res){
+            //支出账号存到log日志
+            $log_data = [
+                'uid'=>$uid,
+                'number'=>$vr,
+                'mark'=>"消耗VR:" . $vr,
+                'desc'=>"VR",
+                'order_id'=>0,
+                'surplus'=>$yue_vr,
+                'order_type'=>0,
+                'type'=>2,
+                'addtime'=>time()
+            ];
+            $user_res_log = Db::name("user_sign_vr")->insert( $log_data);
+
+            //收款账号
+            $jieshouuser_res = Db::name("user")->where("account",$phone)->update(['vr'=>$user_data['vr'] + $vr]);
+
+            if( $jieshouuser_res){
+
+                //收款账号存到log日志
+                $log_data1 = [
+                    'uid'=>$user_data['uid'],
+                    'number'=>$vr,
+                    'mark'=>"到账VR:" . $vr,
+                    'desc'=>"VR",
+                    'order_id'=>0,
+                    'surplus'=>$user_data['vr'] + $vr,
+                    'order_type'=>0,
+                    'type'=>1,
+                    'addtime'=>time()
+                ];
+                Db::name("user_sign_vr")->insert( $log_data1);
+
+                return json(['code'=>200,'msg'=>'操作成功!','data'=>$user_res]);
+            }
+        }else{
+            return json(['code'=>400,'msg'=>'转账失败，请稍后再试!']);
         }
 
 
-
-        // 正常处理请求
-        $data = input("post.");
-        //   $data = [
-        //       'name' => '张三',
-        //       'age' => 25
-        //   ];
-
-        return json($data);
     }
 }