共富体系-下单及奖励发放完成-待测试

app/common/dao/shared/SharedProsperityRewardRecordDao.php

@@ -3,12 +3,19 @@
 namespace app\common\dao\shared;
 
 use app\common\dao\BaseDao;
+use app\common\enum\shared\SharedProsperityRewardRecordEnum;
+use app\common\model\BaseModel;
 use app\common\model\shared\SharedProsperityRewardRecord;
 use app\entity\data\shared\SharedProsperityRewardRecordEntity;
+use think\db\exception\DataNotFoundException;
+use think\db\exception\DbException;
+use think\db\exception\ModelNotFoundException;
 
 class SharedProsperityRewardRecordDao extends BaseDao
 {
-
+    /**
+     * @return BaseModel
+     */
     protected function getModel(): string
     {
         return SharedProsperityRewardRecord::class;
@@ -38,4 +45,47 @@ class SharedProsperityRewardRecordDao extends BaseDao
         }
         return $entityList;
     }
+
+    /**
+     * 批量更新
+     * @param $dataList
+     * @return array
+     */
+    public function saveAll($dataList): array
+    {
+        try {
+            return $this->getModel()::getInstance()->allowField(array_keys(reset($dataList)))->saveAll($dataList)->toArray();
+        } catch (\Exception $e) {
+            return [];
+        }
+    }
+
+    /**
+     * @param string $typeShop
+     * @param array $orderSnList
+     * @return SharedProsperityRewardRecordEntity[]
+     */
+    public function getSharedProsperityRewardRecordEntityListByOrderSnListAndPending(string $typeShop, array $orderSnList): array
+    {
+        $entityList = [];
+        try {
+            /** @var SharedProsperityRewardRecord $model */
+            $model = $this->getModel();
+            $dataList = $model::getDB()
+                ->where('type_shop', '=', $typeShop)
+                ->whereIn('order_sn', $orderSnList)
+                ->where('status', '=', SharedProsperityRewardRecordEnum::STATUS['PENDING']['code'])
+                ->select()
+                ->toArray();
+
+            if (!empty($dataList)) {
+                $entityList = array_map(function ($data) {
+                    return SharedProsperityRewardRecordEntity::newInstance($data);
+                }, $dataList);
+            }
+        } catch (DataNotFoundException|ModelNotFoundException|DbException $e) {
+
+        }
+        return $entityList;
+    }
 }

app/common/dao/shared/SharedProsperityUserDao.php

@@ -3,12 +3,16 @@
 namespace app\common\dao\shared;
 
 use app\common\dao\BaseDao;
+use app\common\model\BaseModel;
 use app\common\model\shared\SharedProsperityUser;
 use app\entity\data\shared\SharedProsperityUserEntity;
 
 class SharedProsperityUserDao extends BaseDao
 {
 
+    /**
+     * @return BaseModel
+     */
     protected function getModel(): string
     {
         return SharedProsperityUser::class;
@@ -220,4 +224,18 @@ class SharedProsperityUserDao extends BaseDao
             return ['data' => [], 'total' => 0, 'per_page' => $pageSize, 'current_page' => $page, 'last_page' => 1];
         }
     }
+
+    /**
+     * 批量更新
+     * @param $dataList
+     * @return array
+     */
+    public function saveAll($dataList): array
+    {
+        try {
+            return $this->getModel()::getInstance()->allowField(array_keys(reset($dataList)))->saveAll($dataList)->toArray();
+        } catch (\Exception $e) {
+            return [];
+        }
+    }
 }

app/common/enum/shared/SharedProsperityRewardRecordEnum.php

@@ -6,6 +6,12 @@ use app\common\enum\CommonEnum;
 
 class SharedProsperityRewardRecordEnum extends CommonEnum
 {
+    // 收支类型
+    const PM = [
+        'EXPEND' => ['code' => 0, 'name' => '支出'],
+        'INCOME' => ['code' => 1, 'name' => '获得'],
+    ];
+
     // 明细类型  commission佣金
     const TYPE = [
         'CONSUMER_STOCKS' => ['code' => 1001, 'name' => '共富体系消费股'],

app/common/repositories/shared/SharedProsperityRewardRecordRepository.php

@@ -101,13 +101,14 @@ class SharedProsperityRewardRecordRepository extends BaseRepository
      * 添加 共富体系奖励记录
      * @param int $uid
      * @param int $type
+     * @param int $pm
      * @param float $number
      * @param int $typeShop
      * @param string $orderSn
      * @param string $remark
      * @return SharedProsperityRewardRecordEntity
      */
-    public function addSharedProsperityRewardRecord(int $uid, int $type, float $number, int $typeShop = 0, string $orderSn = '', string $remark = ''): SharedProsperityRewardRecordEntity
+    public function addSharedProsperityRewardRecord(int $uid, int $type, int $pm, float $number, int $typeShop = 0, string $orderSn = '', string $remark = ''): SharedProsperityRewardRecordEntity
     {
         if ($typeShop == SharedProsperityRewardRecordEnum::TYPE_SHOP['Platform']['code']) {
             /** @var StoreOrderRepository $storeOrderRepository */
@@ -121,8 +122,8 @@ class SharedProsperityRewardRecordRepository extends BaseRepository
         /** @var SharedProsperityRewardRecordEntity $sharedProsperityRewardRecordEntity */
         $sharedProsperityRewardRecordEntity = SharedProsperityRewardRecordEntity::newInstance();
         $sharedProsperityRewardRecordEntity->setUserId($uid)
-            //UserBillEnum::PM['INCOME']['code']
             ->setType($type)
+            ->setPm($pm)
             ->setNumber($number)
             ->setStatus(SharedProsperityRewardRecordEnum::STATUS['PENDING']['code'])
             ->setTypeShop($typeShop)
@@ -133,6 +134,25 @@ class SharedProsperityRewardRecordRepository extends BaseRepository
     }
 
     /**
+     * @param string $typeShop
+     * @param array $orderSnList
+     * @return SharedProsperityRewardRecordEntity[]
+     */
+    public function getSharedProsperityRewardRecordEntityListByOrderSnListAndPending(string $typeShop, array $orderSnList): array
+    {
+        return $this->dao->getSharedProsperityRewardRecordEntityListByOrderSnListAndPending($typeShop, $orderSnList);
+    }
+
+    /**
+     * @param $dataList
+     * @return array
+     */
+    public function batchUpdateSharedProsperityRewardRecordDataByDataList($dataList): array
+    {
+        return $this->dao->saveAll($dataList);
+    }
+
+    /**
      * 结算 共富体系奖励记录
      * @param array $idList
      * @return array
@@ -141,7 +161,7 @@ class SharedProsperityRewardRecordRepository extends BaseRepository
     {
         $sharedProsperityRewardRecordEntityList = $this->getSharedProsperityRewardRecordEntityListByIdList($idList);
         // 忽略 已经生效的 记录
-        $sharedProsperityRewardRecordEntityList = array_filter($sharedProsperityRewardRecordEntityList, function($entity) {
+        $sharedProsperityRewardRecordEntityList = array_filter($sharedProsperityRewardRecordEntityList, function ($entity) {
             return $entity->getStatus() != SharedProsperityRewardRecordEnum::STATUS['VALID']['code'];
         });
 
@@ -179,83 +199,77 @@ class SharedProsperityRewardRecordRepository extends BaseRepository
                 // 更新 用户信息
                 /** @var SharedProsperityUserEntity $updateSharedProsperityUserEntity */
                 $updateSharedProsperityUserEntity = $updateSharedProsperityUserEntityList[$sharedProsperityUserEntity->getUserId()] ?? SharedProsperityUserEntity::newInstance();
-                $updateSharedProsperityUserEntity->setId();
+                $updateSharedProsperityUserEntity->setId($sharedProsperityUserEntity->getId());
 
                 // 更新 账单 记录
                 /** @var SharedProsperityRewardRecordEntity $updateSharedProsperityRewardRecord */
                 $updateSharedProsperityRewardRecord = $updateSharedProsperityRewardRecordEntityList[$sharedProsperityRewardRecordEntity->getId()] ?? SharedProsperityRewardRecordEntity::newInstance();
                 // 更新 账单记录 状态
                 $updateSharedProsperityRewardRecord
-                    ->setId($sharedProsperityRewardRecordEntity->getBillId())
-                    ->setStatus(UserBillEnum::STATUS['VALID']['code'])
-                    ->setTakeTime(time());
+                    ->setId($sharedProsperityRewardRecordEntity->getId())
+                    ->setStatus(SharedProsperityRewardRecordEnum::STATUS['VALID']['code'])
+                    ->setTakeTime(date('Y-m-d H:i:s'));
 
-                if ($sharedProsperityRewardRecordEntity->getCommissionType() == UserBillEnum::COMMISSION_TYPE['DIRECT_REFERRAL']['code']) {
-                    // 直推奖
-                    if (is_null($updateSharedProsperityUserEntity->getBrokeragePrice())) {
-                        $updateSharedProsperityUserEntity->setBrokeragePrice($sharedProsperityUserEntity->getBrokeragePrice());
+                if ($sharedProsperityRewardRecordEntity->getType() == SharedProsperityRewardRecordEnum::TYPE['CONSUMER_STOCKS']['code']) {
+                    // 消费股
+                    if (is_null($updateSharedProsperityUserEntity->getConsumerStocks())) {
+                        $updateSharedProsperityUserEntity->setConsumerStocks($sharedProsperityUserEntity->getConsumerStocks());
                     }
                     // 更新用户 佣金 信息
-                    if ($sharedProsperityRewardRecordEntity->getPm() == UserBillEnum::PM['EXPEND']['code']) {
-                        if ($updateSharedProsperityUserEntity->getBrokeragePrice() < $sharedProsperityRewardRecordEntity->getNumber()) {
-                            throw new ValidateException('用户佣金不足');
+                    if ($sharedProsperityRewardRecordEntity->getPm() == SharedProsperityRewardRecordEnum::PM['EXPEND']['code']) {
+                        if ($updateSharedProsperityUserEntity->getConsumerStocks() < $sharedProsperityRewardRecordEntity->getNumber()) {
+                            throw new ValidateException('用户剩余消费股不足');
                         }
-                        $updateSharedProsperityUserEntity->setBrokeragePrice(bcsub($updateSharedProsperityUserEntity->getBrokeragePrice(), $sharedProsperityRewardRecordEntity->getNumber(), 2));
+                        $updateSharedProsperityUserEntity->setConsumerStocks(bcsub($updateSharedProsperityUserEntity->getConsumerStocks(), $sharedProsperityRewardRecordEntity->getNumber(), 2));
                     } else {
-                        $updateSharedProsperityUserEntity->setBrokeragePrice(bcadd($updateSharedProsperityUserEntity->getBrokeragePrice(), $sharedProsperityRewardRecordEntity->getNumber(), 2));
+                        $updateSharedProsperityUserEntity->setConsumerStocks(bcadd($updateSharedProsperityUserEntity->getConsumerStocks(), $sharedProsperityRewardRecordEntity->getNumber(), 2));
                     }
 
-                } else if ($sharedProsperityRewardRecordEntity->getCommissionType() == UserBillEnum::COMMISSION_TYPE['PENSION']['code']) {
-
-                    if ($sharedProsperityRewardRecordEntity->getGzc() == UserBillEnum::GZC_STATUS['NOT_ENTERED']['code']) {
-                        if (!empty($userCertificationEntityMapByUid[$sharedProsperityRewardRecordEntity->getUid()])) {
-                            $userCertificationEntity = $userCertificationEntityMapByUid[$sharedProsperityRewardRecordEntity->getUid()];
-                            // 创建公证处记录
-                            $gzcLogRepository->addGzcLog(
-                                $userCertificationEntity->getUid(),
-                                $userCertificationEntity->getUserName(),
-                                $userCertificationEntity->getMobile(),
-                                $userCertificationEntity->getUserCard(),
-                                $sharedProsperityRewardRecordEntity->getTypeShop(),
-                                $sharedProsperityRewardRecordEntity->getLinkId(),
-                                $sharedProsperityRewardRecordEntity->getNumber()
-                            );
-
-                            // 养老金
-                            if (is_null($updateSharedProsperityUserEntity->getAnnuity())) {
-                                $updateSharedProsperityUserEntity->setAnnuity($sharedProsperityUserEntity->getAnnuity());
-                            }
-                            $updateSharedProsperityUserEntity->setAnnuity(bcadd($updateSharedProsperityUserEntity->getAnnuity(), $sharedProsperityRewardRecordEntity->getNumber(), 2));
-
-                            // 几笔养老金
-                            if (is_null($updateSharedProsperityUserEntity->getAnnuityNum())) {
-                                $updateSharedProsperityUserEntity->setAnnuityNum($sharedProsperityUserEntity->getAnnuityNum());
-                            }
-                            $updateSharedProsperityUserEntity->setAnnuityNum(bcadd($updateSharedProsperityUserEntity->getAnnuityNum(), 1));
-
-                            // 更新佣金记录
-                            $updateSharedProsperityRewardRecord
-                                ->setGzc(UserBillEnum::GZC_STATUS['ENTERED']['code'])
-                                ->setIsGzc(UserBillEnum::IS_GZC['NOT_STARTED']['code']);
+                } else if ($sharedProsperityRewardRecordEntity->getType() == SharedProsperityRewardRecordEnum::TYPE['WITHDRAWAL_LIMIT']['code']) {
+                    // 提现额度
+                    if (is_null($updateSharedProsperityUserEntity->getWithdrawalLimit())) {
+                        $updateSharedProsperityUserEntity->setWithdrawalLimit($sharedProsperityUserEntity->getWithdrawalLimit());
+                    }
+                    // 更新用户 佣金 信息
+                    if ($sharedProsperityRewardRecordEntity->getPm() == SharedProsperityRewardRecordEnum::PM['EXPEND']['code']) {
+                        if ($updateSharedProsperityUserEntity->getWithdrawalLimit() < $sharedProsperityRewardRecordEntity->getNumber()) {
+                            throw new ValidateException('用户剩余提现额度不足');
                         }
+                        $updateSharedProsperityUserEntity->setWithdrawalLimit(bcsub($updateSharedProsperityUserEntity->getWithdrawalLimit(), $sharedProsperityRewardRecordEntity->getNumber(), 2));
+                    } else {
+                        $updateSharedProsperityUserEntity->setWithdrawalLimit(bcadd($updateSharedProsperityUserEntity->getWithdrawalLimit(), $sharedProsperityRewardRecordEntity->getNumber(), 2));
+                    }
+                } else if ($sharedProsperityRewardRecordEntity->getType() == SharedProsperityRewardRecordEnum::TYPE['PV']['code']) {
+                    // 提现额度
+                    if (is_null($updateSharedProsperityUserEntity->getPv())) {
+                        $updateSharedProsperityUserEntity->setPv($sharedProsperityUserEntity->getPv());
+                    }
+                    // 更新用户 佣金 信息
+                    if ($sharedProsperityRewardRecordEntity->getPm() == SharedProsperityRewardRecordEnum::PM['EXPEND']['code']) {
+                        if ($updateSharedProsperityUserEntity->getPv() < $sharedProsperityRewardRecordEntity->getNumber()) {
+                            throw new ValidateException('用户剩余PV不足');
+                        }
+                        $updateSharedProsperityUserEntity->setPv(bcsub($updateSharedProsperityUserEntity->getPv(), $sharedProsperityRewardRecordEntity->getNumber(), 2));
+                    } else {
+                        $updateSharedProsperityUserEntity->setPv(bcadd($updateSharedProsperityUserEntity->getPv(), $sharedProsperityRewardRecordEntity->getNumber(), 2));
                     }
                 }
 
-                $updateSharedProsperityUserEntityList[$sharedProsperityUserEntity->getUid()] = $updateSharedProsperityUserEntity;
-                $updateSharedProsperityRewardRecordEntityList[$sharedProsperityRewardRecordEntity->getBillId()] = $updateSharedProsperityRewardRecord;
+                $updateSharedProsperityUserEntityList[$sharedProsperityUserEntity->getUserId()] = $updateSharedProsperityUserEntity;
+                $updateSharedProsperityRewardRecordEntityList[$sharedProsperityRewardRecordEntity->getId()] = $updateSharedProsperityRewardRecord;
             }
             if (!empty($updateSharedProsperityUserEntityList)) {
-                $sharedProsperityUserRepository->batchUpdateUserDataByDataList(
-                    array_map(function (UserEntity $updateUserEntity) {
-                        return $updateUserEntity->toUnderlineArray();
+                $sharedProsperityUserRepository->batchUpdateSharedProsperityUserDataByDataList(
+                    array_map(function (SharedProsperityUserEntity $updateSharedProsperityUserEntity) {
+                        return $updateSharedProsperityUserEntity->toUnderlineArray();
                     }, $updateSharedProsperityUserEntityList)
                 );
             }
 
             if (!empty($updateSharedProsperityRewardRecordEntityList)) {
-                $this->batchUpdateUserBillDataByDataList(
-                    array_map(function (UserBillEntity $updateUserBillEntity) {
-                        return $updateUserBillEntity->toUnderlineArray();
+                $this->batchUpdateSharedProsperityRewardRecordDataByDataList(
+                    array_map(function (SharedProsperityRewardRecordEntity $updateSharedProsperityRewardRecordEntity) {
+                        return $updateSharedProsperityRewardRecordEntity->toUnderlineArray();
                     }, $updateSharedProsperityRewardRecordEntityList)
                 );
             }

app/common/repositories/shared/SharedProsperityUserRepository.php

@@ -235,4 +235,14 @@ class SharedProsperityUserRepository extends BaseRepository
             ]
         ];
     }
+
+    /**
+     * 批量更新
+     * @param $dataList
+     * @return array
+     */
+    public function batchUpdateSharedProsperityUserDataByDataList($dataList): array
+    {
+        return $this->dao->saveAll($dataList);
+    }
 }

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

@@ -26,6 +26,7 @@ use app\common\dao\util\TableOpsDao;
 use app\common\dao\backup\BackupStoreOrderDao;
 use app\common\enum\CommonEnum;
 use app\common\enum\merchant\MerchantEnum;
+use app\common\enum\shared\SharedProsperityRewardRecordEnum;
 use app\common\enum\shipping\ShippingTemplateEnum;
 use app\common\enum\store\CartEnum;
 use app\common\enum\store\ProductEnum;
@@ -53,6 +54,7 @@ use app\common\repositories\BaseRepository;
 use app\common\repositories\product\ProductSeckillRepository;
 use app\common\repositories\product\ShareRepository;
 use app\common\repositories\shared\SharedProsperityRecommendConfigRepository;
+use app\common\repositories\shared\SharedProsperityRewardRecordRepository;
 use app\common\repositories\shared\SharedProsperityUserRepository;
 use app\common\repositories\store\coupon\StoreCouponProductRepository;
 use app\common\repositories\store\coupon\StoreCouponRepository;
@@ -11585,22 +11587,46 @@ class StoreOrderRepository extends BaseRepository
             );
 
             // 发放消费股
-            $userBillRepository->addUserBill(
+            $consumerStocks = bcmul($storeOrderEntity->getTotalPrice(), CommonEnum::ORDER_EARNING_ALLOCATION['SharedProsperity']['Self']['ConsumerStocks']['Ratio']['code'], CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
+            /** @var SharedProsperityRewardRecordRepository $sharedProsperityRewardRecordRepository */
+            $sharedProsperityRewardRecordRepository = app()->make(SharedProsperityRewardRecordRepository::class);
+            $sharedProsperityRewardRecordRepository->addSharedProsperityRewardRecord(
                 $sharedProsperityUserEntity->getUserId(),
-                UserBillEnum::COMMISSION_TYPE['PENSION']['code'],
-                UserBillEnum::PM['INCOME']['code'],
-                $yanglaojin,
-                UserBillEnum::CATEGORY['NowMoney']['code'],
-                UserBillEnum::TYPE['Commission']['code'],
-                UserBillEnum::SOURCE['ONLINE']['code'],
-                UserBillEnum::ORDER_TYPE['SELF_OPERATED']['code'],
-                UserBillEnum::TYPE_SHOP['Platform']['code'],
-                $storeOrderEntity->getOrderId(),
-                '购买共富区商品获得养老金'
+                SharedProsperityRewardRecordEnum::TYPE['CONSUMER_STOCKS']['code'],
+                SharedProsperityRewardRecordEnum::PM['INCOME']['code'],
+                $consumerStocks,
+                SharedProsperityRewardRecordEnum::TYPE_SHOP['Platform']['code'],
+                $storeOrderEntity->getOrderSn(),
+                '购买共富区商品获得消费股'
             );
 
-
             // 发放提现额度
+            $withdrawalLimit = bcmul($storeOrderEntity->getTotalPrice(), CommonEnum::ORDER_EARNING_ALLOCATION['SharedProsperity']['Self']['WithdrawalLimit']['Ratio']['code'], CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
+            /** @var SharedProsperityRewardRecordRepository $sharedProsperityRewardRecordRepository */
+            $sharedProsperityRewardRecordRepository = app()->make(SharedProsperityRewardRecordRepository::class);
+            $sharedProsperityRewardRecordRepository->addSharedProsperityRewardRecord(
+                $sharedProsperityUserEntity->getUserId(),
+                SharedProsperityRewardRecordEnum::TYPE['WITHDRAWAL_LIMIT']['code'],
+                SharedProsperityRewardRecordEnum::PM['INCOME']['code'],
+                $withdrawalLimit,
+                SharedProsperityRewardRecordEnum::TYPE_SHOP['Platform']['code'],
+                $storeOrderEntity->getOrderSn(),
+                '购买共富区商品获得提现额度'
+            );
+
+            // 发放共富区PV
+            $pv = bcmul($storeOrderEntity->getConPri(), CommonEnum::ORDER_EARNING_ALLOCATION['SharedProsperity']['Self']['Pv']['Ratio']['code'], CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
+            /** @var SharedProsperityRewardRecordRepository $sharedProsperityRewardRecordRepository */
+            $sharedProsperityRewardRecordRepository = app()->make(SharedProsperityRewardRecordRepository::class);
+            $sharedProsperityRewardRecordRepository->addSharedProsperityRewardRecord(
+                $sharedProsperityUserEntity->getUserId(),
+                SharedProsperityRewardRecordEnum::TYPE['PV']['code'],
+                SharedProsperityRewardRecordEnum::PM['INCOME']['code'],
+                $pv,
+                SharedProsperityRewardRecordEnum::TYPE_SHOP['Platform']['code'],
+                $storeOrderEntity->getOrderSn(),
+                '购买共富区商品获得PV'
+            );
 
             if (!empty($sharedProsperityUserEntity->getParentId())) {
                 // 如果 共富区推荐人 不是平台，则为 推荐人发放 推荐奖励
@@ -11624,6 +11650,20 @@ class StoreOrderRepository extends BaseRepository
                         '推广共富区会员消费获得养老金'
                     );
 
+                    // 发放消费股
+                    $consumerStocksBySpread = bcmul($storeOrderEntity->getTotalPrice(), CommonEnum::ORDER_EARNING_ALLOCATION['SharedProsperity']['Spread']['ConsumerStocks']['Ratio']['code'], CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
+                    /** @var SharedProsperityRewardRecordRepository $sharedProsperityRewardRecordRepository */
+                    $sharedProsperityRewardRecordRepository = app()->make(SharedProsperityRewardRecordRepository::class);
+                    $sharedProsperityRewardRecordRepository->addSharedProsperityRewardRecord(
+                        $sharedProsperityUserEntityByParent->getUserId(),
+                        SharedProsperityRewardRecordEnum::TYPE['CONSUMER_STOCKS']['code'],
+                        SharedProsperityRewardRecordEnum::PM['INCOME']['code'],
+                        $consumerStocksBySpread,
+                        SharedProsperityRewardRecordEnum::TYPE_SHOP['Platform']['code'],
+                        $storeOrderEntity->getOrderSn(),
+                        '推广共富区会员消费获得消费股'
+                    );
+
                     // 计算 推广佣金
                     /** @var SharedProsperityRecommendConfigRepository $sharedProsperityRecommendConfigRepository */
                     $sharedProsperityRecommendConfigRepository = app()->make(SharedProsperityRecommendConfigRepository::class);
@@ -11635,7 +11675,7 @@ class StoreOrderRepository extends BaseRepository
                         /** @var UserBillRepository $userBillRepository */
                         $userBillRepository = app()->make(UserBillRepository::class);
                         $userBillRepository->addUserBill(
-                            $sharedProsperityUserEntityByParent->getUid(),
+                            $sharedProsperityUserEntityByParent->getUserId(),
                             UserBillEnum::COMMISSION_TYPE['DIRECT_REFERRAL']['code'],
                             UserBillEnum::PM['INCOME']['code'],
                             $brokeragePriceBySpreadUid,
@@ -11645,7 +11685,7 @@ class StoreOrderRepository extends BaseRepository
                             UserBillEnum::ORDER_TYPE['SELF_OPERATED']['code'],
                             UserBillEnum::TYPE_SHOP['Platform']['code'],
                             $storeOrderEntity->getOrderId(),
-                            '推广共富区商品获得佣金'
+                            '推广共富区会员消费获得佣金'
                         );
                     }
                 }
@@ -11909,9 +11949,11 @@ class StoreOrderRepository extends BaseRepository
 
             // 筛选 未结算的 订单ID
             $unsettledOrderIdList = [];
+            $unsettledOrderSnList = [];
             foreach ($storeOrderEntityList as $storeOrderEntity) {
                 if ($storeOrderEntity->getIsSettlement() == StoreOrderEnum::IS_SETTLEMENT['NO']['code']) {
                     $unsettledOrderIdList[] = $storeOrderEntity->getOrderId();
+                    $unsettledOrderSnList[] = $storeOrderEntity->getOrderSn();
                 }
             }
             if (empty($unsettledOrderIdList)) {
@@ -11930,6 +11972,7 @@ class StoreOrderRepository extends BaseRepository
                     $userBillRepository->executeByIdList($billIdList);
                 }
 
+                /** 结算 复购金 */
                 /** @var UserSignFugouRepository $userSignFugouRepository */
                 $userSignFugouRepository = app()->make(UserSignFugouRepository::class);
                 $userSignFugouEntityList = $userSignFugouRepository->getUserSignFugouEntityListByOrderIdListAndPending(UserSignFugouEnum::ORDER_TYPE['Platform']['code'], $unsettledOrderIdList);
@@ -11937,7 +11980,6 @@ class StoreOrderRepository extends BaseRepository
                     $fugouIdList = array_map(function ($userSignFugouEntity) {
                         return $userSignFugouEntity->getId();
                     }, $userSignFugouEntityList);
-                    // 去结算 养老金 和佣金
                     $userSignFugouRepository->executeByIdList($fugouIdList);
                 }
 
@@ -11984,6 +12026,17 @@ class StoreOrderRepository extends BaseRepository
                     $userSignHongbaoRepository->executeByIdList($userSignHongbaoIdList);
                 }
 
+                /** 结算 共富体系 消费股 提现额度 PV */
+                /** @var SharedProsperityRewardRecordRepository $sharedProsperityRewardRecordRepository */
+                $sharedProsperityRewardRecordRepository = app()->make(SharedProsperityRewardRecordRepository::class);
+                $sharedProsperityRewardRecordEntityList = $sharedProsperityRewardRecordRepository->getSharedProsperityRewardRecordEntityListByOrderSnListAndPending(SharedProsperityRewardRecordEnum::TYPE_SHOP['Platform']['code'], $unsettledOrderSnList);
+                if (!empty($sharedProsperityRewardRecordEntityList)) {
+                    $sharedProsperityRewardRecordIdList = array_map(function ($sharedProsperityRewardRecordEntity) {
+                        return $sharedProsperityRewardRecordEntity->getId();
+                    }, $sharedProsperityRewardRecordEntityList);
+                    $sharedProsperityRewardRecordRepository->executeByIdList($sharedProsperityRewardRecordIdList);
+                }
+
                 // 订单奖励结算时 更新订单自身 结算字段
                 $this->dao->settlementOrderByOrderIdList($unsettledOrderIdList);
             } catch (DbException $e) {

app/entity/data/shared/SharedProsperityRewardRecordEntity.php

@@ -9,6 +9,7 @@ class SharedProsperityRewardRecordEntity extends DataEntity
     public $id = null;  // ID
     public $userId = null;  // 用户ID
     public $type = null;  // 奖励类型
+    public $pm = null;  // 奖励类型
     public $number = null;  // 明细数字
     public $balance = null;  // 剩余
     public $status = null;  // 状态
@@ -76,6 +77,24 @@ class SharedProsperityRewardRecordEntity extends DataEntity
     /**
      * @return mixed
      */
+    public function getPm()
+    {
+        return $this->pm;
+    }
+
+    /**
+     * @param mixed $pm
+     * @return SharedProsperityRewardRecordEntity
+     */
+    public function setPm($pm): SharedProsperityRewardRecordEntity
+    {
+        $this->pm = $pm;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
     public function getNumber()
     {
         return $this->number;