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

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

@@ -10922,7 +10922,7 @@ class StoreOrderRepository extends BaseRepository
                 UserBillEnum::ORDER_TYPE['SELF_OPERATED']['code'],
                 UserBillEnum::TYPE_SHOP['Platform']['code'],
                 $storeOrderEntity->getOrderId(),
-                '购买精彩生活商品赠送养老金'
+                '购买精彩生活商品获得养老金'
             );
 
             // 为用户初始胡 贡献值
@@ -10933,7 +10933,7 @@ class StoreOrderRepository extends BaseRepository
                 $storeOrderEntity->getUid(),
                 UserSignGongxianEnum::TYPE['Give']['code'],
                 $gongxian,
-                '购买精彩生活商品赠送贡献值',
+                '购买精彩生活商品获得贡献值',
                 UserSignGongxianEnum::ORDER_TYPE['Platform']['code'],
                 $storeOrderEntity->getOrderId()
             );
@@ -10945,7 +10945,7 @@ class StoreOrderRepository extends BaseRepository
             $userPvLogRepository->addUserPvLog(
                 $storeOrderEntity->getUid(),
                 $pv,
-                '购买精彩生活商品赠送PV值',
+                '购买精彩生活商品获得PV值',
                 UserPvLogEnum::ORDER_TYPE['Platform']['code'],
                 $storeOrderEntity->getOrderId()
             );
@@ -10959,7 +10959,7 @@ class StoreOrderRepository extends BaseRepository
                 UserSignScoreEnum::SOURCE_TYPE['SelfOrder']['code'],
                 UserSignScoreEnum::PM['Income']['code'],
                 $score,
-                '购买精彩生活商品赠送积分',
+                '购买精彩生活商品获得积分',
                 UserSignHongbaoEnum::ORDER_TYPE['Platform']['code'],
                 $storeOrderEntity->getOrderId()
             );
@@ -10973,7 +10973,7 @@ class StoreOrderRepository extends BaseRepository
                     $storeOrderEntity->getUid(),
                     UserSignHongbaoEnum::TYPE['ConsumptionGift']['code'],
                     $hongbao,
-                    '购买精彩生活商品赠送红包',
+                    '购买精彩生活商品获得红包',
                     UserSignHongbaoEnum::ORDER_TYPE['Platform']['code'],
                     $storeOrderEntity->getOrderId()
                 );
@@ -10998,7 +10998,7 @@ class StoreOrderRepository extends BaseRepository
                         UserSignFugouEnum::TYPE['Give']['code'],
                         $fugouBySpreadUid,
                         UserSignFugouEnum::COMMISSION_TYPE['DIRECT_REFERRAL']['code'],
-                        '推广精彩生活区商品赠送复购金',
+                        '推广精彩生活区商品获得复购金',
                         UserSignFugouEnum::ORDER_TYPE['Platform']['code'],
                         $storeOrderEntity->getOrderId()
                     );
@@ -11019,26 +11019,26 @@ class StoreOrderRepository extends BaseRepository
                         UserBillEnum::ORDER_TYPE['SELF_OPERATED']['code'],
                         UserBillEnum::TYPE_SHOP['Platform']['code'],
                         $storeOrderEntity->getOrderId(),
-                        '推广精彩生活区商品赠送佣金'
+                        '推广精彩生活区商品获得佣金'
                     );
 
                     // 初始胡 贡献值
                     $gongxianBySpreadUid = bcmul($storeOrderEntity->getConPri(), CommonEnum::ORDER_EARNING_ALLOCATION['WonderfulLiving']['Spread']['Gongxian']['Ratio']['code'], CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
-                    // 赠送贡献值
+                    // 获得贡献值
                     /** @var UserSignGongxianRepository $userSignGongxianRepository */
                     $userSignGongxianRepository = app()->make(UserSignGongxianRepository::class);
                     $userSignGongxianRepository->addUserSingGongxian(
                         $userEntityBySpreadUid->getUid(),
                         UserSignGongxianEnum::TYPE['Give']['code'],
                         $gongxianBySpreadUid,
-                        '推广精彩生活商品赠送贡献值',
+                        '推广精彩生活商品获得贡献值',
                         UserSignGongxianEnum::ORDER_TYPE['Platform']['code'],
                         $storeOrderEntity->getOrderId()
                     );
 
                     // 计算积分值
                     $scoreBySpreadUid = bcmul($directReferralBonus, CommonEnum::ORDER_EARNING_ALLOCATION['WonderfulLiving']['Spread']['Score']['Ratio']['code'], CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
-                    // 赠送积分
+                    // 获得积分
                     /** @var UserSignScoreRepository $userSignScoreRepository */
                     $userSignScoreRepository = app()->make(UserSignScoreRepository::class);
                     $userSignScoreRepository->addUserSingScore(
@@ -11046,7 +11046,7 @@ class StoreOrderRepository extends BaseRepository
                         UserSignScoreEnum::SOURCE_TYPE['SelfOrder']['code'],
                         UserSignScoreEnum::PM['Income']['code'],
                         $scoreBySpreadUid,
-                        '推广精彩生活区商品赠送积分',
+                        '推广精彩生活区商品获得积分',
                         UserSignHongbaoEnum::ORDER_TYPE['Platform']['code'],
                         $storeOrderEntity->getOrderId()
                     );
@@ -11093,7 +11093,7 @@ class StoreOrderRepository extends BaseRepository
                         UserBillEnum::ORDER_TYPE['SELF_OPERATED']['code'],
                         UserBillEnum::TYPE_SHOP['Platform']['code'],
                         $storeOrderEntity->getOrderId(),
-                        '分享精彩生活区商品赠送佣金'
+                        '分享精彩生活区商品获得佣金'
                     );
                     // 计算 复购金
                     $fugouByShareUid = bcmul($storeOrderEntity->getConPri(), CommonEnum::ORDER_EARNING_ALLOCATION['WonderfulLiving']['Share']['Fugou']['Ratio']['code'], CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
@@ -11105,7 +11105,7 @@ class StoreOrderRepository extends BaseRepository
                         UserSignFugouEnum::TYPE['Give']['code'],
                         $fugouByShareUid,
                         UserSignFugouEnum::COMMISSION_TYPE['SHARE_EARNINGS']['code'],
-                        '分享精彩生活区商品赠送复购金',
+                        '分享精彩生活区商品获得复购金',
                         UserSignFugouEnum::ORDER_TYPE['Platform']['code'],
                         $storeOrderEntity->getOrderId()
                     );
@@ -11134,7 +11134,7 @@ class StoreOrderRepository extends BaseRepository
                         UserBillEnum::ORDER_TYPE['SELF_OPERATED']['code'],
                         UserBillEnum::TYPE_SHOP['Platform']['code'],
                         $storeOrderEntity->getOrderId(),
-                        '锁客佣金（精彩生活区商品赠送）'
+                        '锁客佣金（精彩生活区商品获得）'
                     );
                     // 计算 复购金
                     $fugouByMerId = bcmul($storeOrderEntity->getConPri(), CommonEnum::ORDER_EARNING_ALLOCATION['WonderfulLiving']['Lock']['Fugou']['Ratio']['code'], CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
@@ -11146,7 +11146,7 @@ class StoreOrderRepository extends BaseRepository
                         UserSignFugouEnum::TYPE['Give']['code'],
                         $fugouByMerId,
                         UserSignFugouEnum::COMMISSION_TYPE['LOCKED_CUSTOMER']['code'],
-                        '锁客复购金（精彩生活区商品赠送）',
+                        '锁客复购金（精彩生活区商品获得）',
                         UserSignFugouEnum::ORDER_TYPE['Platform']['code'],
                         $storeOrderEntity->getOrderId()
                     );
@@ -11171,7 +11171,7 @@ class StoreOrderRepository extends BaseRepository
                     UserBillEnum::ORDER_TYPE['SELF_OPERATED']['code'],
                     UserBillEnum::TYPE_SHOP['Platform']['code'],
                     $storeOrderEntity->getOrderId(),
-                    '购买会员专区商品赠送养老金'
+                    '购买会员专区商品获得养老金'
                 );
 
                 // 为用户初始胡 贡献值
@@ -11182,7 +11182,7 @@ class StoreOrderRepository extends BaseRepository
                     $storeOrderEntity->getUid(),
                     UserSignGongxianEnum::TYPE['Give']['code'],
                     $gongxian,
-                    '购买会员专区商品赠送贡献值',
+                    '购买会员专区商品获得贡献值',
                     UserSignGongxianEnum::ORDER_TYPE['Platform']['code'],
                     $storeOrderEntity->getOrderId()
                 );
@@ -11194,7 +11194,7 @@ class StoreOrderRepository extends BaseRepository
                 $userPvLogRepository->addUserPvLog(
                     $storeOrderEntity->getUid(),
                     $pv,
-                    '购买会员专区商品赠送PV值',
+                    '购买会员专区商品获得PV值',
                     UserPvLogEnum::ORDER_TYPE['Platform']['code'],
                     $storeOrderEntity->getOrderId()
                 );
@@ -11208,7 +11208,7 @@ class StoreOrderRepository extends BaseRepository
                     UserSignScoreEnum::SOURCE_TYPE['SelfOrder']['code'],
                     UserSignScoreEnum::PM['Income']['code'],
                     $score,
-                    '购买会员专区商品赠送积分',
+                    '购买会员专区商品获得积分',
                     UserSignHongbaoEnum::ORDER_TYPE['Platform']['code'],
                     $storeOrderEntity->getOrderId()
                 );
@@ -11233,7 +11233,7 @@ class StoreOrderRepository extends BaseRepository
                                 UserSignFugouEnum::TYPE['Give']['code'],
                                 $fugouBySpreadUid,
                                 UserSignFugouEnum::COMMISSION_TYPE['DIRECT_REFERRAL']['code'],
-                                '推广会员专区商品赠送复购金',
+                                '推广会员专区商品获得复购金',
                                 UserSignFugouEnum::ORDER_TYPE['Platform']['code'],
                                 $storeOrderEntity->getOrderId()
                             );
@@ -11254,7 +11254,7 @@ class StoreOrderRepository extends BaseRepository
                                 UserBillEnum::ORDER_TYPE['SELF_OPERATED']['code'],
                                 UserBillEnum::TYPE_SHOP['Platform']['code'],
                                 $storeOrderEntity->getOrderId(),
-                                '推广会员专区商品赠送佣金'
+                                '推广会员专区商品获得佣金'
                             );
                         }
 
@@ -11266,14 +11266,14 @@ class StoreOrderRepository extends BaseRepository
                             $gongxianRatio = CommonEnum::ORDER_EARNING_ALLOCATION['MemberZone']['Spread']['Gongxian']['Ratio']['code'];
                         }
                         $gongxianBySpreadUid = bcmul($basePrice, $gongxianRatio, CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
-                        // 赠送贡献值
+                        // 获得贡献值
                         /** @var UserSignGongxianRepository $userSignGongxianRepository */
                         $userSignGongxianRepository = app()->make(UserSignGongxianRepository::class);
                         $userSignGongxianRepository->addUserSingGongxian(
                             $userEntityBySpreadUid->getUid(),
                             UserSignGongxianEnum::TYPE['Give']['code'],
                             $gongxianBySpreadUid,
-                            '推广会员专区商品赠送贡献值',
+                            '推广会员专区商品获得贡献值',
                             UserSignGongxianEnum::ORDER_TYPE['Platform']['code'],
                             $storeOrderEntity->getOrderId()
                         );
@@ -11283,7 +11283,7 @@ class StoreOrderRepository extends BaseRepository
                         $rate = static::getUserGroupRate($userEntityBySpreadUid->getUserGroup());
                         $scoreByUserGroupRate = bcmul($basePrice, $rate, CommonEnum::CALCULATE_THE_NUMBER_OF_DECIMAL_PLACES);
                         $scoreBySpreadUid = bcmul($scoreByUserGroupRate, CommonEnum::ORDER_EARNING_ALLOCATION['MemberZone']['Spread']['Score']['Ratio']['code'], CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
-                        // 赠送积分
+                        // 获得积分
                         /** @var UserSignScoreRepository $userSignScoreRepository */
                         $userSignScoreRepository = app()->make(UserSignScoreRepository::class);
                         $userSignScoreRepository->addUserSingScore(
@@ -11291,7 +11291,7 @@ class StoreOrderRepository extends BaseRepository
                             UserSignScoreEnum::SOURCE_TYPE['SelfOrder']['code'],
                             UserSignScoreEnum::PM['Income']['code'],
                             $scoreBySpreadUid,
-                            '推广会员专区商品赠送积分',
+                            '推广会员专区商品获得积分',
                             UserSignHongbaoEnum::ORDER_TYPE['Platform']['code'],
                             $storeOrderEntity->getOrderId()
                         );
@@ -11333,7 +11333,7 @@ class StoreOrderRepository extends BaseRepository
                 UserBillEnum::ORDER_TYPE['SELF_OPERATED']['code'],
                 UserBillEnum::TYPE_SHOP['Platform']['code'],
                 $storeOrderEntity->getOrderId(),
-                '购买复购区赠送养老金'
+                '购买复购区获得养老金'
             );
 
             // 给推荐人的奖励
@@ -11354,7 +11354,7 @@ class StoreOrderRepository extends BaseRepository
                         UserBillEnum::ORDER_TYPE['SELF_OPERATED']['code'],
                         UserBillEnum::TYPE_SHOP['Platform']['code'],
                         $storeOrderEntity->getOrderId(),
-                        '推荐复购区商品赠送养老金'
+                        '推荐复购区商品获得养老金'
                     );
 
                     // 给间接推荐人的奖励
@@ -11375,7 +11375,7 @@ class StoreOrderRepository extends BaseRepository
                                 UserBillEnum::ORDER_TYPE['SELF_OPERATED']['code'],
                                 UserBillEnum::TYPE_SHOP['Platform']['code'],
                                 $storeOrderEntity->getOrderId(),
-                                '间推复购区商品赠送养老金'
+                                '间推复购区商品获得养老金'
                             );
                         }
                     }
@@ -11401,7 +11401,7 @@ class StoreOrderRepository extends BaseRepository
                 UserBillEnum::ORDER_TYPE['SELF_OPERATED']['code'],
                 UserBillEnum::TYPE_SHOP['Platform']['code'],
                 $storeOrderEntity->getOrderId(),
-                '购买商贸区商品赠送养老金'
+                '购买商贸区商品获得养老金'
             );
 
             // 为用户初始胡 贡献值
@@ -11412,7 +11412,7 @@ class StoreOrderRepository extends BaseRepository
                 $storeOrderEntity->getUid(),
                 UserSignGongxianEnum::TYPE['Give']['code'],
                 $gongxian,
-                '购买商贸区商品赠送贡献值',
+                '购买商贸区商品获得贡献值',
                 UserSignGongxianEnum::ORDER_TYPE['Platform']['code'],
                 $storeOrderEntity->getOrderId()
             );
@@ -11424,7 +11424,7 @@ class StoreOrderRepository extends BaseRepository
             $userPvLogRepository->addUserPvLog(
                 $storeOrderEntity->getUid(),
                 $pv,
-                '购买商贸区商品赠送PV值',
+                '购买商贸区商品获得PV值',
                 UserPvLogEnum::ORDER_TYPE['Platform']['code'],
                 $storeOrderEntity->getOrderId()
             );
@@ -11438,7 +11438,7 @@ class StoreOrderRepository extends BaseRepository
                 UserSignScoreEnum::SOURCE_TYPE['SelfOrder']['code'],
                 UserSignScoreEnum::PM['Income']['code'],
                 $score,
-                '购买商贸区商品赠送积分',
+                '购买商贸区商品获得积分',
                 UserSignHongbaoEnum::ORDER_TYPE['Platform']['code'],
                 $storeOrderEntity->getOrderId()
             );
@@ -11465,7 +11465,7 @@ class StoreOrderRepository extends BaseRepository
                     $storeOrderEntity->getUid(),
                     UserSignHongbaoEnum::TYPE['ConsumptionGift']['code'],
                     $hongbao,
-                    '购买商贸区商品赠送红包',
+                    '购买商贸区商品获得红包',
                     UserSignHongbaoEnum::ORDER_TYPE['Platform']['code'],
                     $storeOrderEntity->getOrderId()
                 );
@@ -11490,7 +11490,7 @@ class StoreOrderRepository extends BaseRepository
                         UserSignFugouEnum::TYPE['Give']['code'],
                         $fugouBySpreadUid,
                         UserSignFugouEnum::COMMISSION_TYPE['DIRECT_REFERRAL']['code'],
-                        '推广商贸区商品赠送复购金',
+                        '推广商贸区商品获得复购金',
                         UserSignFugouEnum::ORDER_TYPE['Platform']['code'],
                         $storeOrderEntity->getOrderId()
                     );
@@ -11511,25 +11511,25 @@ class StoreOrderRepository extends BaseRepository
                         UserBillEnum::ORDER_TYPE['SELF_OPERATED']['code'],
                         UserBillEnum::TYPE_SHOP['Platform']['code'],
                         $storeOrderEntity->getOrderId(),
-                        '推广商贸区商品赠送佣金'
+                        '推广商贸区商品获得佣金'
                     );
                     // 初始胡 贡献值
                     $gongxianBySpreadUid = bcmul($storeOrderEntity->getConPri(), CommonEnum::ORDER_EARNING_ALLOCATION['CommercialDistrict']['Spread']['Gongxian']['Ratio']['code'], CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
-                    // 赠送贡献值
+                    // 获得贡献值
                     /** @var UserSignGongxianRepository $userSignGongxianRepository */
                     $userSignGongxianRepository = app()->make(UserSignGongxianRepository::class);
                     $userSignGongxianRepository->addUserSingGongxian(
                         $userEntityBySpreadUid->getUid(),
                         UserSignGongxianEnum::TYPE['Give']['code'],
                         $gongxianBySpreadUid,
-                        '推广商贸区商品赠送贡献值',
+                        '推广商贸区商品获得贡献值',
                         UserSignGongxianEnum::ORDER_TYPE['Platform']['code'],
                         $storeOrderEntity->getOrderId()
                     );
 
                     // 计算积分值
                     $scoreBySpreadUid = bcmul($directReferralBonus, CommonEnum::ORDER_EARNING_ALLOCATION['CommercialDistrict']['Spread']['Score']['Ratio']['code'], CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
-                    // 赠送积分
+                    // 获得积分
                     /** @var UserSignScoreRepository $userSignScoreRepository */
                     $userSignScoreRepository = app()->make(UserSignScoreRepository::class);
                     $userSignScoreRepository->addUserSingScore(
@@ -11537,7 +11537,7 @@ class StoreOrderRepository extends BaseRepository
                         UserSignScoreEnum::SOURCE_TYPE['SelfOrder']['code'],
                         UserSignScoreEnum::PM['Income']['code'],
                         $scoreBySpreadUid,
-                        '推广商贸区商品赠送积分',
+                        '推广商贸区商品获得积分',
                         UserSignHongbaoEnum::ORDER_TYPE['Platform']['code'],
                         $storeOrderEntity->getOrderId()
                     );
@@ -11586,7 +11586,7 @@ class StoreOrderRepository extends BaseRepository
                         UserBillEnum::ORDER_TYPE['SELF_OPERATED']['code'],
                         UserBillEnum::TYPE_SHOP['Platform']['code'],
                         $storeOrderEntity->getOrderId(),
-                        '锁客佣金（精彩生活区商品赠送）'
+                        '锁客佣金（精彩生活区商品获得）'
                     );
 
                     // 计算 复购金
@@ -11599,7 +11599,7 @@ class StoreOrderRepository extends BaseRepository
                         UserSignFugouEnum::TYPE['Give']['code'],
                         $fugouByMerId,
                         UserSignFugouEnum::COMMISSION_TYPE['LOCKED_CUSTOMER']['code'],
-                        '锁客复购金（精彩生活区商品赠送）',
+                        '锁客复购金（精彩生活区商品获得）',
                         UserSignFugouEnum::ORDER_TYPE['Platform']['code'],
                         $storeOrderEntity->getOrderId()
                     );

app/common/repositories/user/UserPvLogRepository.php

@@ -186,7 +186,7 @@ class UserPvLogRepository extends BaseRepository
                 );
             }
 
-            if (!empty($updateUserBillEntityList)) {
+            if (!empty($updateUserPvLogEntityList)) {
                 $this->batchUpdateUserPvLogDataByDataList(
                     array_map(function (UserPvLogEntity $updateUserPvLogEntity) {
                         return $updateUserPvLogEntity->toUnderlineArray();