Merge branch 'master' into huangfamily

app/common/repositories/finance/FinanceRepository.php

@@ -1338,6 +1338,9 @@ class FinanceRepository extends BaseRepository
         // ->when(isset($params['pm']) && $params['pm'] != '', function ($query) use ($params) {
         //     $query->where('uss.pm', $params['pm']);
         // })
+        ->when(isset($mer_id) && $mer_id != '' && $mer_id != 0, function ($query) use ($mer_id) {
+            $query->where('uss.mer_id', $mer_id);
+        })
         ->when(isset($params['status']) && $params['status'] != '', function ($query) use ($params) {
             $query->where('uss.status', $params['status']);
         })
@@ -1939,6 +1942,9 @@ class FinanceRepository extends BaseRepository
         ->leftJoin('user u', 'u.uid=uss.uid')
         ->leftJoin('store_order o', 'o.order_id=uss.order_id')
         ->leftJoin('merchant m', 'm.mer_id=o.mer_id')
+        ->when(isset($mer_id) && $mer_id != '' && $mer_id != 0, function ($query) use ($mer_id) {
+            $query->where('o.mer_id', $mer_id);
+        })
         ->when(isset($params['uid']) && $params['uid'] != '', function ($query) use ($params) {
             $query->where('uss.uid', $params['uid']);
         })

app/common/repositories/user/UserRepository.php

@@ -2829,14 +2829,32 @@ class UserRepository extends BaseRepository
     }
     public function getAccount($uid)
     {
+        $userAccountList = Db::name("user_account")
+            ->where(["uid"=>$uid])
+            ->select()
+            ->toArray();
+        $wxNickname = '';
+        $wxAvater = '';
+        $alNickname = '';
+        $alAvater = '';
+        foreach ($userAccountList as $userAccount) {
+            if ($userAccount['type'] == 1) {
+                $wxNickname = $userAccount['nickname'];
+                $wxAvater = $userAccount['avater'];
+            } else if ($userAccount['type'] == 2) {
+                $alNickname = $userAccount['nickname'];
+                $alAvater = $userAccount['avater'];
+            }
+        }
         $res=Db::name('user_extract_openid')->where('uid',$uid)->value('openid');
         if($res){
+
             $arr[]=array(
                 'id'=>'1',
                 'type'=>'1',
                 'uid'=>$uid,
-                'nickname'=>'',
-                'avater'=>'',
+                'nickname'=>$wxNickname,
+                'avater'=>$wxAvater,
             );
         }
         $res = Db::name('user') -> where('uid',$uid) -> value('ali_user_id');
@@ -2845,8 +2863,8 @@ class UserRepository extends BaseRepository
                 'id'=>'2',
                 'type'=>'2',
                 'uid'=>$uid,
-                'nickname'=>'',
-                'avater'=>'',
+                'nickname'=>$alNickname,
+                'avater'=>$alAvater,
             );
         }
         return isset($arr)?$arr:[];

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

@@ -398,7 +398,10 @@ class Other extends BaseController
                     ->order('bill_id', 'desc')
                     ->page($page, $limit)->select()->toArray();
                 foreach ($list as $k => &$value) {
-                        $pdd_list = Db::name("order_pdd")->where("order_sn",$value['order_sn'])->field('order_pdd_id id,goods_id,goods_sign,order_sn,goods_num,goods_img,goods_name,goods_price,pin_order_status other_status,pin_order_status_desc other_status_desc,order_money,pay_money,create_time,commission,bill_status,bill_end_time');
+                        $pdd_list = Db::name("order_pdd")
+                            ->where("order_sn",$value['order_sn'])
+                            ->field('order_pdd_id id,goods_id,goods_sign,order_sn,goods_num,goods_img,goods_name,goods_price,pin_order_status other_status,pin_order_status_desc other_status_desc,order_money,pay_money,create_time,commission,bill_status,bill_end_time')
+                            ->find();
                         if(!$pdd_list){
                             unset($list[$k]);
                             continue;
@@ -429,7 +432,10 @@ class Other extends BaseController
                     ->order('bill_id', 'desc')
                     ->page($page, $limit)->select()->toArray();
                 foreach ($list as $k => &$value) {
-                        $vip_list = Db::name("order_vip")->where("order_sn",$value['order_sn'])->field('order_vip_id id,goods_id,order_sn,goods_count goods_num,goods_thumb goods_img,goods_name,order_status other_status_desc,order_time create_time,commission,bill_status,bill_end_time,pay_money');
+                        $vip_list = Db::name("order_vip")
+                            ->where("order_sn",$value['order_sn'])
+                            ->field('order_vip_id id,goods_id,order_sn,goods_count goods_num,goods_thumb goods_img,goods_name,order_status other_status_desc,order_time create_time,commission,bill_status,bill_end_time,pay_money')
+                            ->find();
                         if(!$vip_list){
                             unset($list[$k]);
                             continue;
@@ -460,7 +466,10 @@ class Other extends BaseController
                     ->order('bill_id', 'desc')
                     ->page($page, $limit)->select()->toArray();
                 foreach ($list as $k => &$value) {
-                        $su_list = Db::name("order_su")->where("order_sn",$value['order_sn'])->field('order_su_id id,goods_id,order_sn,goods_count goods_num,goods_thumb goods_img,goods_name,status other_status_desc,order_time create_time,commission,bill_status,bill_end_time,pay_amount');
+                        $su_list = Db::name("order_su")
+                            ->where("order_sn",$value['order_sn'])
+                            ->field('order_su_id id,goods_id,order_sn,goods_count goods_num,goods_thumb goods_img,goods_name,status other_status_desc,order_time create_time,commission,bill_status,bill_end_time,pay_amount')
+                            ->find();
                         if(!$su_list){
                             unset($list[$k]);
                             continue;
@@ -491,7 +500,10 @@ class Other extends BaseController
                     ->order('bill_id', 'desc')
                     ->page($page, $limit)->select()->toArray();
                 foreach ($list as $k => &$value) {
-                        $tb_list = Db::name("order_tb")->where("order_sn",$value['order_sn'])->field('order_tb_id id,item_id goods_id,order_sn,item_num goods_num,item_img goods_img,item_title goods_name,item_price goods_price,tk_status,create_time,commission,commission_rate,alipay_total_price pay_money,bill_status,bill_end_time');
+                        $tb_list = Db::name("order_tb")
+                            ->where("order_sn",$value['order_sn'])
+                            ->field('order_tb_id id,item_id goods_id,order_sn,item_num goods_num,item_img goods_img,item_title goods_name,item_price goods_price,tk_status,create_time,commission,commission_rate,alipay_total_price pay_money,bill_status,bill_end_time')
+                            ->find();
                         if(!$tb_list){
                             unset($list[$k]);
                             continue;
@@ -530,7 +542,10 @@ class Other extends BaseController
                     ->order('bill_id', 'desc')
                     ->page($page, $limit)->select()->toArray();
                 foreach ($list as $k => &$value) {
-                        $jd_list = Db::name("order_jd")->where("order_sn",$value['order_sn'])->field('order_jd_id id,sku_id goods_id,order_sn,sku_num goods_num,image_url goods_img,sku_name goods_name,pay_money,price goods_price,status,create_time,commission,bill_status,bill_end_time');
+                        $jd_list = Db::name("order_jd")
+                            ->where("order_sn",$value['order_sn'])
+                            ->field('order_jd_id id,sku_id goods_id,order_sn,sku_num goods_num,image_url goods_img,sku_name goods_name,pay_money,price goods_price,status,create_time,commission,bill_status,bill_end_time')
+                            ->find();
                         if(!$jd_list){
                             unset($list[$k]);
                             continue;
@@ -563,7 +578,10 @@ class Other extends BaseController
                     ->order('bill_id', 'desc')
                     ->page($page, $limit)->select()->toArray();
                 foreach ($list as $k => &$value) {
-                        $dy_list = Db::name("order_dy")->where("order_sn",$value['order_sn'])->field('order_dy_id id,product_id goods_id,order_sn,product_num goods_num,product_img goods_img,product_name goods_name,commission,total_pay_amount pay_money,bill_status,bill_end_time,create_time,flow_point status,pay_success_time')->find();
+                        $dy_list = Db::name("order_dy")
+                            ->where("order_sn",$value['order_sn'])
+                            ->field('order_dy_id id,product_id goods_id,order_sn,product_num goods_num,product_img goods_img,product_name goods_name,commission,total_pay_amount pay_money,bill_status,bill_end_time,create_time,flow_point status,pay_success_time')
+                            ->find();
                         if(!$dy_list){
                             unset($list[$k]);
                             continue;
@@ -596,7 +614,10 @@ class Other extends BaseController
                     ->order('bill_id', 'desc')
                     ->page($page, $limit)->select()->toArray();
                 foreach ($list as $k => &$value) {
-                    $huafei_list = Db::name("order_huafei")->where("order_sn",$value['order_sn'])->field('order_huafei_id id,order_sn,commission,amount_price pay_money,bill_status,bill_end_time,create_time,finish_time')->find();
+                    $huafei_list = Db::name("order_huafei")
+                        ->where("order_sn",$value['order_sn'])
+                        ->field('order_huafei_id id,order_sn,commission,amount_price pay_money,bill_status,bill_end_time,create_time,finish_time')
+                        ->find();
                     if(!$huafei_list){
                         unset($list[$k]);
                         continue;

app/controller/api/user/User.php

@@ -3608,16 +3608,18 @@ class User extends BaseController
         $extract_amount = $this->request->param('extract_amount', 0);
         if ($type == 'brokerage') {
             $brokerage_price = Db::name('user')->where('uid', $uid)->value('brokerage_price');
-            $no_clear_amount = Db::name('user_bill')
-                ->where('uid', $uid)
-                ->where('commission_type', '<>', 5)
-                ->where('pm', 1)
-                ->where('status', 0)
-                ->sum('number');
-            $clear_amount = $brokerage_price - $no_clear_amount;
-            if ($user['brokerage_price'] < (systemConfig('withdrawal_money'))){
-                return app('json')->fail('未到达提现最低额度');
-            }
+            // 参考结算任务中的代码片段， 余额中 应不包含未结算余额
+            // $no_clear_amount = Db::name('user_bill')
+            //     ->where('uid', $uid)
+            //     ->where('commission_type', '<>', 5)
+            //     ->where('pm', 1)
+            //     ->where('status', 0)
+            //     ->sum('number');
+            // $clear_amount = $brokerage_price - $no_clear_amount;
+            $clear_amount = $brokerage_price;
+            // if ($user['brokerage_price'] < (systemConfig('withdrawal_money'))){
+            //     return app('json')->fail('未到达提现最低额度');
+            // }
             if($extract_amount > $clear_amount){
                 return app('json')->fail("可用金额不足提现");
             }

app/controller/merchant/finance/Finance.php

@@ -282,4 +282,42 @@ class Finance extends BaseController
         }
     }
 
+
+    /**
+     * 京豆统计
+     * @return mixed
+     */
+    public function jingdou_list(){
+        try {
+            $mer_id = $this->request->merId();
+            $financeRepository = app()->make(FinanceRepository::class);
+            $date = $financeRepository->jingdou_list($mer_id);
+            return app('json')->success($date);
+        } catch (\Exception $e) {
+            Db::name('log')->insert(['data' => '京豆统计错误：' . $e->getFile() . '：' . $e->getLine() . '【' . $e->getMessage() . '】']);
+            return app('json')->fail('京豆统计失败');
+        }
+    }
+
+
+    /**
+     * 分润统计
+     * @return mixed
+     */
+    public function fenrun_list(){
+        try {
+            $mer_id = $this->request->merId();
+            $financeRepository = app()->make(FinanceRepository::class);
+            $date = $financeRepository->fenrun_list($mer_id);
+            return app('json')->success($date);
+        } catch (\Exception $e) {
+            Db::name('log')->insert(['data' => '分润统计错误：' . $e->getFile() . '：' . $e->getLine() . '【' . $e->getMessage() . '】']);
+            return app('json')->fail('分润统计失败');
+        }
+    }
+
+
+
+
+
 }

route/merchant.php

@@ -536,6 +536,8 @@ Route::group(config('admin.api_merchant_prefix') . '/', function () {
             Route::get('earnings_list', '/earnings_list');
             Route::get('earnings_detail', '/earnings_detail');
             Route::get('shop_partne_list', '/shop_partne_list');
+            Route::get('jingdou_list', '/jingdou_list');    
+            Route::get('fenrun_list', '/fenrun_list');
             //创客佣金
             Route::group('maker', function () {
                 Route::get('bill', '/maker_bill');