소스 검색

完善支付消耗记录日志

sunxbiao 1 년 전
부모
커밋
8b2bb8f7eb
2개의 변경된 파일38개의 추가작업 그리고 39개의 파일을 삭제
  1. 26 26
      app/common/repositories/store/order/StoreOrderRepository.php
  2. 12 13
      app/controller/api/Notify.php

+ 26 - 26
app/common/repositories/store/order/StoreOrderRepository.php

@@ -959,19 +959,19 @@ class StoreOrderRepository extends BaseRepository
959 959
                             //     $groupOrder['er1'] = "支付失败,积分不足";
960 960
                             // }
961 961
 
962
-                            $pricepri = $userdatas['score'] - $array_fzone_paytype['other'];
963
-                            Db::name('user_sign_score')->insert([
964
-                                'uid' => $uid,
965
-                                'reward_socre' => $array_fzone_paytype['other'],
966
-                                'addtime' => time(),
967
-                                'status' => 1,
968
-                                'order_type' => 0,
969
-                                'order_id' => $_order->order_id,
970
-                                'mark' => '购买商品消费积分',
971
-                                'desc' => '',
972
-                                'surplus' => $pricepri,
973
-                                'pm' => 2
974
-                            ]);
962
+                            // $pricepri = $userdatas['score'] - $array_fzone_paytype['other'];
963
+                            // Db::name('user_sign_score')->insert([
964
+                            //     'uid' => $uid,
965
+                            //     'reward_socre' => $array_fzone_paytype['other'],
966
+                            //     'addtime' => time(),
967
+                            //     'status' => -1,
968
+                            //     'order_type' => 0,
969
+                            //     'order_id' => $_order->order_id,
970
+                            //     'mark' => '购买商品消费积分',
971
+                            //     'desc' => '',
972
+                            //     'surplus' => $pricepri,
973
+                            //     'pm' => 2
974
+                            // ]);
975 975
 
976 976
 
977 977
                         } else if (!empty($array_fzone_paytype['type'] == 'b3')) {
@@ -1022,19 +1022,19 @@ class StoreOrderRepository extends BaseRepository
1022 1022
 
1023 1023
                         } else if (!empty($array_fzone_paytype['type'] == 'b4')) {
1024 1024
                             // 精彩生活区 现金+京豆
1025
-                            $pricepri = $userdatas['jingdou'] - $array_fzone_paytype['other'];
1026
-                            Db::name('user_sign_jingdou')->insert([
1027
-                                'uid' => $uid,
1028
-                                'number' => $array_fzone_paytype['other'],
1029
-                                'status' => 1,
1030
-                                'mark' => '购买商品消费京豆',
1031
-                                'addtime' => time(),
1032
-                                'surplus' => $pricepri,
1033
-                                'settlement_time' => date('Y-m-d H:i:s'),
1034
-                                'type' => 2,
1035
-                                'order_type' => 0,
1036
-                                'order_id' => $_order->order_id
1037
-                            ]);
1025
+                            // $pricepri = $userdatas['jingdou'] - $array_fzone_paytype['other'];
1026
+                            // Db::name('user_sign_jingdou')->insert([
1027
+                            //     'uid' => $uid,
1028
+                            //     'number' => $array_fzone_paytype['other'],
1029
+                            //     'status' => 1,
1030
+                            //     'mark' => '购买商品消费京豆',
1031
+                            //     'addtime' => time(),
1032
+                            //     'surplus' => $pricepri,
1033
+                            //     'settlement_time' => date('Y-m-d H:i:s'),
1034
+                            //     'type' => 2,
1035
+                            //     'order_type' => 0,
1036
+                            //     'order_id' => $_order->order_id
1037
+                            // ]);
1038 1038
 
1039 1039
 //                            $groupOrder['er'] = 1;
1040 1040
 //                            $groupOrder['er1'] = "开发中升级中!";

+ 12 - 13
app/controller/api/Notify.php

@@ -801,19 +801,18 @@ class Notify
801 801
                                     // 现金+京豆
802 802
                                     if($jdpri  >= 0 ){
803 803
                                         Db::name("user")->where("uid", $user_data['uid'])->update(['jingdou'=>$jdpri]);
804
-                                        //消费京豆日志
805
-                                        $log_data = [
806
-                                            "uid" => $user_data['uid'],
807
-                                            "reward_socre" => $array_fzone_paytype['other'],
808
-                                            "addtime" => time(),
809
-                                            "status" => 1,
810
-                                            "order_id" => $store_order_data['order_id'],
811
-                                            "mark" => "购买" . $wenan . "商品消费京豆",
812
-                                            "surplus" => $jdpri,
813
-                                            "pm" => 2,
814
-                                            "source_type" => 5
815
-                                        ];
816
-                                        Db::name("user_sign_score")->insert($log_data);
804
+                                        Db::name('user_sign_jingdou')->insert([
805
+                                            'uid' => $user_data['uid'],
806
+                                            'number' => $array_fzone_paytype['other'],
807
+                                            'status' => 1,
808
+                                            'mark' => '购买商品消费京豆',
809
+                                            'addtime' => time(),
810
+                                            'surplus' => $jdpri,
811
+                                            'settlement_time' => date('Y-m-d H:i:s'),
812
+                                            'type' => 2,
813
+                                            'order_type' => 0,
814
+                                            'order_id' => $store_order_data['order_id']
815
+                                        ]);
817 816
                                     }else{
818 817
                                         $note_arr = [
819 818
                                             "uid"=>$user_data['uid'],