Merge branch 'master' into huangfamily

app/command/HuafeiOrderIndependentAccount.php

@@ -0,0 +1,87 @@
+<?php
+
+namespace app\command;
+
+use app\common\model\store\order\StoreOrder;
+use app\common\model\user\UserCertification;
+use app\common\repositories\merchant\order\OrderGzcRepository;
+use app\common\repositories\merchant\order\OrderMerchantRepository;
+use app\common\repositories\store\order\StoreOrderRepository;
+use app\common\repositories\store\order\StoreOrderStatusRepository;
+use app\common\repositories\user\UserBillRepository;
+use app\common\repositories\user\UserRepository;
+use Carbon\Carbon;
+use think\console\Command;
+use think\console\Input;
+use think\console\Output;
+use think\facade\Db;
+use think\facade\Log;
+
+class HuafeiOrderIndependentAccount extends Command
+{
+    protected function configure()
+    {
+        // 指令配置
+        $this->setName('huafei-order-independent-account')
+            ->setDescription('话费订单分账');
+    }
+
+    protected function execute(Input $input, Output $output)
+    {
+        // @todo 精彩生活区订单分账
+        $this->doHuafeiOrderIndependentAccount();
+    }
+
+    /**
+     * 会员专区、精彩生活区订单分账
+     *
+     * @param $merId
+     * @param $timeLimit
+     * @return void
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     */
+    private function doHuafeiOrderIndependentAccount($timeLimit = 1)
+    {
+        $dst_mer_id = systemConfig('mer_365');
+
+        // 商户信息
+        $merchants = [];
+
+        $time = time();
+        // 订单状态（0：待发货；1：待收货；2：待评价；3：已完成；4已申请退款；-1：已退款）5未支付 6已取消'
+        $status = [2];
+        // 普通订单
+        $cursor = Db::table('rrx_order_huafei')->where('is_independentaccount', 0)->whereIn('status', $status)->cursor();
+
+        /** @var StoreOrderRepository $storeOrderRepository */
+        $storeOrderRepository = app()->make(StoreOrderRepository::class);
+
+        foreach ($cursor as $key => $value) {
+            $settlement_period_time = strtotime($value['create_time']) + $timeLimit * 24 * 3600;
+            // @todo 下单后第{$timeLimit}天后可分账
+            if ($settlement_period_time >= $time) {
+                $merchants['496'] = Db::name('merchant')->where('mer_id', 496)->find();
+                $order_huafei_hf = Db::name('order_huafei_hf')->where('order_no', $value['order_sn'])->find();
+                if(!$order_huafei_hf) continue;
+                $value['mer_id'] = 496;
+                $order_huafei_hf['mer_id'] = 496;
+
+                // 分账账号 496：表示{会员专区}账户，分账到{会员专区}账户
+                $independentAccount = $storeOrderRepository->getIndependentAccountHuafei($order_huafei_hf, $dst_mer_id, $merchants['496']['hf_member_id']);
+
+                // @todo 预分账处理 分账到{会员专区}账户，故：hf_platform_member_id 为入账账户
+                $isSuccessed = $storeOrderRepository->prepareExecuteIndependentAccountHuafei(
+                    $value, $order_huafei_hf, $independentAccount['api_key'], $independentAccount['hf_platform_member_id'], '', $value['pay_price'], 0
+                );
+
+                if ($isSuccessed) {
+                    Db::name("log")->insert(array('data' => '话费-订单分账：' . json_encode($value, JSON_FORCE_OBJECT)));//日志记录
+                    Db::table('rrx_order_huafei')->where('order_sn', $value['order_sn'])->update(['is_independentaccount' => 1]);
+                }
+            }
+        }
+    }
+
+}

app/command/PensionTasks.php

@@ -473,7 +473,7 @@ class PensionTasks extends Command
             if (!$certification) {
                 Log::info($online['uid'] . '没有实名认证');
                 continue;
-            }
+            }   
             //查询养老金金额
             $UserBillRepository = app()->make(UserBillRepository::class);
             $bill               = $UserBillRepository->getWhere(['uid' => $online['uid'], 'link_id' => $online['order_id'], 'order_sn' => $online['order_sn'], 'commission_type' => 5]);
@@ -484,10 +484,10 @@ class PensionTasks extends Command
                 continue;
             }
             //首信易分账
-            $StoreOrderRepository = app()->make(StoreOrderRepository::class);
-            if ($online['pay_type'] > 0) {
-                $StoreOrderRepository->splitOrder($online);
-            }
+            // $StoreOrderRepository = app()->make(StoreOrderRepository::class);
+            // if ($online['pay_type'] > 0) {
+            //     $StoreOrderRepository->splitOrder($online);
+            // }
 
             Db::transaction(function () use ($certification, $online, $pension, $OrderGzcRepository, $OrderMerchantRepository, $StoreOrderRepository) {
                 //新增入账明细记录

app/common/repositories/merchant/order/OrderMerchantRepository.php

@@ -359,7 +359,7 @@ class OrderMerchantRepository extends BaseRepository
                 }
             }
             if ($paramOrder['avatar'] == null) {
-                $paramOrder['avatar'] = 'http://app.bjtdba.com/uploads/def/20201118/5984361a2e00f5407776bcd6eaaae1ce.png';
+                $paramOrder['avatar'] = 'https://cdn.bjtdba.com/vod/image/2025-01-21/20250121180855764.png';
             }
             $order = Db::transaction(function () use ($paramOrder) {
                 $merchantOrder = $this->dao->create($paramOrder);
@@ -425,7 +425,7 @@ class OrderMerchantRepository extends BaseRepository
         }
 //        Db::name('log')->insert(['data' => json_encode($paramOrder)]);
         if ($paramOrder['avatar'] == null) {
-            $paramOrder['avatar'] = 'http://app.bjtdba.com/uploads/def/20201118/5984361a2e00f5407776bcd6eaaae1ce.png';
+            $paramOrder['avatar'] = 'https://cdn.bjtdba.com/vod/image/2025-01-21/20250121180855764.png';
         }
         $order = Db::transaction(function () use ($paramOrder) {
             $merchantOrder = $this->dao->create($paramOrder);
@@ -902,7 +902,7 @@ class OrderMerchantRepository extends BaseRepository
                     $unionData = [
                         'unionid' => $order->pay_user_id,
                         'nickname' => $order->nickname ?: time(),
-                        'avatar' => $order->avatar ?: 'http://app.bjtdba.com/uploads/def/20201118/5984361a2e00f5407776bcd6eaaae1ce.png',
+                        'avatar' => $order->avatar ?: 'https://cdn.bjtdba.com/vod/image/2025-01-21/20250121180855764.png',
                         'is_lock' => 1,
                         'lock_mer_id' => $order->mer_id,
                         'lock_time' => date('Y-m-d H:i:s'),
@@ -917,7 +917,7 @@ class OrderMerchantRepository extends BaseRepository
                     } else {
                         $updateData = [
                             'nickname' => $order->nickname ?: time(),
-                            'avatar' => $order->avatar ?: 'http://app.bjtdba.com/uploads/def/20201118/5984361a2e00f5407776bcd6eaaae1ce.png',
+                            'avatar' => $order->avatar ?: 'https://cdn.bjtdba.com/vod/image/2025-01-21/20250121180855764.png',
                             'balance' => Db::raw('balance+' . $order->money),
                             'give_money' => Db::raw('give_money+' . $order->give_money),
                             'pension' => Db::raw('pension+' . $order->pension),
@@ -1583,6 +1583,8 @@ class OrderMerchantRepository extends BaseRepository
         //可分总佣金
         $divisible_commission = bcmul($order['pay_price'], bcdiv($mer_fanyongbili, '100', 2), 2);//让利部分
         $pv = bcmul($divisible_commission, '0.7', 2);//商家让利部分30%给消费者做养老金，70%做业绩PV
+        //更新值
+        Db::name("order_merchant")->where('id', $order_id)->where('out_trade_no', $order_sn)->update(['available'=>$divisible_commission]);
 
         /**
          * 各自的比例开始
@@ -1598,6 +1600,34 @@ class OrderMerchantRepository extends BaseRepository
          * 各自的比例结束
          */
 
+        $gongxian = Db::name('user_sign_gongxian')->where('order_id', $order_id)->find();
+        if(!$gongxian){
+            ///用户可以拿到PV等值贡献值
+            if ($pv >= 0.01) {
+                //贡献值
+                $gongxian_data = [
+                    "uid"           =>$order["uid"]??0,
+                    "number"  =>    $pv,
+                    "addtime"       =>time(),
+                    "status"        =>1,
+                    "order_type"    =>1,
+                    "order_id"      =>$order_id,
+                    "mark"          =>"扫码消费获得赠送贡献值",
+                    "desc"          =>'',
+                    "surplus"       =>$pv,
+                    "type"          =>1,
+                    'settlement_time' => date('Y-m-d H:i:s')
+                ];
+                Db::name("user_sign_gongxian")->insert($gongxian_data);//添加记录
+            } else {
+                Db::name('log')->insert(['data' => '订单号：' . $order['order_sn'] . '付款额度较低或 商家、平台设置的返佣比例较低，积分和贡献值低于0.01无法入库 特此记录！']);
+            }
+        }
+
+
+
+
+
         // 商户---------------------------------------------------------------------------------------------------------------
 
         $mer_data = Db::name('merchant')->where('mer_id', $order['mer_id'])->field('uid,mer_id')->find();
@@ -1605,28 +1635,28 @@ class OrderMerchantRepository extends BaseRepository
         $merchant_user = $userRepository->getOne(['uid' => $mer_data["uid"]]);
 
         //商户得到的(京豆和贡献值奖励的倍，后台设置)
-        $gongxian = bcmul($divisible_commission, $mer_gonxian, 2);
-        if ($gongxian >= 0.01) {
-            $gongxian_data = [
-                "uid"           =>$mer_data["uid"],
-                "mer_id"        =>$order["mer_id"],
-                "pv"            =>$pv,
-                "number"  =>    $gongxian,
-                "addtime"       =>time(),
-                "status"        =>1,
-                "order_type"    =>2,
-                "order_id"      =>$order_id,
-                "mark"          =>"用户消费商家获得赠送贡献值",
-                "desc"          =>'',
-                "surplus"       =>$gongxian,
-                "type"          =>1
-            ];
-            Db::name("user_sign_gongxian")->insert($gongxian_data);//添加记录
-            $merchant_user->contribute = bcadd($merchant_user->contribute, (float)$gongxian,2);
-            $merchant_user->save();
-        } else {
-            Db::name('log')->insert(['data' => '订单号：' . $order['order_sn'] . '付款额度较低或 商家、平台设置的返佣比例较低，贡献值低于0.01无法入库 特此记录！']);
-        }
+        // $gongxian = bcmul($divisible_commission, $mer_gonxian, 2);
+        // if ($gongxian >= 0.01) {
+            // $gongxian_data = [
+            //     "uid"           =>$mer_data["uid"],
+            //     "mer_id"        =>$order["mer_id"],
+            //     "pv"            =>$pv,
+            //     "number"  =>    $gongxian,
+            //     "addtime"       =>time(),
+            //     "status"        =>1,
+            //     "order_type"    =>2,
+            //     "order_id"      =>$order_id,
+            //     "mark"          =>"用户消费商家获得赠送贡献值",
+            //     "desc"          =>'',
+            //     "surplus"       =>$gongxian,
+            //     "type"          =>1
+            // ];
+            // Db::name("user_sign_gongxian")->insert($gongxian_data);//添加记录
+        //     $merchant_user->contribute = bcadd($merchant_user->contribute, (float)$gongxian,2);
+        //     $merchant_user->save();
+        // // } else {
+        //     Db::name('log')->insert(['data' => '订单号：' . $order['order_sn'] . '付款额度较低或 商家、平台设置的返佣比例较低，贡献值低于0.01无法入库 特此记录！']);
+        // }
 
         //商户得到的(京豆和贡献值奖励的倍，后台设置)
         $jd = bcmul($divisible_commission, $mer_jd, 2);

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

@@ -1134,14 +1134,7 @@ class StoreOrderRepository extends BaseRepository
                             /** @var UserThirdRepository $orderThird */
                             $orderThird = app()->make(\app\common\repositories\user\UserThirdRepository::class);
                             //预估养老金
-//                            $orderThird->yuguOrder(
-//                                $_order->order_id,
-//                                $commissionMoney,
-//                                $uid,
-//                                $_order->order_sn,
-//                                $type_shop,
-//                                'order_fugou'
-//                            );
+
                             //复购区 - 预估养老金
                             $orderThird->repurchaseAreaEstimateAnnuityOrder(
                                 $_order->order_id,
@@ -9553,7 +9546,7 @@ class StoreOrderRepository extends BaseRepository
 
                 // Db::name('user')->where('uid',$user_data['uid'])->update(['annuity'=>$ylj_amount_mine,"contribute"=>$con,"score"=>$score]);
 
-                $this->bill_user_log($user_data['uid'], $ylj_pri, $store_order_data['order_id'], 5, $group_order['group_order_sn'], '消费获得养老金' . $ylj_pri, $store_order_data['mer_id'], 0);
+                $this->bill_user_log($user_data['uid'], $ylj_pri, $store_order_data['order_id'], 5, $store_order_data['order_sn'], '消费获得养老金' . $ylj_pri, $store_order_data['mer_id'], 0);
                 // 贡献值
                 $this->con_log($user_data['uid'], $pv, $store_order_data['order_id'], 11, "购买精彩生活商品赠送贡献值");
                 // 积分
@@ -9665,9 +9658,9 @@ class StoreOrderRepository extends BaseRepository
                         //积分
                         $this->score_log($spread_data['uid'], $ssf, $store_order_data['order_id'], 11, "精彩生活区商品赠送积分");
                         // //推广佣金
-                        $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $group_order['group_order_sn'], '推广获得拥金' . $yj_amount_90, $store_order_data['mer_id'], 0);
+                        $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得拥金' . $yj_amount_90, $store_order_data['mer_id'], 0);
                         //养老金
-                        $this->bill_user_log($spread_data['uid'], round($pv * 0.05, 2), $store_order_data['order_id'], 5, $group_order['group_order_sn'], '推广获得养老金' . round($pv * 0.05, 2), $store_order_data['mer_id'], 0);
+                        $this->bill_user_log($spread_data['uid'], round($pv * 0.05, 2), $store_order_data['order_id'], 5, $store_order_data['order_sn'], '推广获得养老金' . round($pv * 0.05, 2), $store_order_data['mer_id'], 0);
                     }
 
                     //普通用户推广人
@@ -9691,7 +9684,7 @@ class StoreOrderRepository extends BaseRepository
 
                         //推广养老金
                         //推广佣金
-                        $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $group_order['group_order_sn'], '推广获得拥金' . $yj_amount_90, $store_order_data['mer_id'], 0);
+                        $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得拥金' . $yj_amount_90, $store_order_data['mer_id'], 0);
                         // 贡献值
                         $this->con_log($spread_data['uid'], $pv, $store_order_data['order_id'], 11, "推广会员专区商品赠送贡献值");
                         //积分
@@ -9720,7 +9713,7 @@ class StoreOrderRepository extends BaseRepository
 
                         // 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, $group_order['group_order_sn'], '推广获得拥金' . $yj_amount_90, $store_order_data['mer_id'], 0);
+                        $this->bill_user_log($merchant_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得拥金' . $yj_amount_90, $store_order_data['mer_id'], 0);
 
                     }
 
@@ -9774,8 +9767,7 @@ class StoreOrderRepository extends BaseRepository
 
             // Db::name('user')->where('uid',$user_data['uid'])->update(['annuity'=>$ylj_amount_mine,'contribute'=> $gxz_amount_mine,'score'=> $jf_amount_mine]);
 
-            $this->bill_user_log($user_data['uid'], round($pv * 0.035, 2), $store_order_data['order_id'], 5, $group_order['group_order_sn'], '消费获得养老金' . round($pv * 0.035, 2), $store_order_data['mer_id']);
-
+            $this->bill_user_log($user_data['uid'], round($pv * 0.035, 2), $store_order_data['order_id'], 5, $store_order_data['order_sn'], '消费获得养老金' . round($pv * 0.035, 2), $store_order_data['mer_id']);
             $this->con_log($user_data['uid'], $gx_jf, $store_order_data['order_id'], 11, "购买会员专区商品赠送贡献值", 1);
             $this->score_log($user_data['uid'], $gx_jf, $store_order_data['order_id'], 11, "购买会员专区商品赠送积分", 1);
 
@@ -9890,16 +9882,16 @@ class StoreOrderRepository extends BaseRepository
                     $this->con_log($spread_data['uid'], round($gx_jf, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送贡献值", 1);
 
                     //养老金
-                    $this->bill_user_log($spread_data['uid'], round($pv * 0.035, 2), $store_order_data['order_id'], 5, $group_order['group_order_sn'], '消费获得养老金' . round($pv * 0.035, 2), $store_order_data['mer_id']);
+                    $this->bill_user_log($spread_data['uid'], round($pv * 0.035, 2), $store_order_data['order_id'], 5, $store_order_data['order_sn'], '消费获得养老金' . round($pv * 0.035, 2), $store_order_data['mer_id']);
                     //佣金
-                    $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $group_order['group_order_sn'], '推广获得拥金' . $yj_amount_90, $store_order_data['mer_id']);
+                    $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得拥金' . $yj_amount_90, $store_order_data['mer_id']);
                     //复购金
                     $this->fugou_user_log($spread_data['uid'], $fgj_amount_10, $store_order_data['order_id'], 1, 1);
 
                 }
 
                 //普通的用户推广人
-                if ($spread_data['user_group'] == 1) {
+                if ($spread_data['user_group'] == 1) {  
 
                     //获取贡献值和积分和佣金
                     $gx_jf = $spread_data['contribute'] + round($pv * 0.21, 2);
@@ -9917,7 +9909,7 @@ class StoreOrderRepository extends BaseRepository
                     $this->con_log($spread_data['uid'], round($pv * 0.21, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送贡献值", 1);
                     $this->score_log($spread_data['uid'], round($pv * 0.21, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送积分", 1);
                     //推广佣金
-                    $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $group_order['group_order_sn'], '推广获得拥金' . $yj_amount_90, $store_order_data['mer_id']);
+                    $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得拥金' . $yj_amount_90, $store_order_data['mer_id']);
                 }
 
 
@@ -9938,9 +9930,9 @@ class StoreOrderRepository extends BaseRepository
 
                 $this->con_log($spread_data['uid'], round($gx_jf, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送贡献值", 1);
                 //养老金
-                $this->bill_user_log($spread_data['uid'], round($pv * 0.035, 2), $store_order_data['order_id'], 5, $group_order['group_order_sn'], '消费获得养老金' . round($pv * 0.035, 2), $store_order_data['mer_id']);
+                $this->bill_user_log($spread_data['uid'], round($pv * 0.035, 2), $store_order_data['order_id'], 5, $store_order_data['order_sn'], '消费获得养老金' . round($pv * 0.035, 2), $store_order_data['mer_id']);
                 //佣金
-                $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $group_order['group_order_sn'], '推广获得拥金' . $yj_amount_90, $store_order_data['mer_id']);
+                $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得拥金' . $yj_amount_90, $store_order_data['mer_id']);
                 //复购金
                 $this->fugou_user_log($spread_data['uid'], $fgj_amount_10, $store_order_data['order_id'], 1, 1);
 
@@ -10009,20 +10001,20 @@ class StoreOrderRepository extends BaseRepository
 
                 $merchant_user_data = Db::name('user')->where('uid', $merchant_data['uid'])->find();
 
-                if (!empty($merchant_user_data)) {
+                if (!empty($merchant_data) && !empty($merchant_user_data)) {
 
 
                     $yj_amount_90 = round($pv * 0.035, 2) * 0.9;
                     $fgj_amount_10 = round($pv * 0.035, 2) * 0.1;//推广者的佣金抽10%到个人复购金
 
-                    $yj_amount = $merchant_data['brokerage_price'] + $yj_amount_90;
-                    $fgj_amount = $merchant_data['fugou'] + $fgj_amount_10;
+                    $yj_amount = $merchant_user_data['brokerage_price'] + $yj_amount_90;
+                    $fgj_amount = $merchant_user_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, $group_order['group_order_sn'], '推广获得拥金' . round($pv * 0.35, 2), $store_order_data['mer_id']);
+                    $this->bill_user_log($merchant_data['uid'], round($pv * 0.35, 2), $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得拥金' . round($pv * 0.35, 2), $store_order_data['mer_id']);
                 }
 
             }
@@ -10555,6 +10547,40 @@ class StoreOrderRepository extends BaseRepository
         return compact('hf_member_id', 'hf_platform_member_id', 'api_key');
     }
 
+
+    /**
+     * 获取分账账号信息话费专用
+     *
+     * @param $order
+     * @param $dst_mer_id
+     * @param $alhf_member_id
+     * @return array
+     */
+    public function getIndependentAccountHuafei($order, $dst_mer_id, $alhf_member_id)
+    {
+        if ($order['pay_type'] == 1) {
+            $hf_member_id = Db::name('merchant_member')->where('mer_id', $order['mer_id'])->where("type", 3)->value('member_id');
+            $api_key = 'api_live_b0a687ec-5450-4ada-a0e4-65bac0f46871';
+            $type = 3;
+
+            // 平台特殊账户
+            $hf_platform_member_id = Db::name('merchant_member')->where(['mer_id' => $dst_mer_id, 'type' => $type])->value('member_id');
+        } else {
+            //支付宝
+            $hf_member_id = $alhf_member_id;
+            $api_key = 'api_live_b23537ed-64b8-45d6-832e-fb228aa9e0a9';
+
+            // 平台特殊账户
+            $hf_platform_member_id = Db::name('merchant_member')->where(['mer_id' => $dst_mer_id, 'type' => 1])->value('member_id');
+        }
+
+        return compact('hf_member_id', 'hf_platform_member_id', 'api_key');
+    }
+
+
+
+
+
     /**
      * 预分账处理
      *
@@ -10607,6 +10633,63 @@ class StoreOrderRepository extends BaseRepository
         return false;
     }
 
+
+
+
+    /**
+     * 预分账处理话费专用
+     *
+     * @param $order
+     * @param $api_key
+     * @param $hf_member_id
+     * @param $hf_platform_member_id
+     * @param $merchant_profit
+     * @param $platform_profit
+     * @param $dst_mer_id
+     * @return bool
+     * @throws DbException
+     */
+    public function prepareExecuteIndependentAccountHuafei($order, $group_order, $api_key, $hf_member_id, $hf_platform_member_id, $merchant_profit, $platform_profit, $dst_mer_id = 0)
+    {
+        $members[] = [
+            'member_id' => $hf_member_id,
+            'amount' => $merchant_profit,
+            'fee_flag' => 'Y'
+        ];
+        if (!empty($hf_platform_member_id) && ($platform_profit > 0)) {
+            $members[] = [
+                'member_id' => $hf_platform_member_id,
+                'amount' => $platform_profit,
+                'fee_flag' => 'N'
+            ];
+        }
+
+        $requestId = ShouxinyiApiRequest::getOrderNumber('split');
+        $params = [
+            'payment_id' => $group_order['hf_pay_id'],
+            'order_no' => $requestId,
+            'confirm_amt' => $group_order['pay_price'],
+            'div_members' => $members
+        ];
+
+        $params['api_key'] = $api_key;
+
+        // 记录分账订单
+        $this->recordIndependentAccount($order['mer_id'], $dst_mer_id, $group_order, $requestId, $merchant_profit, $platform_profit);
+
+        Db::name("log")->insert(array('data' => '汇付分账参数-----' . json_encode($params, JSON_FORCE_OBJECT)));//日志记录
+        $res = $this->payment_confirm_create_traits($params);
+        Db::name("log")->insert(array('data' => '汇付分账结果-----' . json_encode($res, JSON_FORCE_OBJECT)));//日志记录
+        if ($res['status'] == 'succeeded') {
+            Db::name("store_split_order")->where('requestId', $requestId)->update(['status' => 1, 'hf_pay_id' => $res['id']]);
+            return true;
+        }
+        return false;
+    }
+
+
+
+
     /**
      * 记录分账订单
      *

app/common/repositories/user/UserOfflineRechargeRepository.php

@@ -171,8 +171,14 @@ class UserOfflineRechargeRepository extends BaseRepository
                     // //同步复购金
                     // Db::name("user_sign_fugou")->where('order_id', $order->id)->update(['uid' => $unionUser->uid]);
                     
-                    // //同步贡献值
-                    // Db::name("user_sign_gongxian")->where('order_id', $order->id)->update(['uid' => $unionUser->uid]);
+                    //同步贡献值
+                    $gongxian = Db::name('user_sign_gongxian')->where('order_id', $order->id)->find();
+                    if($gongxian){
+                        Db::name("user_sign_gongxian")->where('order_id', $order->id)->update(['uid' => $unionUser->uid]);
+                        $user_contribute = Db::name('user')->where('order_id', $order->id)->where('uid', $unionUser->uid)->value('contribute');
+                        $user_contribute = bcadd($user_contribute, $gongxian['number'], 2);
+                        Db::name('user')->where('uid', $unionUser->uid)->update(['contribute'=>$user_contribute]);
+                    }
 
 
 

app/common/repositories/user/UserRepository.php

@@ -2881,7 +2881,6 @@ class UserRepository extends BaseRepository
         }
         $paramStr =  $paramStr.'sign='.urlencode($sign);
         return $paramStr;
-
     }
 
     /*
@@ -3013,7 +3012,7 @@ class UserRepository extends BaseRepository
             $request->setGrantType("authorization_code");
             $request->setCode($authorization_code);
             $result = $aop->execute($request);
-
+            Db::name('log')->insert(['data'=>'支付宝相关信息']);
             if (isset($result->alipay_system_oauth_token_response->user_id)) {
                 $return['user_id'] = $result->alipay_system_oauth_token_response->user_id;
                 $return['msg'] = $result->alipay_system_oauth_token_response->access_token;

app/controller/api/Notify.php

@@ -178,7 +178,7 @@ class Notify
 
                                     //Db::name('user')->where('uid',$user_data['uid'])->update(['annuity'=>$ylj_amount_mine,"contribute"=>$con,"score"=>$score]);
 
-                                    $this->bill_user_log($user_data['uid'],$ylj_pri,$store_order_data['order_id'],5,$group_order['group_order_sn'],'消费获得养老金'.$ylj_pri,$store_order_data['mer_id'],0);
+                                    $this->bill_user_log($user_data['uid'],$ylj_pri,$store_order_data['order_id'],5,$store_order_data['order_sn'],'消费获得养老金'.$ylj_pri,$store_order_data['mer_id'],0);
                                     $this->con_log($user_data['uid'],$pv,$store_order_data['order_id'],11,"购买精彩生活商品赠送贡献值");
                                     $this->score_log($user_data['uid'],$pv,$store_order_data['order_id'],11,"购买精彩生活商品赠送积分");
 
@@ -291,9 +291,9 @@ class Notify
                                             //积分
                                             $this->score_log($spread_data['uid'],$ssf,$store_order_data['order_id'],11,"精彩生活区商品赠送积分");
                                             // //推广佣金
-                                            $this->bill_user_log($spread_data['uid'],$yj_amount_90,$store_order_data['order_id'],3,$group_order['group_order_sn'],'推广获得拥金'.$yj_amount_90,$store_order_data['mer_id'],0);
+                                            $this->bill_user_log($spread_data['uid'],$yj_amount_90,$store_order_data['order_id'],3,$store_order_data['order_sn'],'推广获得拥金'.$yj_amount_90,$store_order_data['mer_id'],0);
                                             //养老金
-                                            $this->bill_user_log($spread_data['uid'],round($pv * 0.05,2),$store_order_data['order_id'],5,$group_order['group_order_sn'],'推广获得养老金'.round($pv * 0.05,2),$store_order_data['mer_id'],0);
+                                            $this->bill_user_log($spread_data['uid'],round($pv * 0.05,2),$store_order_data['order_id'],5,$store_order_data['order_sn'],'推广获得养老金'.round($pv * 0.05,2),$store_order_data['mer_id'],0);
                                         }
 
                                         //普通用户推广人
@@ -318,7 +318,7 @@ class Notify
                                             //推广养老金
 
                                             //推广佣金
-                                            $this->bill_user_log($spread_data['uid'],$yj_amount_90,$store_order_data['order_id'],3,$group_order['group_order_sn'],'推广获得拥金'.$yj_amount_90,$store_order_data['mer_id'],0);
+                                            $this->bill_user_log($spread_data['uid'],$yj_amount_90,$store_order_data['order_id'],3,$store_order_data['order_sn'],'推广获得拥金'.$yj_amount_90,$store_order_data['mer_id'],0);
                                             $this->con_log($spread_data['uid'],round($pv * 0.21,2),$store_order_data['order_id'],11,"推广精彩生活区商品赠送贡献值");
                                             $this->score_log($spread_data['uid'],round($pv * 0.21,2),$store_order_data['order_id'],11,"推广精彩生活区商品赠送积分");
 
@@ -352,7 +352,7 @@ class Notify
 
                                             //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,$group_order['group_order_sn'],'推广获得拥金'.  $yj_amount_90,$store_order_data['mer_id'],0);
+                                            $this->bill_user_log($merchant_data['uid'],  $yj_amount_90,$store_order_data['order_id'],3,$store_order_data['order_sn'],'推广获得拥金'.  $yj_amount_90,$store_order_data['mer_id'],0);
 
                                         }
 
@@ -410,7 +410,7 @@ class Notify
 
                                 //Db::name('user')->where('uid',$user_data['uid'])->update(['annuity'=>$ylj_amount_mine,'contribute'=> $gxz_amount_mine,'score'=> $jf_amount_mine]);
  
-                                $this->bill_user_log($user_data['uid'],round($pv * 0.035,2),$store_order_data['order_id'],5,$group_order['group_order_sn'],'消费获得养老金'.round($pv * 0.035,2),$store_order_data['mer_id']);
+                                $this->bill_user_log($user_data['uid'],round($pv * 0.035,2),$store_order_data['order_id'],5,$store_order_data['order_sn'],'消费获得养老金'.round($pv * 0.035,2),$store_order_data['mer_id']);
  
                                 $this->con_log($user_data['uid'],$gx_jf,$store_order_data['order_id'],11,"购买会员专区商品赠送贡献值",1);
                                 $this->score_log($user_data['uid'],$gx_jf,$store_order_data['order_id'],11,"购买会员专区商品赠送积分",1);
@@ -531,9 +531,9 @@ class Notify
                                         $this->con_log($spread_data['uid'],round($gx_jf,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1);
 
                                         //养老金
-                                        $this->bill_user_log($spread_data['uid'],round($pv * 0.035,2),$store_order_data['order_id'],5,$group_order['group_order_sn'],'消费获得养老金'.round($pv * 0.035,2),$store_order_data['mer_id']);
+                                        $this->bill_user_log($spread_data['uid'],round($pv * 0.035,2),$store_order_data['order_id'],5,$store_order_data['order_sn'],'消费获得养老金'.round($pv * 0.035,2),$store_order_data['mer_id']);
                                         //佣金
-                                        $this->bill_user_log($spread_data['uid'], $yj_amount_90,$store_order_data['order_id'],3,$group_order['group_order_sn'],'推广获得拥金'. $yj_amount_90,$store_order_data['mer_id']);
+                                        $this->bill_user_log($spread_data['uid'], $yj_amount_90,$store_order_data['order_id'],3,$store_order_data['order_sn'],'推广获得拥金'. $yj_amount_90,$store_order_data['mer_id']);
                                         //复购金
                                         $this->fugou_user_log($spread_data['uid'],$fgj_amount_10,$store_order_data['order_id'],1,1);
 
@@ -565,7 +565,7 @@ class Notify
                                         $this->con_log($spread_data['uid'],round($pv * 0.21,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1);
                                         $this->score_log($spread_data['uid'],round($pv * 0.21,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分",1);
                                         //推广佣金
-                                        $this->bill_user_log($spread_data['uid'],$yj_amount_90,$store_order_data['order_id'],3,$group_order['group_order_sn'],'推广获得拥金'.$yj_amount_90,$store_order_data['mer_id']);
+                                        $this->bill_user_log($spread_data['uid'],$yj_amount_90,$store_order_data['order_id'],3,$store_order_data['order_sn'],'推广获得拥金'.$yj_amount_90,$store_order_data['mer_id']);
                                     }
 
 
@@ -591,9 +591,9 @@ class Notify
 
                                     $this->con_log($spread_data['uid'],round($gx_jf,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1);
                                     //养老金
-                                    $this->bill_user_log($spread_data['uid'],round($pv * 0.035,2),$store_order_data['order_id'],5,$group_order['group_order_sn'],'消费获得养老金'.round($pv * 0.035,2),$store_order_data['mer_id']);
+                                    $this->bill_user_log($spread_data['uid'],round($pv * 0.035,2),$store_order_data['order_id'],5,$store_order_data['order_sn'],'消费获得养老金'.round($pv * 0.035,2),$store_order_data['mer_id']);
                                     //佣金
-                                    $this->bill_user_log($spread_data['uid'], $yj_amount_90,$store_order_data['order_id'],3,$group_order['group_order_sn'],'推广获得拥金'. $yj_amount_90,$store_order_data['mer_id']);
+                                    $this->bill_user_log($spread_data['uid'], $yj_amount_90,$store_order_data['order_id'],3,$store_order_data['order_sn'],'推广获得拥金'. $yj_amount_90,$store_order_data['mer_id']);
                                     //复购金
                                     $this->fugou_user_log($spread_data['uid'],$fgj_amount_10,$store_order_data['order_id'],1,1);
 
@@ -636,7 +636,7 @@ class Notify
 
                                         //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,$group_order['group_order_sn'],'推广获得拥金'.round($pv * 0.35,2),$store_order_data['mer_id']);
+                                        $this->bill_user_log($merchant_data['uid'],round($pv * 0.35,2),$store_order_data['order_id'],3,$store_order_data['order_sn'],'推广获得拥金'.round($pv * 0.35,2),$store_order_data['mer_id']);
                                     }
 
                                 }

app/controller/api/user/User.php

@@ -311,14 +311,14 @@ class User extends BaseController
 
         if ($pm==0){
 
-            $data = DB::name('user_sign_gongxian')->where($where)->where('status', 1)->field('id,mark,number,addtime,order_id')->page($page, $limit)->order("id desc")->select();
+            $data = DB::name('user_sign_gongxian')->where($where)->where('status', 1)->where('number', '<>',0)->field('id,mark,number,addtime,order_id')->page($page, $limit)->order("id desc")->select();
         }
 //        if($pm==1){
 //            $data = DB::name('user_sign_gongxian')->where($where)->where('pm', 2)->field('id,mark,number,pm,addtime,order_id')->page($page, $limit)->order("id desc")->select();
 //
 //        }
         if($pm==2){
-            $data = DB::name('user_sign_gongxian')->where($where)->where('status', -1)->field('id,mark,number,addtime,order_id')->page($page, $limit)->order("id desc")->select();
+            $data = DB::name('user_sign_gongxian')->where($where)->where('number', '<>',0)->where('status', -1)->field('id,mark,number,addtime,order_id')->page($page, $limit)->order("id desc")->select();
 
         }
         log::info("=======date==={$data}");
@@ -2287,7 +2287,7 @@ return app("json")->success($data);
                 $paramStr = $userRepository->getTokenByCode($alinfo["authCode"], true);
 //                \think\facade\Db::name('log')->insert(['data'=>'支付宝授权信息'.json_encode($paramStr)]);
                 $nickname = empty($paramStr["nick_name"]) ? "al" . $alinfo["userId"] : $paramStr["nick_name"];
-                $avater = empty($paramStr["avatar"]) ? "http://app.bjtdba.com/uploads/def/20201118/5984361a2e00f5407776bcd6eaaae1ce.png" : $paramStr["avatar"];
+                $avater = empty($paramStr["avatar"]) ? "https://cdn.bjtdba.com/vod/image/2025-01-21/20250121180855764.png" : $paramStr["avatar"];
             }
             $data2 = [
                 "type"     => $type,

app/controller/api/user/UserMp.php

@@ -135,7 +135,7 @@ class UserMp extends BaseController
                     $unionData = [
                         'unionid' => $data['unionid'],
                         'nickname' => $data['nickname'] ? : time(),
-                        'avatar' => $data['avatar'] ? : 'http://app.bjtdba.com/uploads/def/20201118/5984361a2e00f5407776bcd6eaaae1ce.png',
+                        'avatar' => $data['avatar'] ? : 'https://cdn.bjtdba.com/vod/image/2025-01-21/20250121180855764.png',
                         'is_lock' => 1,
                         'lock_time' => date('Y-m-d H:i:s'),
                         'balance' => 0,
@@ -151,7 +151,7 @@ class UserMp extends BaseController
                     } else {
                         $updateData = [
                             'nickname' => $data['nickname'] ? : time(),
-                            'avatar' => $data['avatar'] ? : 'http://app.bjtdba.com/uploads/def/20201118/5984361a2e00f5407776bcd6eaaae1ce.png',
+                            'avatar' => $data['avatar'] ? : 'https://cdn.bjtdba.com/vod/image/2025-01-21/20250121180855764.png',
                             'update_time' => date('Y-m-d H:i:s')
                         ];
                         $unionUsersDao->update($unionUser->id, $updateData);

app/controller/merchant/Common.php

@@ -57,9 +57,14 @@ class Common extends BaseController
     {
         $merId = $this->merId;
 
-        $list['gongxian'] = Db::name('user_sign_gongxian')->where('mer_id', $merId)->sum('number');
+        // $list['gongxian'] = Db::name('user_sign_gongxian')->where('mer_id', $merId)->sum('number');
         $list['jingdou'] = Db::name('user_sign_jingdou')->where('mer_id', $merId)->sum('number');
+        $list['fenrunzhi'] = Db::name('order_merchant')->where('mer_id', $merId)->where('paid', 1)->sum('available');
     
+        $list['xianxia'] = Db::name('order_merchant')->where('mer_id', $merId)->where('paid', 1)->count();
+        $list['xianshang'] = Db::name('store_order')->where('mer_id', $merId)->where('paid', 1)->count();
+
+
         return app('json')->success(compact('merId', 'list'));
     }
 
@@ -83,8 +88,9 @@ class Common extends BaseController
         $list = $query->page($pageNum, $pageSize)->order('id desc')->where('mer_id', $merId)->where('paid', 1)->select();
         $list = $list->toArray();
         foreach ($list as $k => $v) {
-            $list[$k]['pv'] = Db::name('user_sign_gongxian')->where('mer_id', $v['mer_id'])->where('order_id', $v['id'])->value('pv') ?? 0;
-            $list[$k]['gongxian'] = Db::name('user_sign_gongxian')->where('mer_id', $v['mer_id'])->where('order_id', $v['id'])->value('number') ?? 0;
+            $list[$k]['pv'] = Db::name('user_sign_gongxian')->where('order_id', $v['id'])->value('pv') ?? 0;
+            // $list[$k]['gongxian'] = Db::name('user_sign_gongxian')->where('mer_id', $v['mer_id'])->where('order_id', $v['id'])->value('number') ?? 0;
+            $list[$k]['fenrunzhi'] = $v['available'];
             $list[$k]['jingdou'] = Db::name('user_sign_jingdou')->where('mer_id', $v['mer_id'])->where('order_id', $v['id'])->value('number') ?? 0;
         }
      

config/console.php

@@ -22,6 +22,7 @@ return [
         'ln:import_user_cxb' => 'app\command\test\ln\ImportUser2',
 //        'great_life_order_independent_account' => 'app\command\GreatLifeOrderIndependentAccount',
 //        'commercial-\_area_order_independent_account' => 'app\command\CommercialAreaOrderIndependentAccount',
+        // 'huafei_order_independent_account' => 'app\command\HuafeiOrderIndependentAccount',
         'movie_city_area' => 'app\command\MovieCityAreaCommand',
         'movie_cinema' => 'app\command\MovieCinemaCommand',
         'movie_film' => 'app\command\MovieFilmCommand',