Merge branch 'dev' into dev-sc-260204

app/command/PensionTasks.php

@@ -3,16 +3,19 @@ declare (strict_types=1);
 
 namespace app\command;
 
+use app\common\enum\CommonEnum;
 use app\common\model\merchant\order\OrderMerchant;
 use app\common\model\store\order\StoreOrder;
 use app\common\model\user\User;
 use app\common\model\user\UserCertification;
 use app\common\repositories\merchant\order\OrderGzcRepository;
 use app\common\repositories\merchant\order\OrderMerchantRepository;
+use app\common\repositories\shared\SharedProsperityUserRepository;
 use app\common\repositories\store\order\StoreOrderStatusRepository;
 use app\common\repositories\store\product\ProductRepository;
 use app\common\repositories\user\UserBillRepository;
 use app\common\repositories\user\UserRepository;
+use app\entity\data\shared\SharedProsperityUserEntity;
 use app\traits\GzcApiRequest;
 use Carbon\Carbon;
 use think\console\Command;
@@ -1570,15 +1573,34 @@ class PensionTasks extends Command
     {
         // 普通订单
         $order_data = Db::name('store_order')->where('paid', 1)->where('is_settlement', 0)->where('pay_type', 'in', '0,1,2,4')->where([['status','in','2,3']])->select();
-        $StoreOrderStatusRepository = app()->make(StoreOrderStatusRepository::class);
         if($order_data) {
             $order_data = $order_data->toArray();
+            // foreach ($order_data as $online) {
+            //     $date = date('Y-m-d H:i:s', strtotime('-' . $timeLimit . ' days'));
+            //     if($date < $online['create_time']) continue;
+            //     Db::transaction(function () use ($online) {
+            //         $this->settleAward($online,0);
+            //         Db::name('store_order')->where('order_id', $online['order_id'])->update(['is_settlement' => 1 ,'settlement_time' => date('Y-m-d H:i:s')]);
+            //     });
+            // }
+            $orderIdList = [];
+            $date = date('Y-m-d H:i:s', strtotime('-' . $timeLimit . ' days'));
             foreach ($order_data as $online) {
-                $date = date('Y-m-d H:i:s', strtotime('-' . $timeLimit . ' days'));
-                if($date < $online['create_time']) continue;
-                Db::transaction(function () use ($online) {
-                    $this->settleAward($online,0);
-                    Db::name('store_order')->where('order_id', $online['order_id'])->update(['is_settlement' => 1 ,'settlement_time' => date('Y-m-d H:i:s')]);
+                if (strtotime($online['create_time']) < strtotime($date)) {
+                    $orderIdList[] = $online['order_id'];
+                } else if ($order_data['mer_id'] == CommonEnum::DESIGN_MERCHANT_ID['SharedProsperity']['code']) {
+                    if (strtotime($online['create_time']) < strtotime(date('Y-m-d 00:00:00'))) {
+                        $orderIdList[] = $online['order_id'];
+                    }
+                }
+            }
+            if (!empty($orderIdList)) {
+                Db::transaction(function () use ($orderIdList) {
+                    // 系统订单 走新的 结算方法
+                    /** @var StoreOrderRepository $storeOrderRepository */
+                    $storeOrderRepository = app()->make(StoreOrderRepository::class);
+                    $storeOrderRepository->settlementOrderByOrderIdList($orderIdList);
+
                 });
             }
         }

app/common/dao/shared/SharedProsperityRecommendConfigDao.php

@@ -15,7 +15,7 @@ class SharedProsperityRecommendConfigDao extends BaseDao
     }
 
     /**
-     * @return array
+     * @return SharedProsperityRecommendConfigEntity[]
      * @author 史晨
      * @date 2026/2/5 14:43
      * 获取推荐配置
@@ -81,4 +81,28 @@ class SharedProsperityRecommendConfigDao extends BaseDao
         }
         return $entityList;
     }
+
+    /**
+     * 获取 配置实体 根据 最大的 直推奖比例
+     * @return SharedProsperityRecommendConfigEntity
+     */
+    public function getSharedProsperityRecommendConfigEntityByMaxRewardRatio(): SharedProsperityRecommendConfigEntity
+    {
+        $entity = SharedProsperityRecommendConfigEntity::newInstance();
+        try {
+            /** @var SharedProsperityRecommendConfig $model */
+            $model = $this->getModel();
+            $dataRes = $model::getDB()
+                ->order('reward_ratio', 'desc')
+                ->limit(1)
+                ->select()
+                ->toArray();
+            if (!empty($dataRes)) {
+                $entity = SharedProsperityRecommendConfigEntity::newInstance($dataRes[0]);
+            }
+        } catch (\Exception $e) {
+
+        }
+        return $entity;
+    }
 }

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

@@ -18,6 +18,7 @@ use app\entity\CommonEntity;
 use app\entity\data\store\StoreGroupOrderEntity;
 use think\db\exception\DbException;
 use think\exception\ValidateException;
+use think\facade\Log;
 
 /**
  * Class StoreGroupOrderDao
@@ -165,6 +166,14 @@ class StoreGroupOrderDao extends BaseDao
                 ->where('group_order_id', '=', $storeGroupOrderEntity->getGroupOrderId())
                 ->update($storeGroupOrderEntity->toUnderlineArray());
         } catch (\Exception $e) {
+            Log::error('更新订单组支付成功状态失败' . json_encode([
+                    'error_message' => $e->getMessage(),
+                    'error_file' => $e->getFile(),
+                    'error_line' => $e->getLine(),
+                    'error_code' => $e->getCode(),
+                    'exception_class' => get_class($e),
+                    'trace' => $e->getTraceAsString()
+                ]));
             throw new ValidateException('更新订单组支付成功状态失败');
         }
         return $storeGroupOrderEntity;

app/common/enum/CommonEnum.php

@@ -262,9 +262,6 @@ class CommonEnum
                 'YangLaoJin' => [
                     'Ratio' => ['code' => 0.05, 'name' => '将订单消费金额的5%，当做养老金分配给下单人']
                 ],
-                'Pv' => [
-                    'Ratio' => ['code' => 1, 'name' => '将利润的100%，作为PV值分配给下单人']
-                ],
                 'ConsumerStocks' => [
                     'Ratio' => ['code' => 0.5, 'name' => '在共富区消费者获得购买商品赠送商品额50%的消费股']
                 ],

app/common/repositories/shared/SharedProsperityRecommendConfigRepository.php

@@ -38,7 +38,7 @@ class SharedProsperityRecommendConfigRepository extends BaseRepository
     }
 
     /**
-     * @return array
+     * @return SharedProsperityRecommendConfigEntity[]
      * @author 史晨
      * @date 2026/2/5 14:12
      */
@@ -98,4 +98,14 @@ class SharedProsperityRecommendConfigRepository extends BaseRepository
     {
         return $this->dao->getSharedProsperityRecommendConfigEntityListByLevelList($levelList);
     }
+
+
+    /**
+     * 获取 最大 推荐奖励占比
+     * @return SharedProsperityRecommendConfigEntity
+     */
+    public function getSharedProsperityRecommendConfigEntityByMaxRewardRatio(): SharedProsperityRecommendConfigEntity
+    {
+        return $this->getSharedProsperityRecommendConfigEntityByMaxRewardRatio();
+    }
 }

app/common/repositories/shared/SharedProsperityUserRepository.php

@@ -5,6 +5,7 @@ namespace app\common\repositories\shared;
 use app\common\dao\shared\SharedProsperityUserDao;
 use app\common\dao\user\UserDao;
 use app\common\repositories\BaseRepository;
+use app\entity\data\shared\SharedProsperityRecommendConfigEntity;
 use app\entity\data\shared\SharedProsperityUserEntity;
 use think\db\exception\DbException;
 
@@ -254,4 +255,39 @@ class SharedProsperityUserRepository extends BaseRepository
     {
         return $this->dao->saveAll($dataList);
     }
+
+    /**
+     * 用户身份升级
+     * @param array $userIdList
+     * @return void
+     */
+    public function identityUpgrade(array $userIdList)
+    {
+        $sharedProsperityUserEntityList = $this->getSharedProsperityUserEntityListByUserIdList($userIdList);
+
+        /** @var SharedProsperityRecommendConfigRepository $sharedProsperityRecommendConfigRepository */
+        $sharedProsperityRecommendConfigRepository = app()->make(SharedProsperityRecommendConfigRepository::class);
+        $sharedProsperityRecommendConfigEntityList = $sharedProsperityRecommendConfigRepository->getList();
+        usort($sharedProsperityRecommendConfigEntityList, function (SharedProsperityRecommendConfigEntity $a, SharedProsperityRecommendConfigEntity $b) {
+            return $a->getPv() <=> $b->getPv();  // 从小到大排序
+        });
+        foreach ($sharedProsperityUserEntityList as $sharedProsperityUserEntity) {
+            $partnerLevel = 0;
+            foreach ($sharedProsperityRecommendConfigEntityList as $sharedProsperityRecommendConfigEntity) {
+                if ($sharedProsperityUserEntity->getPv() >= $sharedProsperityRecommendConfigEntity->getPv()) {
+                    $partnerLevel = $sharedProsperityRecommendConfigEntity->getLevel();
+                } else {
+                    // 如果本次验证的等级结果大于 之前的等级，说明用户升级了 需要更新等级
+                    if ($partnerLevel > $sharedProsperityUserEntity->getPartnerLevel()) {
+                        $this->updateByEntity(
+                            SharedProsperityUserEntity::newInstance()
+                                ->setId($sharedProsperityUserEntity->getId())
+                                ->setPartnerLevel($partnerLevel)
+                        );
+                    }
+                    break;
+                }
+            }
+        }
+    }
 }

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

@@ -178,7 +178,7 @@ class StoreGroupOrderRepository extends BaseRepository
         }
 
         // 3、逻辑处理
-        (new \think\facade\Db)->startTrans();
+        Db::startTrans();
         try {
             // 软 删除订单组
             $storeGroupOrderEntity->setIsDel(StoreGroupOrderEnum::IS_DEL['Yes']['code']);
@@ -189,9 +189,9 @@ class StoreGroupOrderRepository extends BaseRepository
                 $storeOrderRepository->closeStoreOrder($storeOrderEntity, $uid, $changeMessage, $remark);
             }
 
-            (new \think\facade\Db)->commit();
+            Db::commit();
         } catch (DbException $e) {
-            (new \think\facade\Db)->rollback();
+            Db::rollback();
         }
 
         // $groupOrder = $this->search(['paid' => 0, 'uid' => $uid ?: ''])->where('group_order_id', $id)->with(['orderList'])->find();
@@ -798,7 +798,7 @@ class StoreGroupOrderRepository extends BaseRepository
             ->setFzonePaytype($storeOrderCreateRequestEntity->getFzonePayType());
 
         // 4、写入数据
-        (new \think\facade\Db)->startTrans();
+        Db::startTrans();
         try {
             // 4.1 更细库存
             foreach ($productStockList as $item) {
@@ -878,9 +878,9 @@ class StoreGroupOrderRepository extends BaseRepository
                 $storeGroupOrderRepository->storeGroupOrderPaySuccess($storeGroupOrderEntity->getGroupOrderId());
             }
 
-            (new \think\facade\Db)->commit();
+            Db::commit();
         } catch (DbException $e) {
-            (new \think\facade\Db)->rollback();
+            Db::rollback();
             Log::error('StoreGroupOrderRepository-createStoreGroupOrder：' . $e->getMessage());
         }
         return ['order_id' => $storeGroupOrderEntity->getGroupOrderId(), 'groupOrder' => $storeGroupOrderEntity->toArray()];
@@ -948,11 +948,6 @@ class StoreGroupOrderRepository extends BaseRepository
         if (!empty($settlementOrderIdList)) {
             // 将订单 生成的奖励数据 立即结算（发放） 并更新这些订单的 结算字段以及结算时间
             $storeOrderRepository->settlementOrderByOrderIdList($settlementOrderIdList);
-
-            // 结算完成后更新用户的身份信息 设置用户 身份
-            /** @var UserRepository $userRepository */
-            $userRepository = app()->make(UserRepository::class);
-            $userRepository->setUserIdentity($storeGroupOrderEntity->getUid());
         }
 
         // 9、订单 分账 将收入的现金 商户部分 发放给 商户

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

@@ -2867,12 +2867,13 @@ class StoreOrderRepository extends BaseRepository
                 Db::name("log")->insert(array('data' => '小程序支付回调5：' . json_encode($user)));//日志记录
                 Db::name("log")->insert(['data' => json_encode($order->mer_id)]);//日志记录
                 $merchant_type = Db::name('merchant')->where('mer_id', $order->mer_id)->value('merchant_type');
-                if ($merchant_type == 2) {
-                    $this->computed_yishangtong($order->order_sn);
-                } else {
-                    $this->computed($order, $user);
-
-                }
+                // 这里暂时注释 -- 确认收货时不应修改 用户账单表 的 数据生效状态，应该是订单结算时，将奖励状态设置为 生效，目前这里将订单的 养老金、直推奖、锁客、分享佣金等设置为生效后，订单自动结算时，将导致未查询到待生效 奖励数据
+                // if ($merchant_type == 2) {
+                //     $this->computed_yishangtong($order->order_sn);
+                // } else {
+                //     $this->computed($order, $user);
+                //
+                // }
                 //分账
 //            $this -> splitOrder($order);
                 //TODO 确认收货
@@ -11615,7 +11616,13 @@ class StoreOrderRepository extends BaseRepository
             );
 
             // 发放共富区PV
-            $pv = bcmul($storeOrderEntity->getConPri(), CommonEnum::ORDER_EARNING_ALLOCATION['SharedProsperity']['Self']['Pv']['Ratio']['code'], CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
+            /** @var SharedProsperityRecommendConfigRepository $sharedProsperityRecommendConfigRepository */
+            $sharedProsperityRecommendConfigRepository = app()->make(SharedProsperityRecommendConfigRepository::class);
+            $sharedProsperityRecommendConfigEntityByMaxRewardRatio = $sharedProsperityRecommendConfigRepository->getSharedProsperityRecommendConfigEntityByMaxRewardRatio();
+            // 利润 减去 顶格的直推奖，剩下的是PV值
+            $pvProportion = bcsub('1', bcdiv($sharedProsperityRecommendConfigEntityByMaxRewardRatio->getRewardRatio(), '100', 4), 2);
+
+            $pv = bcmul($storeOrderEntity->getConPri(), $pvProportion, CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
             /** @var SharedProsperityRewardRecordRepository $sharedProsperityRewardRecordRepository */
             $sharedProsperityRewardRecordRepository = app()->make(SharedProsperityRewardRecordRepository::class);
             $sharedProsperityRewardRecordRepository->addSharedProsperityRewardRecord(
@@ -11676,7 +11683,7 @@ class StoreOrderRepository extends BaseRepository
                         $userBillRepository = app()->make(UserBillRepository::class);
                         $userBillRepository->addUserBill(
                             $sharedProsperityUserEntityByParent->getUserId(),
-                            UserBillEnum::COMMISSION_TYPE['DIRECT_REFERRAL']['code'],
+                            UserBillEnum::COMMISSION_TYPE['SHARED_PROSPERITY_DIRECT_COMMISSION']['code'],
                             UserBillEnum::PM['INCOME']['code'],
                             $brokeragePriceBySpreadUid,
                             UserBillEnum::CATEGORY['NowMoney']['code'],
@@ -11998,10 +12005,22 @@ class StoreOrderRepository extends BaseRepository
                 $userSignGongxianRepository = app()->make(UserSignGongxianRepository::class);
                 $userSignGongxianEntityList = $userSignGongxianRepository->getUserSignGongxianEntityListByOrderIdListAndPending(UserSignGongxianEnum::ORDER_TYPE['Platform']['code'], $unsettledOrderIdList);
                 if (!empty($userSignGongxianEntityList)) {
-                    $userSignGongxianIdList = array_map(function ($userSignGongxianEntity) {
+                    $affectedUserIdListByMember = [];
+                    $userSignGongxianIdList = array_map(function ($userSignGongxianEntity) use (&$affectedUserIdListByMember) {
+                        $affectedUserIdListByMember[] = $userSignGongxianEntity->getUid();
                         return $userSignGongxianEntity->getId();
                     }, $userSignGongxianEntityList);
                     $userSignGongxianRepository->executeByIdList($userSignGongxianIdList);
+                    // 会员体系结构 依靠贡献值变化而升级，所以当贡献值产生变化时 需记录用户ID 进行升级
+                    if (!empty($affectedUserIdListByMember)) {
+                        $affectedUserIdListByMember = array_unique($affectedUserIdListByMember);
+                        // 结算完成后更新用户的身份信息 设置用户 身份
+                        /** @var UserRepository $userRepository */
+                        $userRepository = app()->make(UserRepository::class);
+                        foreach ($affectedUserIdListByMember as $userId) {
+                            $userRepository->setUserIdentity($userId);
+                        }
+                    }
                 }
 
                 /** 结算 PV */
@@ -12031,10 +12050,21 @@ class StoreOrderRepository extends BaseRepository
                 $sharedProsperityRewardRecordRepository = app()->make(SharedProsperityRewardRecordRepository::class);
                 $sharedProsperityRewardRecordEntityList = $sharedProsperityRewardRecordRepository->getSharedProsperityRewardRecordEntityListByOrderSnListAndPending(SharedProsperityRewardRecordEnum::TYPE_SHOP['Platform']['code'], $unsettledOrderSnList);
                 if (!empty($sharedProsperityRewardRecordEntityList)) {
-                    $sharedProsperityRewardRecordIdList = array_map(function ($sharedProsperityRewardRecordEntity) {
+                    $affectedUserIdListBySharedProsperity = [];
+                    $sharedProsperityRewardRecordIdList = array_map(function ($sharedProsperityRewardRecordEntity) use (&$affectedUserIdListBySharedProsperity) {
+                        if ($sharedProsperityRewardRecordEntity->getType() == SharedProsperityRewardRecordEnum::TYPE['PV']['code']) {
+                            $affectedUserIdListBySharedProsperity[] = $sharedProsperityRewardRecordEntity->getUserId();
+                        }
                         return $sharedProsperityRewardRecordEntity->getId();
                     }, $sharedProsperityRewardRecordEntityList);
                     $sharedProsperityRewardRecordRepository->executeByIdList($sharedProsperityRewardRecordIdList);
+                    // 当用户PV产生变化时，需要更新产生变化用户的 共富体系等级
+                    if (!empty($affectedUserIdListBySharedProsperity)) {
+                        $affectedUserIdListBySharedProsperity = array_unique($affectedUserIdListBySharedProsperity);
+                        /** @var SharedProsperityUserRepository $sharedProsperityUserRepository */
+                        $sharedProsperityUserRepository = app()->make(SharedProsperityUserRepository::class);
+                        $sharedProsperityUserRepository->identityUpgrade($affectedUserIdListBySharedProsperity);
+                    }
                 }
 
                 // 订单奖励结算时 更新订单自身 结算字段

app/controller/api/store/order/StoreOrder.php

@@ -109,13 +109,13 @@ class StoreOrder extends BaseController
     public function createOrder(StoreCartRepository $cartRepository)
     {
         $uid = $this->request->uid();
-        if (in_array($uid, [1592, 766, 6, 783, 7, 1166])) {
-            $request = new Request();
-            $storeOrderCreateValidate = new StoreOrderCreateValidate($request);
-            /** @var StoreGroupOrder $storeGroupOrderController */
-            $storeGroupOrderController = app()->make(StoreGroupOrder::class);
-            return $storeGroupOrderController->createStoreGroupOrder($storeOrderCreateValidate);
-        }
+        // if (in_array($uid, [1592, 766, 6, 783, 7, 1166])) {
+        //     $request = new Request();
+        //     $storeOrderCreateValidate = new StoreOrderCreateValidate($request);
+        //     /** @var StoreGroupOrder $storeGroupOrderController */
+        //     $storeGroupOrderController = app()->make(StoreGroupOrder::class);
+        //     return $storeGroupOrderController->createStoreGroupOrder($storeOrderCreateValidate);
+        // }
 
         $cartId = (array)$this->request->param('cart_id', []);
 

app/entity/data/shared/SharedProsperityUserEntity.php

@@ -11,6 +11,7 @@ class SharedProsperityUserEntity extends DataEntity
     public $parentId = null;  // 推荐人用户id
     public $pv = null;  // pv
     public $consumerStocks = null; // 消费股
+    public $balance = null; // 余额
     public $withdrawalLimit = null;  // 提现额度
     public $partnerLevel = null;  // 合伙人等级
     public $points = null;
@@ -110,6 +111,24 @@ class SharedProsperityUserEntity extends DataEntity
     /**
      * @return mixed
      */
+    public function getBalance()
+    {
+        return $this->balance;
+    }
+
+    /**
+     * @param mixed $balance
+     * @return SharedProsperityUserEntity
+     */
+    public function setBalance($balance): SharedProsperityUserEntity
+    {
+        $this->balance = $balance;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
     public function getWithdrawalLimit()
     {
         return $this->withdrawalLimit;

app/entity/data/store/StoreGroupOrderEntity.php

@@ -28,7 +28,7 @@ class StoreGroupOrderEntity extends DataEntity
     public $isDel = null;  // 是否删除
     public $rand = null;  // 订单号随机数
     public $split = null;  // 分账状态
-    public $serialNumber = null;  // 首信易交易流水号
+    // public $serialNumber = null;  // 首信易交易流水号
     public $testOrder = null;  // 测试订单
     public $hfPayId = null;  // 汇付订单id
     public $payWx = null;  // 微信支付渠道后台设置
@@ -430,23 +430,23 @@ class StoreGroupOrderEntity extends DataEntity
         return $this;
     }
 
-    /**
-     * @return mixed
-     */
-    public function getSerialNumber()
-    {
-        return $this->serialNumber;
-    }
-
-    /**
-     * @param mixed $serialNumber
-     * @return StoreGroupOrderEntity
-     */
-    public function setSerialNumber($serialNumber): StoreGroupOrderEntity
-    {
-        $this->serialNumber = $serialNumber;
-        return $this;
-    }
+    // /**
+    //  * @return mixed
+    //  */
+    // public function getSerialNumber()
+    // {
+    //     return $this->serialNumber;
+    // }
+    //
+    // /**
+    //  * @param mixed $serialNumber
+    //  * @return StoreGroupOrderEntity
+    //  */
+    // public function setSerialNumber($serialNumber): StoreGroupOrderEntity
+    // {
+    //     $this->serialNumber = $serialNumber;
+    //     return $this;
+    // }
 
     /**
      * @return mixed

app/entity/data/store/StoreOrderEntity.php

@@ -1608,18 +1608,15 @@ class StoreOrderEntity extends DataEntity
      */
     public function setFzonePaytype($fzonePaytype): StoreOrderEntity
     {
-        if (!is_string($fzonePaytype)) {
-            $fzonePaytypePre = $fzonePaytype;
-            $fzonePaytype = '';
-
-            if (is_array($fzonePaytypePre)) {
-                $fzonePaytype = json_encode($fzonePaytypePre);
+        if (is_array($fzonePaytype)) {
+            $this->fzonePaytype = json_encode($fzonePaytype);
+            $this->deconstructionFzonePaytype();
+        } else if (is_string($fzonePaytype)) {
+            if (!empty(json_decode($fzonePaytype, true))) {
+                $this->fzonePaytype = $fzonePaytype;
+                $this->deconstructionFzonePaytype();
             }
-
-            unset($fzonePaytypePre);
         }
-        $this->fzonePaytype = $fzonePaytype;
-        $this->deconstructionFzonePaytype();
         return $this;
     }
 

route/api.php

@@ -129,7 +129,7 @@ Route::group('api/', function () {
         })->prefix('api.store.order.StoreOrder');
 
         //订单
-        Route::group('order', function () {
+        Route::group('store_group_order', function () {
             Route::post('create', '/createStoreGroupOrder');//创建订单
         })->prefix('api.store.order.StoreGroupOrder');