Merge branch 'master' into huangfamily

app/command/GzcAddByBillCommand.php

@@ -0,0 +1,134 @@
+<?php
+
+namespace app\command;
+
+use app\common\model\user\UserCertification;
+use app\common\repositories\merchant\order\OrderGzcRepository;
+use think\console\Command;
+use think\console\Input;
+use think\console\Output;
+use think\facade\Db;
+use think\facade\Log;
+
+class GzcAddByBillCommand extends Command
+{
+    protected function configure()
+    {
+        // 配置命令名称及描述
+        $this->setName('gzcAddByBill')
+            ->setDescription('从bill表中查询未提交到公证处的养老金记录，并提交公证处');
+    }
+
+    protected function execute(Input $input, Output $output)
+    {
+        // 在这里执行任务的具体内容
+        $output->writeln('定时任务执行中...');
+
+        $nowTime = time();
+        $this->billGzcAdd($nowTime);
+
+        $output->writeln('定时任务执行完成');
+    }
+
+    /**
+     * 线下支付订单公证处IN10入账
+     * @param $nowTime
+     * author: php迷途小书童
+     * created: 2021/3/20 9:26
+     */
+    public function billGzcAdd($nowTime)
+    {
+        /** @var OrderGzcRepository $OrderGzcRepository */
+        $OrderGzcRepository = app()->make(OrderGzcRepository::class);
+        $cursor = Db::name('user_bill')
+            ->where('status', 1)
+            ->where('is_gzc', 0)
+            ->where('commission_type', 5)
+            ->select()
+            ->toArray();
+        if ($cursor) {
+            foreach ($cursor as $bill) {
+                $type_shop = $bill['type_shop'] ?? 0;
+                switch ($type_shop) {
+                    case "0":
+                        $online = $cursor = Db::table('rrx_store_order')->where('uid', $bill['uid'])->where('order_sn', $bill['order_sn'])->where('paid', 1)->find();
+                        break;
+                    case "1":
+                        $online = Db::table('rrx_order_pdd')->where('uid', $bill['uid'])->where('order_sn', $bill['order_sn'])->find();
+                        break;
+                    case "2":
+                        $online = Db::table('rrx_order_vip')->where('uid', $bill['uid'])->where('order_sn', $bill['order_sn'])->find();
+                        break;
+                    case "3":
+                        $online = Db::table('rrx_order_su')->where('uid', $bill['uid'])->where('order_sn', $bill['order_sn'])->find();
+                        break;
+                    case "4":
+                        $online = '';
+                        break;
+                    case "5":
+                        $online = Db::table('rrx_order_tb')->where('uid', $bill['uid'])->where('order_sn', $bill['order_sn'])->find();
+                        break;
+                    case "6":
+                        $online = Db::table('rrx_order_jd')->where('uid', $bill['uid'])->where('order_sn', $bill['order_sn'])->find();
+                        break;
+                    case "7":
+                        $online = '';
+                        break;
+                    case "8":
+                        $online = '';
+                        break;
+                    case "9":
+                        $online = Db::table('rrx_order_huafei')->where('uid', $bill['uid'])->where('order_sn', $bill['order_sn'])->find();
+                        break;
+                    default:
+                        $online = Db::table('rrx_store_order')->where('uid', $bill['uid'])->where('order_sn', $bill['order_sn'])->where('paid', 1)->find();
+                }
+                if (!$online) {
+                    Log::info($bill['uid'] . '查询不到订单');
+                    continue;
+                }
+
+                $certification = UserCertification::getInstance()->where('uid', $bill['uid'])->find();
+                if (!$certification) {
+                    Log::info($online['uid'] . '没有实名认证');
+                    continue;
+                }
+
+                $pension = $bill['number'] ?? 0;
+                if ($pension <= 0) {
+                    Log::info($online['order_sn'] . 'pension' . $pension);
+                    continue;
+                }
+
+                //新增入账明细记录
+                list($msec, $sec) = explode(' ', microtime());
+                $msectime = number_format((floatval($msec) + floatval($sec)) * 1000, 0, '', '');
+                $orderId = 'IN10' . $msectime . mt_rand(10000, max(intval($msec * 10000) + 10000, 98369));
+                $create = [
+                    'uid' => $online['uid'],
+                    'platform_no' => $orderId,
+                    'account_type' => 1,
+                    'user_name' => $certification['user_name'],
+                    'mobile' => $certification['mobile'],
+                    'user_card' => $certification['user_card'],
+                    'pension' => $pension,
+                    'order_type' => $type_shop,
+                    'out_trade_no' => $online['order_sn'],
+                    'link_id' => $bill['bill_id']
+                ];
+                $test_user = Db::name('user')->where('uid', $online['uid'])->value('test_user');
+                $check = Db::name("gzc_logs")->where("link_id", $bill['bill_id'])->where("order_type", $type_shop)->count();
+                if ($test_user == 0 && $check <= 0) {
+                    $OrderGzcRepository->create($create);
+                    Db::name('user_bill')
+                        ->where('bill_id', $bill['bill_id'])
+                        ->where('commission_type', 5)
+                        ->update([
+                            'is_gzc' => 1,
+                            'gzc' => 1
+                        ]);
+                }
+            }
+        }
+    }
+}

app/command/PensionTasks.php

@@ -64,7 +64,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) {

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

@@ -9823,7 +9823,7 @@ class StoreOrderRepository extends BaseRepository
             $merchant = app()->make(MerchantRepository::class);
             $merchantInfo = $merchant->get($store_order_data['mer_id']);
             // 1企业2个体3个人
-            if ($merchantInfo && !empty($store_order_data) && in_array($merchantInfo['type'], [2, 3])) {
+            if ($merchantInfo && !empty($store_order_data) && in_array($merchantInfo['type'], [1, 2, 3])) {
                 //商家让利部分的拆分
                 $ylj_pri = bcmul($concession_pri, 0.3, 2); // 让利部分30%给消费者做养老金
                 $pv = bcmul($concession_pri, 0.35, 2); // 35%做业绩PV分配

app/common/repositories/store/product/ProductRepository.php

@@ -162,6 +162,16 @@ class ProductRepository extends BaseRepository
     public function create(array $data)
     {
         return Db::transaction(function () use ($data) {
+            if ($data['extension_type'] != 1) {
+                $base_commission = Db::name('system_config_value')->where('config_key', 'base_commission')->where('mer_id', $data['mer_id'])->value('value');
+                if ($base_commission < 5) {
+                    $base_commission = 5;
+                }
+                foreach ($data['attrValue'] as &$value) {
+                    $value['extension_one'] = $base_commission;
+                }
+            }
+
             $pension = bcsub($data['attrValue'][0]['price'], bcmul($data['attrValue'][0]['price'], $data['commission'], 2), 2);
             if ($data['pension'] > $pension) {
                 return ['code' => 201, 'msg' => '养老金金额和佣金金额总和不能超过商品单价'];
@@ -243,6 +253,15 @@ class ProductRepository extends BaseRepository
     public function update(int $id, array $data, $merId)
     {
         Db::transaction(function () use ($id, $data, $merId) {
+            if ($data['extension_type'] != 1) {
+                $base_commission = Db::name('system_config_value')->where('config_key', 'base_commission')->where('mer_id', $merId)->value('value');
+                if ($base_commission < 5) {
+                    $base_commission = 5;
+                }
+                foreach ($data['attrValue'] as &$value) {
+                    $value['extension_one'] = $base_commission;
+                }
+            }
             $param['attr'] = $data['attr'] ?? '';
             $param['attrValue'] = $data['attrValue'] ?? '';
             $param['cate'] = $data['mer_cate_id'] ?? '';
@@ -1004,8 +1023,8 @@ class ProductRepository extends BaseRepository
         $res['yanglao']=($k['yanglao']);
         if($res['mer_id'] != 496){
             if($res['mer_id'] != 491){
-                $res['jfduihuan']=($k['jfduihuan']);
-                $res['jdduihuan']=($k['jdduihuan']);
+                $res['jfduihuan']=($k['jfduihuan']??0);
+                $res['jdduihuan']=($k['jdduihuan']??0);
             }
         }
 
@@ -1781,7 +1800,7 @@ class ProductRepository extends BaseRepository
                 $merchant = app()->make(MerchantRepository::class);
                 $merchantInfo = $merchant->get($product['mer_id']);
                 // 1企业2个体3个人
-                if ($merchantInfo && in_array($merchantInfo['type'],[2,3])) {
+                if ($merchantInfo && in_array($merchantInfo['type'],[1,2,3])) {
                     //商贸区
                     $jf = $product['price'] - bcmul($product['concession_pri'],0.3, 2) . ' + ' . bcmul($product['concession_pri'],0.3, 2);
                     $jd = $product['price'] - bcmul($product['concession_pri'],0.35, 2) . ' + ' . bcmul($product['concession_pri'],0.35, 2);

app/common/repositories/user/UserAwardRepository.php

@@ -58,55 +58,30 @@ class UserAwardRepository extends BaseRepository
      */
     public function getList(array $where, $page, $limit)
     {
-        $count = 0;
-        $list = [];
-
-
-        $brokerage_fugou_rate = Db::name("system_config_value")->where(["config_key"=>"brokerage_fugou_rate"])->value("value");
-        $brokerage_fugou_rate = json_decode($brokerage_fugou_rate, true);
-
-        $user_group_rate = Db::name("system_config_value")->where(["config_key"=>"user_group_rate"])->value("value");
-        $user_group_rate = json_decode($user_group_rate, true);
-
-        $user_group_fugou_rate = Db::name("system_config_value")->where(["config_key"=>"user_group_fugou_rate"])->value("value");
-        $user_group_fugou_rate = json_decode($user_group_fugou_rate, true);
-
-        $brokerage_guquan_rate = Db::name("system_config_value")->where(["config_key"=>"brokerage_guquan_rate"])->value("value");
-        $fugou_guquan_rate = Db::name("system_config_value")->where(["config_key"=>"fugou_guquan_rate"])->value("value");
-
-        $brokerage_lianchuang_rate = Db::name("system_config_value")->where(["config_key"=>"brokerage_lianchuang_rate"])->value("value");
-        $fugou_lianchuang_rate = Db::name("system_config_value")->where(["config_key"=>"fugou_lianchuang_rate"])->value("value");
-
-        $list[] = [
-            'name' => '佣金',
-            'key' => 'brokerage',
-            'number_rate' => $brokerage_fugou_rate['brokerage_rate']??0,
-            'guquan_rate' => $brokerage_guquan_rate??0,
-            'lianchuang_rate' => $brokerage_lianchuang_rate??0,
-            'user_groub_1' => $user_group_rate[0]['rate']??0,
-            'user_groub_2' => $user_group_rate[1]['rate']??0,
-            'user_groub_3' => $user_group_rate[2]['rate']??0,
-            'user_groub_4' => $user_group_rate[3]['rate']??0,
-            'user_groub_5' => $user_group_rate[4]['rate']??0,
-            'user_groub_6' => $user_group_rate[5]['rate']??0,
-            'user_groub_7' => $user_group_rate[6]['rate']??0,
+        $key = [
+            ['name' => '直推收益', 'key' => 'user_group_rate'],
+            ['name' => '锁客收益', 'key' => 'user_group_lock_rate'],
+            ['name' => '推广店铺收益', 'key' => 'user_group_store_rate'],
+            ['name' => '分红', 'key' => 'user_group_red_rate'],
         ];
-
-        $list[] = [
-            'name' => '复购金',
-            'key' => 'fugou',
-            'number_rate' => $brokerage_fugou_rate['fugou_rate']??0,
-            'lianchuang_rate' => $fugou_lianchuang_rate??0,
-            'guquan_rate' => $fugou_guquan_rate??0,
-            'user_groub_1' => $user_group_fugou_rate[0]['rate']??0,
-            'user_groub_2' => $user_group_fugou_rate[1]['rate']??0,
-            'user_groub_3' => $user_group_fugou_rate[2]['rate']??0,
-            'user_groub_4' => $user_group_fugou_rate[3]['rate']??0,
-            'user_groub_5' => $user_group_fugou_rate[4]['rate']??0,
-            'user_groub_6' => $user_group_fugou_rate[5]['rate']??0,
-            'user_groub_7' => $user_group_fugou_rate[6]['rate']??0,
-        ];
-
+        $list = [];
+        foreach ($key as $item) {
+            $user_group_rate = Db::name("system_config_value")->where(["config_key"=>$item['key']])->value("value");
+            $user_group_rate = json_decode($user_group_rate, true);
+            $list[] = [
+                'name' => $item['name'],
+                'key' => $item['key'],
+                'user_groub_1' => $user_group_rate[0]['rate']??0,
+                'user_groub_2' => $user_group_rate[1]['rate']??0,
+                'user_groub_3' => $user_group_rate[2]['rate']??0,
+                'user_groub_4' => $user_group_rate[3]['rate']??0,
+                'user_groub_5' => $user_group_rate[4]['rate']??0,
+                'user_groub_6' => $user_group_rate[5]['rate']??0,
+                'user_groub_7' => $user_group_rate[6]['rate']??0,
+                'user_groub_8' => $user_group_rate[7]['rate']??0,
+                'user_groub_9' => $user_group_rate[8]['rate']??0,
+            ];
+        }
         $count = count($list);
         return compact('count', 'list');
     }
@@ -122,16 +97,15 @@ class UserAwardRepository extends BaseRepository
     {
         $action = Route::buildUrl('configAwardUpdate' , $formData)->build();
         return Elm::createForm($action, [
-            Elm::number('number_rate', $formData['name'].'占比(%)')->min(0)->size('large'),
-            Elm::number('lianchuang_rate', '联创占比(%)')->min(0)->size('large'),
-            Elm::number('guquan_rate', '股权占比(%)')->min(0)->size('large'),
-            Elm::number('user_groub_1', '消费者占比(%)')->min(0)->size('large'),
-            Elm::number('user_groub_2', '业务员占比(%)')->min(0)->size('large'),
-            Elm::number('user_groub_3', '业务经理占比(%)')->min(0)->size('large'),
-            Elm::number('user_groub_4', '初级合伙人占比(%)')->min(0)->size('large'),
-            Elm::number('user_groub_5', '中级合伙人占比(%)')->min(0)->size('large'),
-            Elm::number('user_groub_6', '高级合伙人占比(%)')->min(0)->size('large'),
-            Elm::number('user_groub_7', '董事占比(%)')->min(0)->size('large'),
+            Elm::number('user_groub_1', '普通用户(%)')->min(0)->size('large'),
+            Elm::number('user_groub_2', '业务员(%)')->min(0)->size('large'),
+            Elm::number('user_groub_3', '业务经理(%)')->min(0)->size('large'),
+            Elm::number('user_groub_4', '初级合伙人(%)')->min(0)->size('large'),
+            Elm::number('user_groub_5', '中级合伙人(%)')->min(0)->size('large'),
+            Elm::number('user_groub_6', '高级合伙人(%)')->min(0)->size('large'),
+            Elm::number('user_groub_7', '董事(%)')->min(0)->size('large'),
+            Elm::number('user_groub_8', '联创(%)')->min(0)->size('large'),
+            Elm::number('user_groub_9', '股权(%)')->min(0)->size('large'),
         ])->setTitle($formData['name'].'设置')->formData($formData);
     }
 
@@ -158,61 +132,18 @@ class UserAwardRepository extends BaseRepository
      */
     public function updateAward($key, $data)
     {
-        if ($key == 'brokerage') {
-            //修改佣金比例
-            $brokerage_fugou_rate = Db::name("system_config_value")->where(["config_key"=>"brokerage_fugou_rate"])->value("value");
-            $brokerage_fugou_rate = json_decode($brokerage_fugou_rate, true);
-            $brokerage_fugou_rate['brokerage_rate'] = $data['number_rate'];
-            Db::name("system_config_value")->where(["config_key"=>"brokerage_fugou_rate"])->where('mer_id', 0)->update([
-                'value' => json_encode($brokerage_fugou_rate)
-            ]);
-
-            //修改佣金等级分成比例
-            $user_group_rate = Db::name("system_config_value")->where(["config_key"=>"user_group_rate"])->value("value");
-            $user_group_rate = json_decode($user_group_rate, true);
-            $user_group_rate[0]['rate'] = $data['user_groub_1'];
-            $user_group_rate[1]['rate'] = $data['user_groub_2'];
-            $user_group_rate[2]['rate'] = $data['user_groub_3'];
-            $user_group_rate[3]['rate'] = $data['user_groub_4'];
-            $user_group_rate[4]['rate'] = $data['user_groub_5'];
-            $user_group_rate[5]['rate'] = $data['user_groub_6'];
-            $user_group_rate[6]['rate'] = $data['user_groub_7'];
-            Db::name("system_config_value")->where(["config_key"=>"user_group_rate"])->where('mer_id', 0)->update(['value' =>json_encode($user_group_rate)]);
-
-            //修改佣金股权比例
-            Db::name("system_config_value")->where(["config_key"=>"brokerage_guquan_rate"])->where('mer_id', 0)->update(['value' =>$data['guquan_rate']]);
-            //修改佣金联创比例
-            Db::name("system_config_value")->where(["config_key"=>"brokerage_lianchuang_rate"])->where('mer_id', 0)->update(['value' =>$data['lianchuang_rate']]);
-        }
-
-        if ($key == 'fugou') {
-            //修改复购金比例
-            $brokerage_fugou_rate = Db::name("system_config_value")->where(["config_key"=>"brokerage_fugou_rate"])->value("value");
-            $brokerage_fugou_rate = json_decode($brokerage_fugou_rate, true);
-            $brokerage_fugou_rate['fugou_rate'] = $data['number_rate'];
-            Db::name("system_config_value")->where(["config_key"=>"brokerage_fugou_rate"])->where('mer_id', 0)->update([
-                'value' => json_encode($brokerage_fugou_rate)
-            ]);
-            //修改复购金等级分成比例
-            $user_group_fugou_rate = Db::name("system_config_value")->where(["config_key"=>"user_group_fugou_rate"])->value("value");
-            $user_group_fugou_rate = json_decode($user_group_fugou_rate, true);
-            $user_group_fugou_rate[0]['rate'] = $data['user_groub_1'];
-            $user_group_fugou_rate[1]['rate'] = $data['user_groub_2'];
-            $user_group_fugou_rate[2]['rate'] = $data['user_groub_3'];
-            $user_group_fugou_rate[3]['rate'] = $data['user_groub_4'];
-            $user_group_fugou_rate[4]['rate'] = $data['user_groub_5'];
-            $user_group_fugou_rate[5]['rate'] = $data['user_groub_6'];
-            $user_group_fugou_rate[6]['rate'] = $data['user_groub_7'];
-            Db::name("system_config_value")->where(["config_key"=>"user_group_fugou_rate"])->where('mer_id', 0)->update([
-                'value' => json_encode($user_group_fugou_rate)
-            ]);
-            //修改复购金股权比例
-            Db::name("system_config_value")->where(["config_key"=>"fugou_guquan_rate"])->where('mer_id', 0)->update(['value' => $data['guquan_rate']]);
-            //修改复购金联创比例
-            Db::name("system_config_value")->where(["config_key"=>"fugou_lianchuang_rate"])->where('mer_id', 0)->update(['value' => $data['lianchuang_rate']]);
-        }
-
-        return true;
+        $user_group_rate = Db::name("system_config_value")->where(["config_key"=>$key])->value("value");
+        $user_group_rate = json_decode($user_group_rate, true);
+        $user_group_rate[0]['rate'] = $data['user_groub_1'];
+        $user_group_rate[1]['rate'] = $data['user_groub_2'];
+        $user_group_rate[2]['rate'] = $data['user_groub_3'];
+        $user_group_rate[3]['rate'] = $data['user_groub_4'];
+        $user_group_rate[4]['rate'] = $data['user_groub_5'];
+        $user_group_rate[5]['rate'] = $data['user_groub_6'];
+        $user_group_rate[6]['rate'] = $data['user_groub_7'];
+        $user_group_rate[7]['rate'] = $data['user_groub_8'];
+        $user_group_rate[8]['rate'] = $data['user_groub_9'];
+        Db::name("system_config_value")->where(["config_key"=>$key])->where('mer_id', 0)->update(['value' =>json_encode($user_group_rate)]);
     }
 
     /**

app/common/repositories/user/UserRepository.php

@@ -869,6 +869,7 @@ class UserRepository extends BaseRepository
                             'uid' => $user['uid'],
                             'pv' => $num,
                             'status' => 1,
+                            'addtime' => time(),
                             'mark' => empty($mark) ?'管理员调整pv值' :  $mark,
                             'settlement_time' => date('Y-m-d H:i:s'),
                         ];
@@ -4105,4 +4106,28 @@ class UserRepository extends BaseRepository
         ];
 
     }
+
+    public function stockCreateForm()
+    {
+        $data = Db::name('user')->where(['status' => 1,'is_del' => 0])->field('uid,nickname')->select()->toArray();
+        return Elm::createForm(Route::buildUrl('systemUserStockCreate')->build(), [
+            Elm::select('user_id', '用户')->options(function () use ($data) {
+                foreach ($data as $label) {
+                    $options[] = ['label' => $label['nickname'],'value' => $label['uid']];
+                }
+                return $options;
+            })->filterable(true),
+            Elm::number('pack','份数')->required()
+        ])->setTitle('添加股权分红');
+    }
+
+    public function stockUpdateForm($id)
+    {
+        $stock = Db::name('old_user_stock')->where('id',$id)->field('user_id,pack')->find();
+        $user = Db::name('user')->where('uid',$stock['user_id'])->field('uid,nickname')->find();
+        return Elm::createForm(Route::buildUrl('systemUserStockUpdate',compact('id'))->build(), [
+            Elm::input('user_id','用户',$user['nickname'])->disabled(true),
+            Elm::number('pack','份数',$stock['pack'])->required()
+        ])->setTitle('编辑');
+    }
 }

app/controller/admin/user/User.php

@@ -1406,4 +1406,193 @@ class User extends BaseController
         $data['count']=Db::name('user_sign_score')->where($where)->count();
         return app('json')->success($data);
     }
+
+    /**
+     * 获取合伙人分红记录
+     * @return mixed
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
+     */
+    public function getWeekAwardList()
+    {
+        [$page, $limit] = $this->getPage();
+        $nickname = request()->param('nickname','');
+        $account = request()->param('account','');
+        $where = [];
+        if($nickname) $where[] = ['u.nickname','like','%'.$nickname.'%'];
+        if($account) $where[] = ['u.account','=',$account];
+
+        $query = Db::name('old_user_weekaward')->alias('w')
+            ->leftJoin('user u','w.user_id=u.uid')
+            ->leftJoin('old_user_starlevel star','star.id=w.user_star_id')
+            ->field('w.*,u.uid,u.real_name,u.nickname,star.title')
+            ->where($where);
+
+        $data = $query->page($page)
+            ->limit($limit)
+            ->order('w.id desc')
+            ->select();
+        $count = $query->count();
+        if($data) {
+            $data = $data->toArray();
+            foreach ($data as $k => $v){
+                $data[$k]['award_num'] = bcadd($v['award_num'],$v['award_num_sm'],2);
+                $data[$k]['create_time'] = date('Y-m-d H:i:s',$v['create_time']);
+                $data[$k]['radio'] = $v['radio'] == 2 ? '已发放' : '未发放';
+            }
+        }
+        $return_data['list'] = $data;
+        $return_data['count'] = $count;
+        return app('json')->success($return_data);
+    }
+
+    /**
+     * 获取联创奖励记录
+     * @return mixed
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
+     */
+    public function getOriginatorList()
+    {
+        [$page, $limit] = $this->getPage();
+        $nickname = request()->param('nickname','');
+        $account = request()->param('account','');
+        $where = [];
+        if($nickname) $where[] = ['u.nickname','like','%'.$nickname.'%'];
+        if($account) $where[] = ['u.account','=',$account];
+        $query = Db::name('old_user_originator')->alias('o')
+            ->leftJoin('user u','o.user_id=u.uid')
+            ->leftJoin('old_user_lianc lianc','lianc.id=o.user_lianc_id')
+            ->field('o.*,u.uid,u.real_name,u.nickname,lianc.title')
+            ->where($where);
+
+        $data = $query->page($page)
+            ->limit($limit)
+            ->order('o.id desc')
+            ->select();
+        $count = $query->count();
+        if($data) {
+            $data = $data->toArray();
+            foreach ($data as $k=>$v){
+                $data[$k]['create_time'] = date('Y-m-d H:i:s',$v['create_time']);
+            }
+        }
+        $return_data['list'] = $data;
+        $return_data['count'] = $count;
+        return app('json')->success($return_data);
+    }
+
+    /**
+     * 获取股权分红记录
+     * @return mixed
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
+     */
+    public function getStockList()
+    {
+        [$page, $limit] = $this->getPage();
+        $nickname = request()->param('nickname','');
+        $account = request()->param('account','');
+        $where = [];
+        if($nickname) $where[] = ['u.nickname','like','%'.$nickname.'%'];
+        if($account) $where[] = ['u.account','=',$account];
+        $query = Db::name('old_user_stock')->alias('o')
+            ->leftJoin('user u','o.user_id=u.uid')
+            ->field('o.*,u.uid,u.real_name,u.nickname')
+            ->where($where);
+
+        $data = $query->page($page)
+            ->limit($limit)
+            ->order('o.id desc')
+            ->select();
+        $count = $query->count();
+        if($data) {
+            $data = $data->toArray();
+            foreach ($data as $k=>$v){
+                $data[$k]['create_time'] = date('Y-m-d H:i:s',$v['create_time']);
+                $data[$k]['update_time'] = date('Y-m-d H:i:s',$v['update_time']);
+            }
+        }
+        $return_data['list'] = $data;
+        $return_data['count'] = $count;
+        return app('json')->success($return_data);
+    }
+
+    /**
+     * 股权分红创建表单
+     * @return mixed
+     */
+    public function stockCreateForm()
+    {
+        return app('json')->success(formToData($this->repository->stockCreateForm()));
+    }
+
+    /**
+     * @Author:Qinii
+     * @Date: 2020/5/11
+     * @param $id
+     * @return mixed
+     */
+    public function stockUpdateForm($id)
+    {
+        if (!$id) return app('json')->fail('数据不存在');
+        return app('json')->success(formToData($this->repository->stockUpdateForm($id)));
+    }
+
+    /**
+     * 添加
+     * @return mixed
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
+     */
+    public function stockCreate()
+    {
+        $user_id = request()->param('user_id',0);
+        $pack = request()->param('pack',0);
+        if(!$user_id) return app('json')->fail('请选择用户');
+        if(!$pack) return app('json')->fail('请输入份数');
+        $user_data = Db::name('old_user_stock')->where('user_id',$user_id)->find();
+        if($user_data) return app('json')->fail('用户已存在');
+        $insert_data = [
+            'user_id' => $user_id,
+            'pack' => $pack,
+            'getcomm' => 0,
+            'allgetcomm' => 0,
+            'create_time' => time(),
+        ];
+        Db::name('old_user_stock')->save($insert_data);
+        return app('json')->success('添加成功');
+    }
+
+    /**
+     * @Author:Qinii
+     * @Date: 2020/5/11
+     * @param $id
+     * @param validate $validate
+     * @return mixed
+     */
+    public function stockUpdate($id)
+    {
+        $pack = request()->param('pack',0);
+        if(!$pack) return app('json')->fail('请输入份数');
+        Db::name('old_user_stock')->where('id',$id)->update(['pack' => $pack,'update_time'=>time()]);
+        return app('json')->success('编辑成功');
+    }
+
+    /**
+     * @Author:Qinii
+     * @Date: 2020/5/11
+     * @param $id
+     * @return mixed
+     */
+    public function stockDelete($id)
+    {
+        if (!$id) return app('json')->fail('数据不存在');
+        Db::name('old_user_stock')->where('id',$id)->delete();
+        return app('json')->success('删除成功');
+    }
 }

app/controller/api/Notify.php

@@ -620,7 +620,7 @@ class Notify
                                 $merchant = app()->make(MerchantRepository::class);
                                 $merchantInfo = $merchant->get($store_order_data['mer_id']);
                                 // 1企业2个体3个人
-                                if ($merchantInfo && !empty($store_order_data) && in_array($merchantInfo['type'], [2, 3])) {
+                                if ($merchantInfo && !empty($store_order_data) && in_array($merchantInfo['type'], [1, 2, 3])) {
                                     //商家让利部分的拆分
                                     $ylj_pri = bcmul($concession_pri, 0.3, 2); // 让利部分30%给消费者做养老金
                                     $pv = bcmul($concession_pri, 0.35, 2); // 35%做业绩PV分配
@@ -749,7 +749,7 @@ class Notify
                             
                              //判断是否是自营商品，如果是自营商品需要更改这个值
                              
-                            if($store_order_data['mer_id'] == 496){
+                            if($store_order_data['mer_id'] == 496 || $store_order_data['mer_id'] != 439){
                                 //自营商品
                                 Db::name('store_order')->where('group_order_id', $group_order_id)->update(['distribution_mode'=>1]);
                             }

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

@@ -447,6 +447,27 @@ class Jt extends BaseController
         return app("json")->success("获取详情成功-aabb,用户{$userId}", $return);
     }
 
+    /**
+     * 商品详情转链
+     * @return mixed
+     */
+    public function changLinkApi()
+    {
+        $discount_link = $this->request->param('discount_link');
+        $skuId = $this->request->param('skuId');
+        $userId = $this->request->uid();
+        $url = '';
+        if($userId != ''){
+            $clparams = [
+                'positionid' => pow(10, 5) + $userId,
+                'gid' => $skuId,
+                'coupon_url' => $discount_link ?? '',
+            ];
+            $url = $this->changLink($clparams);
+        }
+        return app("json")->success(['url' => $url]);
+    }
+
 
     //实际执行活动经推推商品详情方法
     public function doGetJtDetail($goodsId, $userId)
@@ -578,6 +599,7 @@ class Jt extends BaseController
                 'yanglaojin' => $yanglaojin,
                 'gongxian' => $gongxian,
                 'jifen' => $jifen,
+                'discount_link' => $detail['couponInfo']['couponList'][0]['discount_link']
 
                 // 'yanglao' => $yanglao,
                 // 'yanglao_' => $commissionMoney,
@@ -587,16 +609,16 @@ class Jt extends BaseController
             $formatData['gongxian']=round($gongxian,2);
             $formatData['jifen']=round($jifen,2);
 
-            $formatData['materialUrl'] = '';
-            if($userId!=''){
-                //加入转链地址 此步骤可优化 分两个步骤
-                $clparams = [
-                    'positionid' => pow(10, 5) + $userId,
-                    'gid' => $goodsId,
-                    'coupon_url' => $detail['couponInfo']['couponList'][0]['discount_link'] ?? '',
-                ];
-                $formatData['materialUrl'] = $this->changLink($clparams);
-            }
+//            $formatData['materialUrl'] = '';
+//            if($userId!=''){
+//                //加入转链地址 此步骤可优化 分两个步骤
+//                $clparams = [
+//                    'positionid' => pow(10, 5) + $userId,
+//                    'gid' => $goodsId,
+//                    'coupon_url' => $detail['couponInfo']['couponList'][0]['discount_link'] ?? '',
+//                ];
+//                $formatData['materialUrl'] = $this->changLink($clparams);
+//            }
 
             $return[] = $formatData;
         }

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

@@ -237,8 +237,8 @@ class StoreProduct extends BaseController
     {
 //        $appid = 'wx82986c4471ce7efc';
 //        $secret = '4ae3f790d8c5503a22579338504cdb61';
-        $appid = 'wxfb755febdb800f23';
-        $secret = '55ed00200ef0ec6662ca8502dc534a69';
+        $appid = env('WECHAT_MP.APPID');
+        $secret = env('WECHAT_MP.SECRET');
         $access_token = Cache::get($appid . '_mp_access_token');
         if ($access_token)
             return $access_token;

app/controller/api/user/User.php

@@ -933,6 +933,9 @@ class User extends BaseController
                 //赠送积分 完善实名送90个积分，同时送邀请人50个积分
                 $userRepository->sign_add($member_id, 90,1,'完善实名系统赠送90个积分','','', '', 1, '', 1);
                 $member_info = Db::name('user')->where( array('uid' => $member_id) )->find();
+                Db::name('user')
+                    ->where('uid', $member_id)
+                    ->update(['real_name' => $params['user_name'], 'nickname' => $params['user_name']]);
                 if($member_info['spread_uid']){
                     //好友完善实名系统赠送50个积分
                     $spreadUid = $member_info['spread_uid'];
@@ -1277,14 +1280,20 @@ class User extends BaseController
      * 修改个人信息*/
     public function updateUser()
     {
-        $data = $this->request->params([
-            'nickname',
-            'avatar',
-            'sex',
-            'birthday',
-            'addres',
-            'mark'
-        ]);
+        $data['nickname'] = $this->request->param('nickname', null);
+        $data['avatar'] = $this->request->param('avatar', null);
+        $data['sex'] = $this->request->param('sex', null);
+        $data['birthday'] = $this->request->param('birthday', null);
+        $data['addres'] = $this->request->param('addres', null);
+        $data['mark'] = $this->request->param('mark', null);
+        $data['phone'] = $this->request->param('phone', null);
+        //        $data['phone'] = $this->request->param('phone', null);
+        if (!empty($data['phone'])) {
+            $data['account'] = $data['phone'];
+        }
+        $data = array_filter($data, function($value) {
+            return $value !== null;
+        });
         $uid = $this->request->uid();
         $res = '';
         if ($this->source == 'yhc') {
@@ -1640,7 +1649,11 @@ class User extends BaseController
         $child_nums = $this->getdepartmentStatistics($user_id, 'level_id');
         $child_nums_Tree = $this->buildTreePv($child_nums, $user['level_id'], 'level_id');
         $new_performance = 0; //一周内新增总业绩
-        $end_time = date('Y-m-d ' . '00:00:00', strtotime('-7 days'));
+        // 这周的时间区间
+//        $end_time = date('Y-m-d ' . '00:00:00', strtotime('-7 days'));
+        $now = time();
+        $startTime = date('Y-m-d 00:00:00', strtotime('monday this week', $now)); // 这周星期一的开始时间
+        $endTime = date('Y-m-d 23:59:59', strtotime('sunday this week', $now)); // 这周星期日的结束时间
         $person_nums_pv = 0;//大部门业绩
         $common_nums_pv = 0;//小部门业绩
         $aLL_list = [];//直推数据
@@ -1650,14 +1663,20 @@ class User extends BaseController
             // 计算总新增业绩
             $uid_list = array_column($child_nums, 'uid');
             $uid_list = array_diff($uid_list, [$user_id]);
-            $new_performance = Db::name("user_pv_log")->where([['uid', 'in', $uid_list], ['settlement_time', '>', $end_time]])->sum('pv');
+            $new_performance = Db::name("user_pv_log")
+                ->whereIn('uid', $uid_list)
+                ->whereBetween('settlement_time', [$startTime, $endTime])
+                ->sum('pv');
             //获取大部门的key
             $maxBalanceIndex = array_search(max(array_column($child_nums_Tree[0]['children'], 'total_pv')), array_column($child_nums_Tree[0]['children'], 'total_pv'));
             foreach ($child_nums_Tree[0]['children'] as $k => $v) {
                 $child_nums = $this->getdepartmentStatistics($v['uid'], 'level_id');
                 $uid_list = array_column($child_nums, 'uid');
                 array_push($uid_list, $v['uid']);
-                $new_performance_child = Db::name("user_pv_log")->where([['uid', 'in', $uid_list], ['settlement_time', '>', $end_time]])->sum('pv');
+                $new_performance_child = Db::name("user_pv_log")
+                    ->whereIn('uid', $uid_list)
+                    ->whereBetween('settlement_time', [$startTime, $endTime])
+                    ->sum('pv');
                 if ($k == $maxBalanceIndex) {
                     $person_list[] = [
                         "uid" => $v["uid"],
@@ -1746,7 +1765,10 @@ class User extends BaseController
                     $child_nums = $this->getdepartmentStatistics($v['uid']);
                     $uid_list = array_column($child_nums, 'uid');
                     array_push($uid_list, $v['uid']);
-                    $new_performance_child = Db::name("user_pv_log")->where([['uid', 'in', $uid_list], ['settlement_time', '>', $end_time]])->sum('pv');
+                    $new_performance_child = Db::name("user_pv_log")
+                        ->whereIn('uid', $uid_list)
+                        ->whereBetween('settlement_time', [$startTime, $endTime])
+                        ->sum('pv');
 
                     $aLL_list[] =  [
                         "uid" => $v["uid"],

config/console.php

@@ -28,5 +28,6 @@ return [
         'movie_film' => 'app\command\MovieFilmCommand',
         'cinema_film_sched' => 'app\command\CinemaSchedCommand',
         'repair_pv_log' => 'app\command\repairPvLog',
+        'gzcAddByBill' => 'app\command\GzcAddByBillCommand',
     ],
 ];

route/admin.php

@@ -443,6 +443,15 @@ Route::group(config('admin.api_admin_prefix') . '/', function () {
             Route::get('order/:id', '/order')->name('systemUserOrder');
             Route::get('coupon/:id', '/coupon')->name('systemUserCoupon');
             Route::get('bill/:id', '/new_bill')->name('systemUserBill');
+            // 分红统计
+            Route::get('get_week_award_list', '/getWeekAwardList')->name('systemUserGetWeekAwardList');
+            Route::get('get_originator_list', '/getOriginatorList')->name('systemUserGetOriginatorList');
+            Route::get('get_stock_list', '/getStockList')->name('systemUserGetStockList');
+            Route::get('stock/form', '/stockCreateForm')->name('systemUserStockCreateForm');
+            Route::get('stock/update/form/:id', '/stockUpdateForm')->name('systemUserStockUpdateForm');
+            Route::post('stock/update/:id', '/stockUpdate')->name('systemUserStockUpdate');
+            Route::post('stock/create', '/stockCreate')->name('systemUserStockCreate');
+            Route::delete('stock/delete/:id', '/stockDelete')->name('systemUserStockDelete');
 
         })->prefix('admin.user.User');
 

route/api.php

@@ -380,6 +380,7 @@ Route::group('api/', function () {
         }else{
             /*京东商品详情*/
             Route::get('jd/detail', 'api.store.product.Jt/goodsDetail')->middleware(\app\common\middleware\UserTokenMiddleware::class, false);//京推推
+            Route::get('jd/chang_link', 'api.store.product.Jt/changLinkApi')->middleware(\app\common\middleware\UserTokenMiddleware::class, false);//京推推
             Route::get('jd/search', 'api.store.product.Jt/search');//京推推
         }