Merge branch 'master' into dev

app/common/repositories/shared/SharedProsperityRewardRecordRepository.php

@@ -4,11 +4,9 @@ namespace app\common\repositories\shared;
 
 use app\common\dao\shared\SharedProsperityRewardRecordDao;
 use app\common\dao\shared\SharedProsperityUserDao;
-use app\common\enum\CommonEnum;
 use app\common\enum\shared\SharedProsperityRewardRecordEnum;
 use app\common\repositories\BaseRepository;
 use app\common\repositories\store\order\StoreOrderRepository;
-use app\entity\data\shared\SharedProsperityRecommendConfigEntity;
 use app\entity\data\shared\SharedProsperityRewardRecordEntity;
 use app\entity\data\shared\SharedProsperityUserEntity;
 use think\db\exception\DbException;
@@ -261,30 +259,6 @@ class SharedProsperityRewardRecordRepository extends BaseRepository
                         $updateSharedProsperityUserEntity->setPv(bcadd($updateSharedProsperityUserEntity->getPv(), $sharedProsperityRewardRecordEntity->getNumber(), 2));
                     }
                     $updateSharedProsperityRewardRecord->setBalance($updateSharedProsperityUserEntity->getPv());
-
-                    // 暂时新增加逻辑 用户购买 298 商品后，自动升级为1星合伙人，目前只有消费者 能够获得PV值，在奖励结算时，判断订单金额 是否大于 298 并且 用户身份为 用户，则升级为一星合伙人
-                    // 逻辑修改，如果用户的身份 是普通用户，则统计他在共富区内 所有消费的金额，是否超 每天自增的 升级限制金额，如果超过则升级为1星合伙人
-                    if ($updateSharedProsperityUserEntity->getPartnerLevel() == 0 && $sharedProsperityRewardRecordEntity->getTypeShop() == SharedProsperityRewardRecordEnum::TYPE_SHOP['Platform']['code']) {
-                        /** @var StoreOrderRepository $storeOrderRepository */
-                        $storeOrderRepository = app()->make(StoreOrderRepository::class);
-                        $sumTotalPrice = $storeOrderRepository->getSumTotalPriceByUidAndMerId($updateSharedProsperityUserEntity->getUserId(), CommonEnum::DESIGN_MERCHANT_ID['SharedProsperity']['code']);
-                        if (!empty($sumTotalPrice)) {
-                            /** @var SharedProsperityRecommendConfigRepository $sharedProsperityRecommendConfigRepository */
-                            $sharedProsperityRecommendConfigRepository = app()->make(SharedProsperityRecommendConfigRepository::class);
-                            $sharedProsperityRecommendConfigEntityList = $sharedProsperityRecommendConfigRepository->getList();
-                            usort($sharedProsperityRecommendConfigEntityList, function (SharedProsperityRecommendConfigEntity $a, SharedProsperityRecommendConfigEntity $b) {
-                                return $a->getLevel() <=> $b->getLevel();  // 从小到大排序
-                            });
-                            foreach ($sharedProsperityRecommendConfigEntityList as $sharedProsperityRecommendConfigEntity) {
-                                if (is_null($sharedProsperityRecommendConfigEntity->getConsume())) {
-                                    continue;
-                                }
-                                if ($sumTotalPrice >= $sharedProsperityRecommendConfigEntity->getConsume()) {
-                                    $updateSharedProsperityUserEntity->setPartnerLevel($sharedProsperityRecommendConfigEntity->getLevel());
-                                }
-                            }
-                        }
-                    }
                 }
 
                 $updateSharedProsperityUserEntityList[$sharedProsperityUserEntity->getUserId()] = $updateSharedProsperityUserEntity;

app/common/repositories/shared/SharedProsperityUserRepository.php

@@ -5,8 +5,10 @@ namespace app\common\repositories\shared;
 use app\common\dao\shared\SharedProsperityUserDao;
 use app\common\dao\user\UserDao;
 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\StoreOrderRepository;
 use app\entity\data\shared\SharedProsperityRecommendConfigEntity;
 use app\entity\data\shared\SharedProsperityUserEntity;
 use think\db\exception\DbException;
@@ -419,6 +421,30 @@ class SharedProsperityUserRepository extends BaseRepository
         // 计算新等级
         $newLevel = $this->calculateLevelByTeamPv($teamPvBySmallSum, $sharedProsperityRecommendConfigEntityList);
 
+        // 暂时新增加逻辑 用户购买 298 商品后，自动升级为1星合伙人，目前只有消费者 能够获得PV值，在奖励结算时，判断订单金额 是否大于 298 并且 用户身份为 用户，则升级为一星合伙人
+        // 逻辑修改，如果用户的身份 是普通用户，则统计他在共富区内 所有消费的金额，是否超 每天自增的 升级限制金额，如果超过则升级为1星合伙人
+        if ($sharedProsperityUserEntity->getPartnerLevel() == 0) {
+            /** @var StoreOrderRepository $storeOrderRepository */
+            $storeOrderRepository = app()->make(StoreOrderRepository::class);
+            $sumTotalPrice = $storeOrderRepository->getSumTotalPriceByUidAndMerId($sharedProsperityUserEntity->getUserId(), CommonEnum::DESIGN_MERCHANT_ID['SharedProsperity']['code']);
+            if (!empty($sumTotalPrice)) {
+                /** @var SharedProsperityRecommendConfigRepository $sharedProsperityRecommendConfigRepository */
+                $sharedProsperityRecommendConfigRepository = app()->make(SharedProsperityRecommendConfigRepository::class);
+                $sharedProsperityRecommendConfigEntityList = $sharedProsperityRecommendConfigRepository->getList();
+                usort($sharedProsperityRecommendConfigEntityList, function (SharedProsperityRecommendConfigEntity $a, SharedProsperityRecommendConfigEntity $b) {
+                    return $a->getLevel() <=> $b->getLevel();  // 从小到大排序
+                });
+                foreach ($sharedProsperityRecommendConfigEntityList as $sharedProsperityRecommendConfigEntity) {
+                    if (is_null($sharedProsperityRecommendConfigEntity->getConsume())) {
+                        continue;
+                    }
+                    if ($sumTotalPrice >= $sharedProsperityRecommendConfigEntity->getConsume() && $newLevel < $sharedProsperityRecommendConfigEntity->getLevel()) {
+                        $newLevel = $sharedProsperityRecommendConfigEntity->getLevel();
+                    }
+                }
+            }
+        }
+
         // 如果新等级大于当前等级，则更新
         if ($newLevel > $sharedProsperityUserEntity->getPartnerLevel()) {
             $this->updateByEntity(

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

@@ -5279,6 +5279,8 @@ class StoreOrderRepository extends BaseRepository
                     return $query->field('mer_id,mer_name');
                 }, 'verifyService' => function ($query) {
                     return $query->field('service_id,nickname');
+                }, 'user' => function ($query) {
+                    return $query->field('uid,phone,nickname');
                 }
             ]);
         $count = $query->where('test_order', 0)->count();