Merge remote-tracking branch 'origin/dev' into dev

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/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/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

@@ -10863,6 +10863,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);