Merge branch 'dev' into dev-sxb

# Conflicts:
#	app/common/dao/user/UserDao.php

app/command/GreatLifeOrderIndependentAccount.php

@@ -42,7 +42,7 @@ class GreatLifeOrderIndependentAccount extends Command
         $merchants = [];
 
         // 已支付、未结算
-        $where = ['paid' => 1, 'is_independentaccount' => 0, 'is_del' => 0, 'is_system_del' => 0, 'is_settlement' => 1];
+        $where = ['paid' => 1, 'is_independentaccount' => 0, 'is_del' => 0, 'is_system_del' => 0];
         // 订单状态（0：待发货；1：待收货；2：待评价；3：已完成；4已申请退款；-1：已退款）5未支付 6已取消'
         $status = [2, 3];
         // 普通订单

app/command/HuafeiOrderIndependentAccount.php

@@ -53,7 +53,7 @@ class HuafeiOrderIndependentAccount extends Command
         // 订单状态（0：待发货；1：待收货；2：待评价；3：已完成；4已申请退款；-1：已退款）5未支付 6已取消'
         $status = [2];
         // 普通订单
-        $cursor = Db::table('rrx_order_huafei')->where('is_independentaccount', 0)->where('gzc',1)->whereIn('status', $status)->select();
+        $cursor = Db::table('rrx_order_huafei')->where('is_independentaccount', 0)->whereIn('status', $status)->select();
 
 
         /** @var StoreOrderRepository $storeOrderRepository */

app/common/dao/user/UserDao.php

@@ -383,6 +383,34 @@ class UserDao extends BaseDao
     }
 
     /**
+     * 获取测试用户 uid List
+     * @return array
+     */
+    public function getTestUidList(): array
+    {
+        return $this::getModel()::getDB()->where('test_user', '=', 1)->column('uid');
+    }
+
+    /**
+     * 获取删除用户 uid List
+     * @return array
+     */
+    public function getDelUidList(): array
+    {
+        return $this::getModel()::getDB()->where('is_del', '=', 1)->column('uid');
+    }
+
+    /**
+     * 获取删除用户 uid List
+     * @return array
+     */
+    public function getInvalidUidList(): array
+    {
+        return $this::getModel()::getDB()->where('test_user', '=', 1)->whereOr('is_del', '=', 1)->column('uid');
+    }
+
+
+    /**
      * @param $uid
      * @return CommonEntity
      */

app/common/repositories/finance/FinanceRepository.php

@@ -28,8 +28,17 @@ class FinanceRepository extends BaseRepository
      */
     public function order_overview($mer_id = 0)
     {
+        // 需要过滤掉的用户
+        /** @var UserRepository $userRepository */
+        $userRepository = app()->make(UserRepository::class);
+        $invalidUidList = $userRepository->getInvalidUidList();
+
         if ($mer_id) {
             $where = "mer_id = " . $mer_id . " and paid = 1";
+            if (!empty($invalidUidList)) {
+                $invalidSqlStr = ' AND uid NOT IN (' . implode(',', $invalidUidList) . ')';
+                $where .= $invalidSqlStr;
+            }
             $type = input('type', 1);
             $day = input('day', '');
     
@@ -138,8 +147,14 @@ class FinanceRepository extends BaseRepository
             $weekWhere .= " and DATE(create_time) >= '" . $oneWeekAgoFormatted . "' and DATE(create_time) <= '" . $todayFormatted . "'";
             //今日时间条件
             $dayWhere .= " and DATE(create_time) = '" . $todayFormatted . "'";
-    
-    
+
+            if (!empty($invalidUidList)) {
+                $invalidSqlStr = ' AND uid NOT IN (' . implode(',', $invalidUidList) . ')';
+                $where .= $invalidSqlStr;
+                $weekWhere .= $invalidSqlStr;
+                $dayWhere .= $invalidSqlStr;
+            }
+
             // 会员专区订单总数
             //总数
             $chengjiaomoney = Db::name('store_order')->where($where)->where('mer_id', 496)->count();
@@ -250,6 +265,15 @@ class FinanceRepository extends BaseRepository
     public function user_overview($mer_id = 0)
     {
         $where = "1=1 ";
+
+        // 需要过滤掉的用户
+        /** @var UserRepository $userRepository */
+        $userRepository = app()->make(UserRepository::class);
+        $invalidUidList = $userRepository->getInvalidUidList();
+        if (!empty($invalidUidList)) {
+            $invalidSqlStr = ' AND uid NOT IN (' . implode(',', $invalidUidList) . ')';
+            $where .= $invalidSqlStr;
+        }
         if ($mer_id) {
             $mer_uid = Db::name('merchant')->where('mer_id', $mer_id)->value('uid');
             $userRepository = app()->make(UserRepository::class);
@@ -368,6 +392,18 @@ class FinanceRepository extends BaseRepository
         $weekWhere = " 1=1";
         $dayWhere = " 1=1";
 
+        // 需要过滤掉的用户
+        /** @var UserRepository $userRepository */
+        $userRepository = app()->make(UserRepository::class);
+        $invalidUidList = $userRepository->getInvalidUidList();
+        if (!empty($invalidUidList)) {
+            $invalidSqlStr = ' AND uid NOT IN (' . implode(',', $invalidUidList) . ')';
+            $where .= $invalidSqlStr;
+            $sWeekWhere .= $invalidSqlStr;
+            $weekWhere .= $invalidSqlStr;
+            $dayWhere .= $invalidSqlStr;
+        }
+
         $currentDate = date('Y-m-d');
         // 上周的开始日期（周一）
         $startDate = date('Y-m-d', strtotime('last Monday', strtotime($currentDate)));
@@ -428,6 +464,18 @@ class FinanceRepository extends BaseRepository
         $sWeekWhere = " 1=1";
         $weekWhere = " 1=1";
         $dayWhere = " 1=1";
+
+        // 需要过滤掉的用户
+        /** @var UserRepository $userRepository */
+        $userRepository = app()->make(UserRepository::class);
+        $invalidUidList = $userRepository->getInvalidUidList();
+        if (!empty($invalidUidList)) {
+            $invalidSqlStr = ' AND uid NOT IN (' . implode(',', $invalidUidList) . ')';
+            $where .= $invalidSqlStr;
+            $sWeekWhere .= $invalidSqlStr;
+            $weekWhere .= $invalidSqlStr;
+            $dayWhere .= $invalidSqlStr;
+        }
        
         $currentDate = date('Y-m-d');
         // 上周的开始日期（周一）
@@ -481,7 +529,19 @@ class FinanceRepository extends BaseRepository
         $sWeekWhere = " 1=1";
         $weekWhere = " 1=1";
         $dayWhere = " 1=1";
-       
+
+        // 需要过滤掉的用户
+        /** @var UserRepository $userRepository */
+        $userRepository = app()->make(UserRepository::class);
+        $invalidUidList = $userRepository->getInvalidUidList();
+        if (!empty($invalidUidList)) {
+            $invalidSqlStr = ' AND uid NOT IN (' . implode(',', $invalidUidList) . ')';
+            $where .= $invalidSqlStr;
+            $sWeekWhere .= $invalidSqlStr;
+            $weekWhere .= $invalidSqlStr;
+            $dayWhere .= $invalidSqlStr;
+        }
+
         $currentDate = date('Y-m-d');
         // 上周的开始日期（周一）
         $startDate = date('Y-m-d', strtotime('last Monday', strtotime($currentDate)));
@@ -538,6 +598,18 @@ class FinanceRepository extends BaseRepository
         $sWeekWhere = " 1=1";
         $weekWhere = " 1=1";
         $dayWhere = " 1=1";
+
+        // 需要过滤掉的用户
+        /** @var UserRepository $userRepository */
+        $userRepository = app()->make(UserRepository::class);
+        $invalidUidList = $userRepository->getInvalidUidList();
+        if (!empty($invalidUidList)) {
+            $invalidSqlStr = ' AND uid NOT IN (' . implode(',', $invalidUidList) . ')';
+            $where .= $invalidSqlStr;
+            $sWeekWhere .= $invalidSqlStr;
+            $weekWhere .= $invalidSqlStr;
+            $dayWhere .= $invalidSqlStr;
+        }
        
         $currentDate = date('Y-m-d');
         // 上周的开始日期（周一）
@@ -597,6 +669,18 @@ class FinanceRepository extends BaseRepository
             $bill_where = "commission_type !=5 and source=0 ";
             $yanglao_where = " commission_type =5 and source=0 ";
         }
+        // 需要过滤掉的用户
+        /** @var UserRepository $userRepository */
+        $userRepository = app()->make(UserRepository::class);
+        $invalidUidList = $userRepository->getInvalidUidList();
+        if (!empty($invalidUidList)) {
+            $invalidSqlStr = ' AND uid NOT IN (' . implode(',', $invalidUidList) . ')';
+            $where .= $invalidSqlStr;
+            $where_order .= $invalidSqlStr;
+            $bill_where .= $invalidSqlStr;
+            $yanglao_where .= $invalidSqlStr;
+        }
+
         if ($type == 1 and $day != '') {
             $lastDay = date('Y-m-d', strtotime($day));
             $day = $lastDay;

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

@@ -7546,12 +7546,12 @@ class StoreOrderRepository extends BaseRepository
         //首先查询商品有没有设置佣金
 //        $extension = Db::name("store_product")->where("product_id", $order['product_id'])->field("mer_id,extension_type,type,commission")->find();
 
-        // 推荐创客收益设置
-        $shop_bonus_setting = merchantConfig($mer_id, 'shop_bonus_setting') ?: [
-            'shop_bonus_rate' => 30,
-            'yanglao_rate' => 5,
-        ];
-        Db::name('log')->insert(['data' => 'shop_bonus_setting:' . json_encode($shop_bonus_setting)]);
+        // // 推荐创客收益设置
+        // $shop_bonus_setting = merchantConfig($mer_id, 'shop_bonus_setting') ?: [
+        //     'shop_bonus_rate' => 30,
+        //     'yanglao_rate' => 5,
+        // ];
+        // Db::name('log')->insert(['data' => 'shop_bonus_setting:' . json_encode($shop_bonus_setting)]);
 
         //直推奖设置
         $zhitui_rate_setting = systemConfig('zhitui_rate');
@@ -7643,9 +7643,11 @@ class StoreOrderRepository extends BaseRepository
             //可分总佣金 暂时用不到 预留
             $divisible_commission = 0;
         } else {
-            //自营商品
-            //创客账户: 支付金额*（1-商户分润比例）-通道费+运费
-            $shop_bonus_rate = $shop_bonus_setting['shop_bonus_rate'] ?? 0;
+            //自营商品 和 商贸区
+            // //创客账户: 支付金额*（1-商户分润比例）-通道费+运费
+            // $shop_bonus_rate = $shop_bonus_setting['shop_bonus_rate'] ?? 0;
+            $shop_bonus_rate = merchantConfig($mer_id, 'base_commission') ?: 5;
+
             $mer_money = decimal2($pay_price * (1 - $shop_bonus_rate / 100) - $shouxufei + $total_postage);
 
             //平台金额：支付金额*商户分润比例-养老金

app/controller/admin/order/Order.php

@@ -95,8 +95,12 @@ class Order extends BaseController
                     $item['orderProduct'][0]['cart_info']['productAttr']['price'] ?? 0.00,
                     $item['orderProduct'][0]['product_num'] ?? 0,
                     $item['pay_price'], // 订单金额
-                    $item['fzone_pay_note'], // 支付方式
                     $item['paid'] == 0 ? "未支付" : "已支付", // 支付状态
+                    $item['fzone_pay_note'], // 支付方式
+                    $item['fzone_pay_jifen'], // 支付方式
+                    $item['fzone_pay_price'], // 支付方式
+                    $item['fzone_pay_jingdou'], // 支付方式
+                    $item['fzone_pay_vr'], // 支付方式
                     $item['is_del'] == 0 ? ($item['status'] == 5 ? '待付款' : ($item['status'] == 0 ? '待发货' : ($item['status'] == 1 ? '待收货' : ($item['status'] == 2 ? '待评价' : ($item['status'] == 3 ? '已完成' : ($item['status'] == 4 ? '已申请退款' : ($item['status'] == -1 ? '已退款' : ($item['status'] == 6 ? '已取消' : '')))))))) : '已删除', // 订单状态
                     $item['create_time'], // 下单时间
                 ];
@@ -113,8 +117,12 @@ class Order extends BaseController
                 '商品单价',
                 '商品数量',
                 '订单金额',
-                '支付方式',
                 '支付状态',
+                '支付方式',
+                '支付积分',
+                '支付现金',
+                '支付京豆',
+                '支付VR',
                 '订单状态',
                 '下单时间'
             ], $arr, '订单明细'));