app/command/ProductPriceUpdate.php

@@ -2,8 +2,7 @@
 
 namespace app\command;
 
-use app\common\model\shared\SharedProsperityPartnerConsumeUpdateLog;
-use app\common\repositories\shared\SharedProsperityRecommendConfigRepository;
+use app\common\repositories\store\product\ProductRepository;
 use think\console\Command;
 use think\console\Input;
 use think\console\Output;
@@ -16,6 +15,8 @@ class ProductPriceUpdate extends Command
 
     const PRODUCT_IDS = [31053, 32171];
 
+    const MER_ID = 3447;
+
     protected function configure()
     {
         // 指令配置
@@ -34,32 +35,98 @@ class ProductPriceUpdate extends Command
 
     private function priceUpdate()
     {
-        // 获取当前数据
-        $productData = Db::name('store_product')->where(['product_id' => self::PRODUCT_IDS])->field('product_id,price')->select()->toArray();
-        $attrData = Db::name('store_product_attr_value')->where(['product_id' => self::PRODUCT_IDS])->field('product_id,price')->select()->toArray();
-        Db::startTrans();
-        try {
-            foreach ($productData as $product) {
-                $log = [
-                    'product_id' => $product['product_id'],
-                    'old_price' => $product['price'],
-                    'number' => self::NUMBER,
-                    'new_price' => $product['price'] + self::NUMBER,
-                ];
-                Db::name('product_price_update_log')->insert($log);
-
-                Db::name('store_product')->where(['product_id' => $product['product_id']])->inc('price', self::NUMBER)->update();
-                Db::name('store_product_attr_value')->where(['product_id' => $product['product_id']])->inc('price', self::NUMBER)->update();
-            }
-
-;
-            Db::commit();
-            return true;
-        } catch (\Exception $e) {
-            Db::rollback();
-            throw $e;
+        // 获取商品数据
+        $productData = Db::name('store_product')->where(['product_id' => self::PRODUCT_IDS])->select()->toArray();
+
+
+        /** @var ProductRepository $repository */
+        $repository = app()->make(ProductRepository::class);
+        foreach ($productData as $product) {
+            $log = [
+                'product_id' => $product['product_id'],
+                'old_price' => $product['price'],
+                'number' => self::NUMBER,
+                'new_price' => $product['price'] + self::NUMBER,
+            ];
+            Db::name('product_price_update_log')->insert($log);
+
+            $attrValue = Db::name('store_product_attr_value')->where(['product_id' => $product['product_id']])->select()->toArray();
+            $attrValue[0]['price'] = $attrValue[0]['price'] + self::NUMBER;
+            $content = Db::name('store_product_content')->where(['product_id' => $product['product_id']])->field('content')->find();
+
+            // $update = [
+            //
+            //     'couponData' => [],
+            //
+            //     'is_gift_bag' => $product['is_gift_bag'],
+            // ];
+
+
+
+            $update = [
+                'image' => $product['image'],
+                'slider_image' => explode(',',$product['slider_image']),
+                'store_name' => $product['store_name'],
+                'store_info' => $product['store_info'],
+                'keyword' => $product['keyword'],
+                'bar_code' => 0,
+                'brand_id' => $product['brand_id'],
+                'cate_id' => $product['cate_id'],
+                'mer_cate_id' => [],
+                'unit_name' => $product['unit_name'],
+                'sort' => $product['sort'],
+                'is_good' => $product['is_good'],
+                'video_link' => '',
+                'temp_id' => $product['temp_id'],
+                'content' => $content['content'],
+                'spec_type' => $product['spec_type'],
+                'extension_type' => $product['extension_type'],
+                'attr' => [],
+                'attrValue' => $attrValue,
+                'give_coupon_ids' => [],
+                'volunteer' => $product['volunteer'],
+                'type' => $product['type'],
+                'pension' => $product['pension'],
+                'commission' => $product['commission'],
+                'pension_is' => $product['pension_is'],
+                'share_is' => $product['share_is'],
+                'ficti' => $product['ficti'],
+                'icon_type' => [],
+                'status' => $product['status']
+            ];
+
+            $repository->update($product['product_id'],$update,self::MER_ID);
+            Db::name('product_share')->where('product_id',$product['product_id'])->where('share_channel',1)->update(['url'=>'']);
         }
 
+
+
+        // // 获取当前数据
+        // $productData = Db::name('store_product')->where(['product_id' => self::PRODUCT_IDS])->field('product_id,price')->select()->toArray();
+        // $attrData = Db::name('store_product_attr_value')->where(['product_id' => self::PRODUCT_IDS])->field('product_id,price')->select()->toArray();
+        // Db::startTrans();
+        // try {
+        //     foreach ($productData as $product) {
+        //         $log = [
+        //             'product_id' => $product['product_id'],
+        //             'old_price' => $product['price'],
+        //             'number' => self::NUMBER,
+        //             'new_price' => $product['price'] + self::NUMBER,
+        //         ];
+        //         Db::name('product_price_update_log')->insert($log);
+        //
+        //         Db::name('store_product')->where(['product_id' => $product['product_id']])->inc('price', self::NUMBER)->update();
+        //         Db::name('store_product_attr_value')->where(['product_id' => $product['product_id']])->inc('price', self::NUMBER)->update();
+        //     }
+        //
+        //     ;
+        //     Db::commit();
+        //     return true;
+        // } catch (\Exception $e) {
+        //     Db::rollback();
+        //     throw $e;
+        // }
+
     }
 
 }

app/common/dao/store/order/StoreCartDao.php

@@ -218,4 +218,32 @@ class StoreCartDao extends BaseDao
             ->whereIn('cart_id', $cartIdList)
             ->update(['is_pay' => $isPay]);
     }
+
+    /**
+     * 获取 购物车实体 根基用户ID 商品ID列表 查询 已下单的（这里并非表示已支付） 购物车实体
+     * @param int $uid
+     * @param array $productIdList
+     * @return CartEntity[]
+     */
+    public function getCartEntityListByUidAndProductIdListAndIsPay(int $uid, array $productIdList): array
+    {
+        $entityList = [];
+        try {
+            /** @var StoreCart $model */
+            $model = $this->getModel();
+            $dataListRes = $model::getDB()
+                ->where('uid', '=', $uid)
+                ->whereIn('product_id', $productIdList)
+                ->where('is_pay', '=', CartEnum::IS_PAY['Yes']['code'])
+                ->select()
+                ->toArray();
+            if (!empty($dataListRes)) {
+                foreach ($dataListRes as $data) {
+                    $entityList[] = CartEntity::newInstance($data);
+                }
+            }
+        } catch (\Exception $e) {
+        }
+        return $entityList;
+    }
 }

app/common/dao/store/order/StoreOrderDao.php

@@ -723,6 +723,32 @@ class StoreOrderDao extends BaseDao
     }
 
     /**
+     * @param array $cartIdList
+     * @return StoreOrderEntity[]
+     */
+    public function getStoreOrderEntityListByCartIdListAndIsPay(array $cartIdList): array
+    {
+        $entityList = [];
+        try {
+            /** @var StoreOrder $model */
+            $model = $this->getModel();
+            $dataRes = $model::getDB()
+                ->whereIn('card_id', $cartIdList)
+                ->where('paid', '=', StoreOrderEnum::PAID['YES']['code'])
+                ->select()
+                ->toArray();
+            if (!empty($dataRes)) {
+                $entityList = array_map(function ($data) {
+                    return StoreOrderEntity::newInstance($data);
+                }, $dataRes);
+            }
+        } catch (\Exception $e) {
+
+        }
+        return $entityList;
+    }
+
+    /**
      * 订单支付成功 更新订单状态
      * @param StoreOrderEntity[] $storeOrderEntityList
      * @return StoreOrderEntity[]

app/common/model/store/order/StoreOrder.php

@@ -11,10 +11,14 @@
 namespace app\common\model\store\order;
 
 
+use app\common\enum\CommonEnum;
+use app\common\enum\shared\SharedProsperityRewardRecordEnum;
 use app\common\model\BaseModel;
+use app\common\model\shared\SharedProsperityRewardRecord;
 use app\common\model\store\service\StoreService;
 use app\common\model\system\merchant\Merchant;
 use app\common\model\user\User;
+use app\common\model\user\UserPvLog;
 use app\common\repositories\store\MerchantTakeRepository;
 
 class StoreOrder extends BaseModel
@@ -71,4 +75,17 @@ class StoreOrder extends BaseModel
     {
         return getModelTime($query, $value);
     }
+
+    public function userPvLog()
+    {
+        return $this->hasOne(UserPvLog::class, 'order_id', 'order_id')->where('order_type', '=', CommonEnum::ORDER_TYPE['Platform']['code']);
+    }
+
+    public function sharedProsperityRewardRecord()
+    {
+        return $this->hasOne(SharedProsperityRewardRecord::class, 'order_sn', 'order_sn')
+            ->where('type_shop', '=', SharedProsperityRewardRecordEnum::TYPE_SHOP['Platform']['code'])
+            ->where('type', '=', SharedProsperityRewardRecordEnum::TYPE['PV']['code'])
+            ->where('pm', '=', SharedProsperityRewardRecordEnum::PM['INCOME']['code']);
+    }
 }

app/common/repositories/finance/FinanceRepository.php

@@ -398,6 +398,13 @@ class FinanceRepository extends BaseRepository
             $data['three'][] = ['className' => 'el-icon-s-goods', 'count' => (int)($sharedUserDataQuery[5] ?? 0), 'name' => '总裁合伙人', 'partner_level' => 5];
             $data['three'][] = ['className' => 'el-icon-s-goods', 'count' => (int)($sharedUserDataQuery[6] ?? 0), 'name' => '联席主席团', 'partner_level' => 6];
 
+            // 共富百人团、千人团、万人团数据
+            $sharedGroupUserDataQuery = Db::query("SELECT group_id,count(user_id) count FROM `rrx_shared_prosperity_group_user` group by group_id");
+            $sharedGroupUserDataQuery = array_column($sharedGroupUserDataQuery, 'count', 'group_id');
+            $data['four'][] = ['className' => 'el-icon-s-goods', 'count' => (int)($sharedGroupUserDataQuery[1] ?? 0), 'name' => '万人团', 'group_id' => 1];
+            $data['four'][] = ['className' => 'el-icon-s-goods', 'count' => (int)($sharedGroupUserDataQuery[2] ?? 0), 'name' => '千人团', 'group_id' => 2];
+            $data['four'][] = ['className' => 'el-icon-s-goods', 'count' => (int)($sharedGroupUserDataQuery[3] ?? 0), 'name' => '百人团', 'group_id' => 3];
+
             $res['left'] = $data;
         }
         return $res;

app/common/repositories/shared/SharedProsperityUserRepository.php

@@ -9,6 +9,7 @@ use app\common\enum\CommonEnum;
 use app\common\enum\shared\SharedProsperityRewardRecordEnum;
 use app\common\enum\shared\SharedProsperityUserEnum;
 use app\common\repositories\BaseRepository;
+use app\common\repositories\store\order\StoreCartRepository;
 use app\common\repositories\store\order\StoreOrderRepository;
 use app\entity\data\shared\SharedProsperityGroupUserEntity;
 use app\entity\data\shared\SharedProsperityRecommendConfigEntity;
@@ -366,14 +367,33 @@ class SharedProsperityUserRepository extends BaseRepository
             // }
 
 
-            // 暂时新增加逻辑 用户购买 298 商品后，自动升级为1星合伙人，目前只有消费者 能够获得PV值，在奖励结算时，判断订单金额 是否大于 298 并且 用户身份为 用户，则升级为一星合伙人
-            // 逻辑修改，如果用户的身份 是普通用户，则统计他在共富区内 所有消费的金额，是否超 每天自增的 升级限制金额，如果超过则升级为1星合伙人
             if ($sharedProsperityUserEntity->getPartnerLevel() == 0) {
+                // 记录用户当前的 用户等级
+                $partnerLevel = $sharedProsperityUserEntity->getPartnerLevel();
+
+                // 新增需求 凡是 共富区，购买过商品ID 58635 的 ‘普通用户’ 升级为 ‘1星合伙人’
+                /** @var StoreCartRepository $storeCartRepository */
+                $storeCartRepository = app()->make(StoreCartRepository::class);
+                $storeCartEntityList = $storeCartRepository->getCartEntityListByUidAndProductIdListAndIsPay($sharedProsperityUserEntity->getUserId(), [58635]);
+                if (!empty($storeCartEntityList)) {
+                    $cartIdList = array_column($storeCartEntityList, 'cartId');
+                    if (!empty($cartIdList)) {
+                        /** @var StoreOrderRepository $storeOrderRepository */
+                        $storeOrderRepository = app()->make(StoreOrderRepository::class);
+                        $storeOrderEntityList = $storeOrderRepository->getStoreOrderEntityListByCartIdListAndIsPay($cartIdList);
+                        if (!empty($storeOrderEntityList)) {
+                            // 修改用户的等级
+                            $sharedProsperityUserEntity->setPartnerLevel(1);
+                        }
+                    }
+                }
+
+                // 暂时新增加逻辑 用户购买 298 商品后，自动升级为1星合伙人，目前只有消费者 能够获得PV值，在奖励结算时，判断订单金额 是否大于 298 并且 用户身份为 用户，则升级为一星合伙人
+                // 逻辑修改，如果用户的身份 是普通用户，则统计他在共富区内 所有消费的金额，是否超 每天自增的 升级限制金额，如果超过则升级为1星合伙人
                 /** @var StoreOrderRepository $storeOrderRepository */
                 $storeOrderRepository = app()->make(StoreOrderRepository::class);
                 $sumTotalPrice = $storeOrderRepository->getSumTotalPriceByUidAndMerId($sharedProsperityUserEntity->getUserId(), CommonEnum::DESIGN_MERCHANT_ID['SharedProsperity']['code']);
                 if (!empty($sumTotalPrice)) {
-                    $partnerLevel = $sharedProsperityUserEntity->getPartnerLevel();
                     /** @var SharedProsperityRecommendConfigRepository $sharedProsperityRecommendConfigRepository */
                     $sharedProsperityRecommendConfigRepository = app()->make(SharedProsperityRecommendConfigRepository::class);
                     $sharedProsperityRecommendConfigEntityList = $sharedProsperityRecommendConfigRepository->getList();
@@ -389,14 +409,15 @@ class SharedProsperityUserRepository extends BaseRepository
                             $sharedProsperityUserEntity->setPartnerLevel($sharedProsperityRecommendConfigEntity->getLevel());
                         }
                     }
-                    // 也就是说 升级了 保存到数据库
-                    if ($partnerLevel != $sharedProsperityUserEntity->getPartnerLevel()) {
-                        $this->updateByEntity(
-                            SharedProsperityUserEntity::newInstance()
-                                ->setId($sharedProsperityUserEntity->getId())
-                                ->setPartnerLevel($sharedProsperityUserEntity->getPartnerLevel())
-                        );
-                    }
+                }
+
+                // 也就是说 升级了 保存到数据库
+                if ($partnerLevel != $sharedProsperityUserEntity->getPartnerLevel()) {
+                    $this->updateByEntity(
+                        SharedProsperityUserEntity::newInstance()
+                            ->setId($sharedProsperityUserEntity->getId())
+                            ->setPartnerLevel($sharedProsperityUserEntity->getPartnerLevel())
+                    );
                 }
             }
 

app/common/repositories/store/ExcelRepository.php

@@ -56,6 +56,24 @@ class ExcelRepository extends BaseRepository
     }
 
     /**
+     * @param array $where
+     * @param int $admin_id
+     * @param string $type
+     * @param int $merId
+     * @return \app\common\dao\BaseDao|\think\Model
+     * @author 史晨
+     * @date 2026/3/10 14:48
+     */
+    public function createNoJob(array $where ,int $admin_id, string $type,int $merId)
+    {
+        return $this->dao->create([
+            'mer_id'    => $merId,
+            'admin_id'  => $admin_id,
+            'type'      => $type
+        ]);
+    }
+
+    /**
      * TODO
      * @param array $where
      * @param int $page

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

@@ -156,4 +156,14 @@ class StoreCartRepository extends BaseRepository
     {
         return $this->dao->updateIsPayByCartIdList($cartIdList, $isPay);
     }
+
+    /**
+     * @param int $uid
+     * @param array $productIdList
+     * @return CartEntity[]
+     */
+    public function getCartEntityListByUidAndProductIdListAndIsPay(int $uid, array $productIdList): array
+    {
+        return $this->dao->getCartEntityListByUidAndProductIdListAndIsPay($uid, $productIdList);
+    }
 }

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

@@ -5180,7 +5180,7 @@ class StoreOrderRepository extends BaseRepository
                     return $query->field('service_id,nickname');
                 }, 'user' => function ($query) {
                     return $query->field('uid,phone,nickname');
-                }
+                }, 'userPvLog', 'sharedProsperityRewardRecord'
             ]);
         $query1 = clone ($query);
         $query2 = clone ($query);
@@ -5214,6 +5214,13 @@ class StoreOrderRepository extends BaseRepository
             } else {
                 $list[$key]['fzone_paytype'] = null;
             }
+            $list[$key]['pv'] = 0.00;
+            if ($item['userPvLog']) {
+                $list[$key]['pv'] = $item['userPvLog']['pv'];
+            }
+            if ($item['sharedProsperityRewardRecord']) {
+                $list[$key]['pv'] = $item['sharedProsperityRewardRecord']['number'];
+            }
         }
 
         $list1[] = ['count' => $fzone_pay_price, 'name' => '现金'];
@@ -10863,6 +10870,16 @@ class StoreOrderRepository extends BaseRepository
         return $this->dao->getStoreOrderEntityListByGroupOrderIdList($groupOrderIdList);
     }
 
+    /**
+     * 根据 购物车ID 获取 已下单的 并且 支付的 订单
+     * @param array $cartIdList
+     * @return StoreOrderEntity[]
+     */
+    public function getStoreOrderEntityListByCartIdListAndIsPay(array $cartIdList): array
+    {
+        return $this->dao->getStoreOrderEntityListByCartIdListAndIsPay($cartIdList);
+    }
+
     public function create($data)
     {
         return $this->dao->create($data);
@@ -12587,13 +12604,12 @@ class StoreOrderRepository extends BaseRepository
 
     /**
      * 共富区订单分账
-     *
-     * @param $merId
-     * @param $timeLimit
+     * @param $orderSn
+     * @param $payType
      * @return void
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
      */
     private function sharedProsperityOrderIndependentAccount($orderSn, $payType)
     {

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

@@ -337,10 +337,14 @@ class Order extends BaseController
         if($data['count']<1){
             return app('json')->fail('没有数据');
         }
-        $list=$this->orderList2($data['list']->toArray());
-//        var_dump($list);die;
+        $list = $this->orderList2($data['list']->toArray());
+
+        // app()->make(ExcelRepository::class)->create($list, $this->request->adminId(), 'order', $this->request->merId());
+        $adminId = $this->request->adminId();
+        $excelLog = app()->make(ExcelRepository::class)->createNoJob($list, $adminId, 'order', $where['mer_id']);
+
+        app()->make(ExcelService::class)->order($list,$excelLog->excel_id);
 
-        app()->make(ExcelRepository::class)->create($list, $this->request->adminId(), 'order', $this->request->merId());
         return app('json')->success('开始导出数据');
     }
     public function orderList2(array $data){