Merge branch 'master' into huangfamily

app/command/repairPaySuccess.php

@@ -0,0 +1,35 @@
+<?php
+declare (strict_types=1);
+
+namespace app\command;
+
+use app\common\repositories\store\order\StoreGroupOrderRepository;
+use app\common\repositories\store\order\StoreOrderRepository;
+use think\console\Command;
+use think\console\Input;
+use think\console\Output;
+use think\facade\Db;
+
+class repairPaySuccess extends Command
+{
+    protected function configure()
+    {
+        // 指令配置
+        $this->setName('repairPaySuccess')
+            ->setDescription('修复支付成功后数据');
+    }
+
+    /**
+     * @param Input $input
+     * @param Output $output
+     * @return void
+     */
+    protected function execute(Input $input, Output $output)
+    {
+        $orderSn = 'wx1744285736344558050';
+        $groupOrder = app()->make(StoreGroupOrderRepository::class)->getWhere(['group_order_sn' => $orderSn]);
+        app()->make(StoreOrderRepository::class)->paySuccess($groupOrder,1);
+        $output->writeln('执行结束');
+    }
+
+}

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

@@ -9775,18 +9775,18 @@ class StoreOrderRepository extends BaseRepository
                 }
             }
 
-            //锁客收益
-            if ($user_data['mer_id'] != 0) {
-                $merchant_data = Db::name('merchant')->where('mer_id', $user_data['mer_id'])->find();
-                $merchant_user_data = Db::name('user')->where('uid', $merchant_data['uid'])->find();
-                if (!empty($merchant_data) && !empty($merchant_user_data)) {
-                    $yj_amount_90 = bcmul($pv , 0.035, 2) * 0.9;
-                    $fgj_amount_10 = bcmul($pv, 0.035, 2) * 0.1;//推广者的佣金抽10%到个人复购金
-                    $this->fugou_user_log($merchant_data['uid'], $fgj_amount_10, $store_order_data['order_id'], 1, 1);
-                    //推广佣金
-                    $this->bill_user_log($merchant_data['uid'], bcmul($pv, 0.35, 2), $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得佣金', $store_order_data['mer_id']);
-                }
-            }
+            //锁客收益 todo 会员专区不做锁客 20250415
+//            if ($user_data['mer_id'] != 0) {
+//                $merchant_data = Db::name('merchant')->where('mer_id', $user_data['mer_id'])->find();
+//                $merchant_user_data = Db::name('user')->where('uid', $merchant_data['uid'])->find();
+//                if (!empty($merchant_data) && !empty($merchant_user_data)) {
+//                    $yj_amount_90 = bcmul($pv , 0.035, 2) * 0.9;
+//                    $fgj_amount_10 = bcmul($pv, 0.035, 2) * 0.1;//推广者的佣金抽10%到个人复购金
+//                    $this->fugou_user_log($merchant_data['uid'], $fgj_amount_10, $store_order_data['order_id'], 1, 1);
+//                    //推广佣金
+//                    $this->bill_user_log($merchant_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得佣金', $store_order_data['mer_id']);
+//                }
+//            }
 
             //会员专区，给用户升级判断
             $orderList = Db::name("store_order")->where("uid", $store_order_data['uid'])->where("mer_id", 496)->where("status", "in", [0, 1, 2, 3])->select();

app/controller/api/Notify.php

@@ -520,31 +520,31 @@ class Notify
 
                                 }
 
-                                //锁客收益
-                                if($user_data['mer_id'] != 0){
-
-                                    $merchant_data = Db::name('merchant')->where('mer_id',$user_data['mer_id'])->find();
-
-                                    $merchant_user_data = Db::name('user')->where('uid',$merchant_data['uid'])->find();
-
-                                    if(!empty($merchant_user_data)){
-
-
-                                        $yj_amount_90 = bcmul($pv * 0.9, 0.035,2);
-                                        $fgj_amount_10 = bcmul($pv * 0.1, 0.035,2);//推广者的佣金抽10%到个人复购金
-
-                                        $yj_amount = $merchant_data['brokerage_price'] + $yj_amount_90;
-                                        $fgj_amount = $merchant_data['fugou'] + $fgj_amount_10;
-                                        $this->fugou_user_log($merchant_data['uid'],$fgj_amount_10,$store_order_data['order_id'],1,1);
-
-
-
-                                        //Db::name('user')->where('uid',$merchant_data['uid'])->update(['brokerage_price'=>$yj_amount,'fugou'=>$fgj_amount]);
-                                        //推广佣金
-                                        $this->bill_user_log($merchant_data['uid'],round($pv * 0.35,2),$store_order_data['order_id'],3,$store_order_data['order_sn'],'推广获得佣金',$store_order_data['mer_id']);
-                                    }
-
-                                }
+                                //锁客收益  todo 会员专区不做锁客 20250415
+//                                if($user_data['mer_id'] != 0){
+//
+//                                    $merchant_data = Db::name('merchant')->where('mer_id',$user_data['mer_id'])->find();
+//
+//                                    $merchant_user_data = Db::name('user')->where('uid',$merchant_data['uid'])->find();
+//
+//                                    if(!empty($merchant_user_data)){
+//
+//
+//                                        $yj_amount_90 = bcmul($pv * 0.9, 0.035,2);
+//                                        $fgj_amount_10 = bcmul($pv * 0.1, 0.035,2);//推广者的佣金抽10%到个人复购金
+//
+//                                        $yj_amount = $merchant_data['brokerage_price'] + $yj_amount_90;
+//                                        $fgj_amount = $merchant_data['fugou'] + $fgj_amount_10;
+//                                        $this->fugou_user_log($merchant_data['uid'],$fgj_amount_10,$store_order_data['order_id'],1,1);
+//
+//
+//
+//                                        //Db::name('user')->where('uid',$merchant_data['uid'])->update(['brokerage_price'=>$yj_amount,'fugou'=>$fgj_amount]);
+//                                        //推广佣金
+//                                        $this->bill_user_log($merchant_data['uid'],$yj_amount_90,$store_order_data['order_id'],3,$store_order_data['order_sn'],'推广获得佣金',$store_order_data['mer_id']);
+//                                    }
+//
+//                                }
 
 
                                 $fzone_paytype = json_decode($store_order_data['fzone_paytype'],true);
@@ -587,30 +587,30 @@ class Notify
                                     
                                 }
 
-                                //会员专区，给用户升级判断
-                                $orderList = Db::name("store_order")->where("uid", $store_order_data['uid'])->where("mer_id", 496)->where("status", "in", [0, 1, 2, 3])->select();
-                                // 初始化总和变量
-                                $totalPayPrice = 0;
-
-                                // 遍历查询结果
-                                foreach ($orderList as $order) {
-                                    // 累加 pay_price
-                                    $totalPayPrice += $order['pay_price'];
-                                }
-
-                                $userdata = Db::name("user")->where("uid", $store_order_data['uid'])->find();
-
-                                if ($totalPayPrice >= 1180 && $totalPayPrice < 11800) {
-
-                                    if ($userdata['user_group'] <= 1) {
-                                        Db::name("user")->where("uid", $store_order_data['uid'])->update(["user_group" => 2]);
-                                    }
-
-                                } else if ($totalPayPrice >= 11800) {
-                                    if ($userdata['user_group'] <= 2) {
-                                        Db::name("user")->where("uid", $store_order_data['uid'])->update(["user_group" => 3]);
-                                    }
-                                }
+                                //会员专区，给用户升级判断 todo 疑似重复升级代码先做注释
+//                                $orderList = Db::name("store_order")->where("uid", $store_order_data['uid'])->where("mer_id", 496)->where("status", "in", [0, 1, 2, 3])->select();
+//                                // 初始化总和变量
+//                                $totalPayPrice = 0;
+//
+//                                // 遍历查询结果
+//                                foreach ($orderList as $order) {
+//                                    // 累加 pay_price
+//                                    $totalPayPrice += $order['pay_price'];
+//                                }
+//
+//                                $userdata = Db::name("user")->where("uid", $store_order_data['uid'])->find();
+//
+//                                if ($totalPayPrice >= 1180 && $totalPayPrice < 11800) {
+//
+//                                    if ($userdata['user_group'] <= 1) {
+//                                        Db::name("user")->where("uid", $store_order_data['uid'])->update(["user_group" => 2]);
+//                                    }
+//
+//                                } else if ($totalPayPrice >= 11800) {
+//                                    if ($userdata['user_group'] <= 2) {
+//                                        Db::name("user")->where("uid", $store_order_data['uid'])->update(["user_group" => 3]);
+//                                    }
+//                                }
 
 
                             } else {
@@ -1669,9 +1669,8 @@ class Notify
 
                     } 
                 }
-                $ds = 1;
             }
-           
+            $ds = 1;
         }
 
 

app/controller/api/store/product/StoreProduct.php

@@ -892,7 +892,7 @@ class StoreProduct extends BaseController
 //            $mmerchat_data = Db::name('merchant')->where('mer_id', $pdata['mer_id'])->find();
 //            $mer_name = $mmerchat_data['mer_name'];
             $price = $pdata['price'];
-            $yanglao=$ProductRepository->yanglaojin($pdata['product_id']);
+            $yanglao=$ProductRepository->pvParm($pdata['product_id']);
 //            if($pdata['type'] == 5){
 //                $mer_name = Db::name('big_warehouse') -> where('id',$pdata['dc_id']) -> value('warehouse_name');
 //            $price = $pdata['dc_price'];
@@ -914,7 +914,7 @@ class StoreProduct extends BaseController
 
                 'text' => array(
                     array(
-                        'text' => $yanglao,
+                        'text' => $yanglao['yanglao'],
                         'left' => 160,
                         'top' => 315,
                         'fontPath' => $filelink['Normal'],     //字体文件

app/controller/api/user/User.php

@@ -6313,4 +6313,27 @@ class User extends BaseController
 
     }
 
+    /**
+     * 解绑微信或支付宝
+     * @return void
+     */
+    public function unBindVxOrAli()
+    {
+        $uid = $this->request->uid();
+        $type = request()->param('type','');
+        if(!$type) return app('json')->fail('请选择解绑类型');
+        if(!$uid) return app('json')->fail('请登录');
+        // 1 = 微信  2 = 支付宝  3 = 全部
+        if($type == 1){
+            Db::name('user')->where('uid',$uid)->update(['wechat_user_id' => 0]);
+        }else if ($type == 2){
+            Db::name('user')->where('uid',$uid)->update(['ali_user_id' => 0]);
+        }else{
+            Db::name('user')->where('uid',$uid)->update(['wechat_user_id' => 0,'ali_user_id' => 0]);
+
+        }
+        Db::name('log')->insert(['data' => '用户uid：' . $uid . '进行解绑操作type类型为' . $type]);
+        return app('json')->success('解绑成功');
+    }
+
 }

config/console.php

@@ -30,5 +30,6 @@ return [
         'repair_pv_log' => 'app\command\repairPvLog',
         'gzcAddByBill' => 'app\command\GzcAddByBillCommand',
         'movie_order' => 'app\command\MovieOrderCommand',
+        'repair_pay_success' => 'app\command\repairPaySuccess',
     ],
 ];

route/api.php

@@ -324,6 +324,7 @@ Route::group('api/', function () {
             Route::get('vr_info','User/vr_info');//购物金
             Route::get('vr_list','User/vr_list');//购物金记录
             Route::get('vr_name','User/vr_name');//VR名称
+            Route::post('un_bind', 'User/unBindVxOrAli');//解绑微信或支付宝
 
         })->prefix('api.user.');