Просмотр исходного кода

å修改é—æ红包记录问题

hefei 1 год назад
Родитель
Сommit
d0f7d16157

+ 31 - 0
app/command/PensionTasks.php

@@ -12,6 +12,7 @@ use app\common\repositories\merchant\order\OrderMerchantRepository;
12
 use app\common\repositories\store\order\StoreOrderStatusRepository;
12
 use app\common\repositories\store\order\StoreOrderStatusRepository;
13
 use app\common\repositories\store\product\ProductRepository;
13
 use app\common\repositories\store\product\ProductRepository;
14
 use app\common\repositories\user\UserBillRepository;
14
 use app\common\repositories\user\UserBillRepository;
15
+use app\common\repositories\user\UserRepository;
15
 use app\traits\GzcApiRequest;
16
 use app\traits\GzcApiRequest;
16
 use Carbon\Carbon;
17
 use Carbon\Carbon;
17
 use think\console\Command;
18
 use think\console\Command;
@@ -524,6 +525,9 @@ class PensionTasks extends Command
524
                             'status'          => 1,
525
                             'status'          => 1,
525
                             'settlement_time' => date('Y-m-d H:i:s')
526
                             'settlement_time' => date('Y-m-d H:i:s')
526
                         ]);
527
                         ]);
528
+                    /** @var UserRepository $userRepository */
529
+                    $userRepository = app()->make(UserRepository::class);
530
+                    $userRepository->setUserIdentity($user_sign_gongxian['uid']);
527
                 }
531
                 }
528
 
532
 
529
             });
533
             });
@@ -772,6 +776,33 @@ class PensionTasks extends Command
772
                             'status'          => 1,
776
                             'status'          => 1,
773
                             'settlement_time' => date('Y-m-d H:i:s')
777
                             'settlement_time' => date('Y-m-d H:i:s')
774
                         ]);
778
                         ]);
779
+                    /** @var UserRepository $userRepository */
780
+                    $userRepository = app()->make(UserRepository::class);
781
+                    $userRepository->setUserIdentity($user_sign_gongxian['uid']);
782
+                }
783
+
784
+                // 结算PV值
785
+                $user_pv_list = Db::name('user_pv_log')
786
+                    ->where('status', -1)
787
+                    ->where('order_id', $online['order_id'])
788
+                    ->whereIn('type', [1, 2])
789
+                    ->select()
790
+                    ->toArray();
791
+                if($user_pv_list) {
792
+                    foreach ($user_pv_list as $user_pv) {
793
+                        // 修改pv
794
+                        Db::name('user')
795
+                            ->where('uid', $user_pv['uid'])
796
+                            ->inc('pv', (float)$user_pv['pv'])
797
+                            ->update();
798
+                        Db::name('user_pv_log')
799
+                            ->where('status', -1)
800
+                            ->where('id', $user_pv['id'])
801
+                            ->update([
802
+                                'status'          => 1,
803
+                                'settlement_time' => date('Y-m-d H:i:s')
804
+                            ]);
805
+                    }
775
                 }
806
                 }
776
 
807
 
777
                 
808
                 

+ 12 - 0
app/common/repositories/user/UserThirdRepository.php

@@ -865,6 +865,18 @@ class UserThirdRepository extends BaseRepository
865
             Db::name("user_sign_gongxian")->insert($gongxian_data);//添加贡献记录
865
             Db::name("user_sign_gongxian")->insert($gongxian_data);//添加贡献记录
866
             log::info("===添加完积分和贡献值");
866
             log::info("===添加完积分和贡献值");
867
 
867
 
868
+            // 添加pv记录
869
+            $pv_data = [
870
+                "uid"           =>$user_id,
871
+                "pv"            =>$gongxian,
872
+                "addtime"       =>time(),
873
+                "status"        =>-1,
874
+                "order_type"    =>$type_shop,
875
+                "order_id"      =>$order_sn,
876
+                "mark"          =>"购买{$make}商品获得的PV",
877
+            ];
878
+            Db::name("user_pv_log")->insert($pv_data);//添加pv记录
879
+
868
             //判断是否是老用户  is_old=1是1.0的用户,1.0的用户要总pv*45%的红包
880
             //判断是否是老用户  is_old=1是1.0的用户,1.0的用户要总pv*45%的红包
869
             if($user["is_old"]==1){
881
             if($user["is_old"]==1){
870
                 //添加红包
882
                 //添加红包

+ 2 - 2
app/controller/api/user/User.php

@@ -219,10 +219,10 @@ class User extends BaseController
219
 
219
 
220
         if ($pm==0){
220
         if ($pm==0){
221
 
221
 
222
-            $data = DB::name('user_sign_hongbao')->where($where)->where('type', 1)->field('id,mark,number,type,addtime,order_id')->page($page, $limit)->order("id desc")->select();
222
+            $data = DB::name('user_sign_hongbao')->where($where)->where(['type' => 1,'status' => 1])->field('id,mark,number,type,addtime,order_id')->page($page, $limit)->order("id desc")->select();
223
         }
223
         }
224
         if($pm==1){
224
         if($pm==1){
225
-            $data = DB::name('user_sign_hongbao')->where($where)->where('type', 2)->field('id,mark,number,type,addtime,order_id')->page($page, $limit)->order("id desc")->select();
225
+            $data = DB::name('user_sign_hongbao')->where($where)->where(['type' => 2,'status' => 1])->field('id,mark,number,type,addtime,order_id')->page($page, $limit)->order("id desc")->select();
226
 
226
 
227
         }
227
         }
228
         if($pm==2){
228
         if($pm==2){