Merge branch 'dev' into dev-sxb

app/command/PensionTasks.php

@@ -67,7 +67,7 @@ class PensionTasks extends Command
 //            $this->doThridVipOrderGzc($nowTime, $timeLimit = 30);
 //            $this->doThridDyOrderGzc($nowTime, $timeLimit = 30);
 //            $this->doThridHfOrderGzc($nowTime, $timeLimit = 30);
-            $this->billGzcAdd($nowTime);
+//             $this->billGzcAdd($nowTime);
             //升级
 //            $this -> doUpgrade();
         } catch (\Throwable $e) {
@@ -142,6 +142,18 @@ class PensionTasks extends Command
                     case "9":
                         $online = Db::table('rrx_order_huafei')->where('uid', $bill['uid'])->where('order_sn', $bill['order_sn'])->find();
                         break;
+                    case "10":
+                        $online = Db::table('rrx_order_merchant')
+                            ->where('uid', $bill['uid'])
+                            ->where('out_trade_no', $bill['order_sn'])
+                            ->where('paid', 1)
+                            ->where('status', 1)
+                            ->find();
+                        if (!empty($online)) {
+                            $online = $online->toArray();
+                            $online['order_sn'] = $online['out_trade_no'];
+                        }
+                        break;
                     default:
                         $online = Db::table('rrx_store_order')->where('uid', $bill['uid'])->where('order_sn', $bill['order_sn'])->where('paid', 1)->find();
                 }

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

@@ -9669,23 +9669,6 @@ class StoreOrderRepository extends BaseRepository
                         $sm_status = 1;
                         Db::name('store_order')->where("order_id", $order_id)->update(['gzc' => 1]);
 
-                        //添加养老金到公证处日志
-                        $ylj_data_log = [
-                            'user_name' => $get_cer_datas['user_name'],
-                            "mobile" => $get_cer_datas['mobile'],
-                            "user_card" => $get_cer_datas['user_card'],//身份证
-                            "pension" => $num,//养老金额度
-                            "out_trade_no" => $order_from_mer['order_sn'],//订单号
-                            "account_type" =>  $pay_type,//支付方式(3:微信,4:组合)
-                            "order_type" => 0,//订单类型(2:)
-                            "pay_time" => date('Y-m-d H:i:s'),
-                            "create_time" => date('Y-m-d H:i:s'),
-                            "update_time" => date('Y-m-d H:i:s'),
-                            "uid" => $uid,
-                        ];
-
-                        Db::name('gzc_logs')->insert($ylj_data_log);
-
                     }
                 }
 
@@ -9729,6 +9712,7 @@ class StoreOrderRepository extends BaseRepository
             'order_type' => 1,//1自营  2 第三方  订单类型
             'is_red_brokerage' => 0,//1红积分对冲佣金 0正常佣金
             'gzc' => $sm_status,//养老金是否已进入公证处log表0：未进入。1：已进入
+            'is_gzc' => $sm_status,//0：未发起 1：已发起 2：已成功
             'take_time' => $take_time,//结算时间
             'district_id' => '',//
             'street_id' => '',//
@@ -9736,7 +9720,26 @@ class StoreOrderRepository extends BaseRepository
 
         ];
 
-        Db::name('user_bill')->insert($bill);
+        $bill_id = Db::name('user_bill')->insertGetId($bill);
+        if ($sm_status == 1) {
+            //添加养老金到公证处日志
+            $ylj_data_log = [
+                'user_name' => $get_cer_datas['user_name'],
+                "mobile" => $get_cer_datas['mobile'],
+                "user_card" => $get_cer_datas['user_card'],//身份证
+                "pension" => $num,//养老金额度
+                "out_trade_no" => $order_from_mer['order_sn'],//订单号
+                "account_type" => $pay_type,//支付方式(3:微信,4:组合)
+                "order_type" => 0,//订单类型(2:)
+                "pay_time" => date('Y-m-d H:i:s'),
+                "create_time" => date('Y-m-d H:i:s'),
+                "update_time" => date('Y-m-d H:i:s'),
+                "uid" => $uid,
+                "platform_no" => 'IN10' . (int)(microtime(true) * 1000) . mt_rand(10000, 99999),
+                "link_id" => $bill_id
+            ];
+            Db::name('gzc_logs')->insert($ylj_data_log);
+        }
     }
 
     //添加复购金

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

@@ -1095,7 +1095,7 @@ class StoreRefundOrderRepository extends BaseRepository
             ->find();
         $array_fzone_paytype = json_decode($group_order_map['fzone_paytype'], true);
         // 'a1' 不能退 会员专区
-        if ($pay_type['pay_type'] == 5 || in_array($array_fzone_paytype['type'], ['b1', 'b3', 'b5'])) {
+        if ($pay_type['pay_type'] == 5 || in_array($array_fzone_paytype['type'], ['b1', 'b3', 'b5', 'c1'])) {
             Db::name('store_order')->where('order_id',$res['order_id'])->update(['status'=>'-1']);
 
 //            $special_merchant = merchantConfig($pay_type['pay_mer_id'], 'special_merchant');

app/controller/admin/order/RefundOrder.php

@@ -283,26 +283,25 @@ class RefundOrder extends BaseController
                     ];
                     Db::name('user_sign_vr')->insert($insertdata);
 
+                } else if ($array_fzone_paytype['type'] == 'c1') {
+                    // {"checked":true,"note":"复购金","other":1.5,"price":8.5,"total":0.0,"type":"c1","vr":"48799.82"}
+                    $vrpri = Db::name("user")->where("uid", $group_order_map['uid'])->value('fugou');
+                    $vrpri += $array_fzone_paytype['price'];
+                    Db::name("user")->where("uid", $group_order_map['uid'])->update(['fugou' => $vrpri]);
+                    //支出账号存到log日志
+                    $log_data = [
+                        'uid' => $store_order_info['uid'],
+                        'number' => $array_fzone_paytype['price'],
+                        'mark' => "复购区商品申请退款退回复购金:" . $array_fzone_paytype['price'],
+                        'desc' => "复购金",
+                        'order_id' => $store_order_info['order_id'],
+                        'surplus' => $vrpri,
+                        'order_type' => 0,
+                        'type' => 1,
+                        'addtime' => time()
+                    ];
+                    Db::name("user_sign_fugou")->insert($log_data);
                 }
-                // else if ($array_fzone_paytype['type'] == 'c1') {
-                //     // {"checked":true,"note":"复购金","other":1.5,"price":8.5,"total":0.0,"type":"c1","vr":"48799.82"}
-                //     $vrpri = Db::name("user")->where("uid", $group_order_map['uid'])->value('fugou');
-                //     $vrpri += $array_fzone_paytype['other'];
-                //     Db::name("user")->where("uid", $group_order_map['uid'])->update(['fugou' => $vrpri]);
-                //     //支出账号存到log日志
-                //     $log_data = [
-                //         'uid' => $store_order_info['uid'],
-                //         'number' => $array_fzone_paytype['price'],
-                //         'mark' => "复购区商品申请退款退回复购金:" . $array_fzone_paytype['price'],
-                //         'desc' => "复购金",
-                //         'order_id' =>  $store_order_info['order_id'],
-                //         'surplus' => $vrpri,
-                //         'order_type' => 0,
-                //         'type' => 2,
-                //         'addtime' => time()
-                //     ];
-                //     $user_res_log = Db::name("user_sign_fugou")->insert($log_data);
-                // }
             }
 
             // 取消 订单所发放的福利

app/controller/api/Notify.php

@@ -1728,25 +1728,7 @@ class Notify
                         $sm_status = 1;
                         $ds = 1;
                         Db::name('store_order')->where("order_id", $order_id)->update(['gzc' => 1]);
-
-                        //添加养老金到公证处日志
-                        $ylj_data_log = [
-                            'user_name' => $get_cer_datas['user_name'],
-                            "mobile" => $get_cer_datas['mobile'],
-                            "user_card" => $get_cer_datas['user_card'],//身份证
-                            "pension" => $num,//养老金额度
-                            "out_trade_no" =>  $order_from_mer['order_sn'],//订单号
-                            "account_type" =>  $pay_type,//支付方式(3:微信,4:组合)
-                            "order_type" => 0,//订单类型(2:)
-                            "pay_time" => date('Y-m-d H:i:s'),
-                            "create_time" => date('Y-m-d H:i:s'),
-                            "update_time" => date('Y-m-d H:i:s'),
-                            "uid" => $uid,
-                        ];
-
-                        Db::name('gzc_logs')->insert($ylj_data_log);
-
-                    } 
+                    }
                 }
             }
             $ds = 1;
@@ -1787,6 +1769,7 @@ class Notify
             'order_type'=>1,//1自营  2 第三方  订单类型
             'is_red_brokerage'=>0,//1红积分对冲佣金 0正常佣金
             'gzc'=> $sm_status,//养老金是否已进入公证处log表0：未进入。1：已进入
+            'is_gzc' => $sm_status,//0：未发起 1：已发起 2：已成功
             'take_time'=>$take_time,//结算时间
             'district_id'=>'',//
             'street_id'=>'',//
@@ -1794,8 +1777,27 @@ class Notify
 
         ];
 
-        Db::name('user_bill')->insert($bill);
-        
+        $bill_id = Db::name('user_bill')->insertGetId($bill);
+
+        if ($sm_status == 1) {
+            //添加养老金到公证处日志
+            $ylj_data_log = [
+                'user_name' => $get_cer_datas['user_name'],
+                "mobile" => $get_cer_datas['mobile'],
+                "user_card" => $get_cer_datas['user_card'],//身份证
+                "pension" => $num,//养老金额度
+                "out_trade_no" => $order_from_mer['order_sn'],//订单号
+                "account_type" => $pay_type,//支付方式(3:微信,4:组合)
+                "order_type" => 0,//订单类型(2:)
+                "pay_time" => date('Y-m-d H:i:s'),
+                "create_time" => date('Y-m-d H:i:s'),
+                "update_time" => date('Y-m-d H:i:s'),
+                "uid" => $uid,
+                "platform_no" => 'IN10' . (int)(microtime(true) * 1000) . mt_rand(10000, 99999),
+                "link_id" => $bill_id
+            ];
+            Db::name('gzc_logs')->insert($ylj_data_log);
+        }
     }
 
     //添加复购金

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

@@ -128,7 +128,7 @@ class TaskPartnerProfits
             ->toArray();
         $removeUserIdList = array_column($removeUserList, 'uid');
 
-        $zeroLineUidList = [1420, 2328];
+        $zeroLineUidList = [1420, 2328, 1720];
         foreach ($zeroLineUidList as $uid) {
 
             //查询当前团队的用户列表

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

@@ -49,27 +49,25 @@ class Taskorderguquan
             '13959100621' => 300,
             '13701061395' => 300,
             '17501006833' => 300,
-            '13521438652' => 300,
+            '13521438652' => 200,
             '15832971815' => 300,
-            '18600200909' => 300,
-            '15810064711' => 300,
-            '18001316701' => 300,
-            '13932925303' => 300,
-            '13601071082' => 200,
+            '18600200909' => 200,
+            '15810064711' => 200,
+            '18001316701' => 200,
+            '13601071082' => 100,
             '13161909228' => 50,
-            '18603401312' => 50,
+            '18603401312' => 300,
             '18760167163' => 50,
             '18911752386' => 50,
             '13215917919' => 50,
             '15332507711' => 50,
             '15960349661' => 50,
-            '13381085923' => 50,
-            '13683609309' => 50,
-            '13601179856' => 50,
             '13901074090' => 200,
-            '18715313601' => 400
+            '18612051372' => 50,
+            '18715313601' => 350
         ];
 
+
         $result = Db::name("user")
             ->whereIn("account", array_keys($data))
             ->where('is_del', 0)
@@ -816,7 +814,7 @@ class Taskorderguquan
             ->toArray();
         $removeUserIdList = array_column($removeUserList, 'uid');
 
-        $zeroLineUidList = [1420, 2328];
+        $zeroLineUidList = [1420, 2328, 1720];
         foreach ($zeroLineUidList as $uid) {
             //查询当前团队的用户列表
             $sql = "select getUserLevelId($uid) as uids";

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

@@ -361,7 +361,7 @@ class Taskorderlianc
             ->toArray();
         $removeUserIdList = array_column($removeUserList, 'uid');
 
-        $zeroLineUidList = [1420, 2328];
+        $zeroLineUidList = [1420, 2328, 1720];
         foreach ($zeroLineUidList as $uid) {
             //查询当前团队的用户列表
             $sql = "select getUserLevelId($uid) as uids";

app/controller/merchant/store/order/RefundOrder.php

@@ -283,26 +283,25 @@ class RefundOrder extends BaseController
                     ];
                     Db::name('user_sign_vr')->insert($insertdata);
 
+                } else if ($array_fzone_paytype['type'] == 'c1') {
+                    // {"checked":true,"note":"复购金","other":1.5,"price":8.5,"total":0.0,"type":"c1","vr":"48799.82"}
+                    $vrpri = Db::name("user")->where("uid", $group_order_map['uid'])->value('fugou');
+                    $vrpri += $array_fzone_paytype['price'];
+                    Db::name("user")->where("uid", $group_order_map['uid'])->update(['fugou' => $vrpri]);
+                    //支出账号存到log日志
+                    $log_data = [
+                        'uid' => $store_order_info['uid'],
+                        'number' => $array_fzone_paytype['price'],
+                        'mark' => "复购区商品申请退款退回复购金:" . $array_fzone_paytype['price'],
+                        'desc' => "复购金",
+                        'order_id' => $store_order_info['order_id'],
+                        'surplus' => $vrpri,
+                        'order_type' => 0,
+                        'type' => 1,
+                        'addtime' => time()
+                    ];
+                    Db::name("user_sign_fugou")->insert($log_data);
                 }
-                // else if ($array_fzone_paytype['type'] == 'c1') {
-                //     // {"checked":true,"note":"复购金","other":1.5,"price":8.5,"total":0.0,"type":"c1","vr":"48799.82"}
-                //     $vrpri = Db::name("user")->where("uid", $group_order_map['uid'])->value('fugou');
-                //     $vrpri += $array_fzone_paytype['other'];
-                //     Db::name("user")->where("uid", $group_order_map['uid'])->update(['fugou' => $vrpri]);
-                //     //支出账号存到log日志
-                //     $log_data = [
-                //         'uid' => $store_order_info['uid'],
-                //         'number' => $array_fzone_paytype['price'],
-                //         'mark' => "复购区商品申请退款退回复购金:" . $array_fzone_paytype['price'],
-                //         'desc' => "复购金",
-                //         'order_id' =>  $store_order_info['order_id'],
-                //         'surplus' => $vrpri,
-                //         'order_type' => 0,
-                //         'type' => 2,
-                //         'addtime' => time()
-                //     ];
-                //     $user_res_log = Db::name("user_sign_fugou")->insert($log_data);
-                // }
             }
 
             // 取消 订单所发放的福利