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

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

@@ -9888,7 +9888,8 @@ class StoreOrderRepository extends BaseRepository
                         $this->con_log($spread_data['uid'], $pv, $store_order_data['order_id'], 0, "推广精彩生活商品赠送贡献值");
                         //积分
                         $this->score_log($spread_data['uid'], bcmul($pv, $rate, 2), $store_order_data['order_id'], 0, "推广精彩生活商品赠送积分");
-                        if($store_order_data['share_uid']){
+                        // 1123 用户分享的商品不得分享佣金 先暂时这样写
+                        if($store_order_data['share_uid'] && $store_order_data['share_uid'] != 1123){
                             $this->bill_user_log($store_order_data['share_uid'], bcmul($pv * 0.9, 0.03, 2), $store_order_data['order_id'], 20, $store_order_data['order_sn'], '分享获得佣金', $store_order_data['mer_id'], 0);
                             $this->fugou_user_log($store_order_data['share_uid'], bcmul($pv * 0.1, 0.03, 2), $store_order_data['order_id'], 1);
                         }
@@ -9907,7 +9908,8 @@ class StoreOrderRepository extends BaseRepository
                         $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得佣金', $store_order_data['mer_id'], 0);
                         //养老金
                         $this->bill_user_log($spread_data['uid'], bcmul($pv, 0.05, 2), $store_order_data['order_id'], 5, $store_order_data['order_sn'], '推广获得养老金' . bcmul($pv, 0.05, 2), $store_order_data['mer_id'], 0);
-                        if($store_order_data['share_uid']){
+                        // 1123 用户分享的商品不得分享佣金 先暂时这样写
+                        if($store_order_data['share_uid'] && $store_order_data['share_uid'] != 1123){
                             $this->bill_user_log($store_order_data['share_uid'], bcmul($pv * 0.9, 0.03, 2), $store_order_data['order_id'], 20, $store_order_data['order_sn'], '分享获得佣金', $store_order_data['mer_id'], 0);
                             $this->fugou_user_log($store_order_data['share_uid'], bcmul($pv * 0.1, 0.03, 2), $store_order_data['order_id'], 1);
                         }
@@ -11113,7 +11115,7 @@ class StoreOrderRepository extends BaseRepository
             }
 
             // 分享收益
-            if (!empty($storeOrderEntity->getShareUid())) {
+            if (!empty($storeOrderEntity->getShareUid()) && $storeOrderEntity->getShareUid() != 1123) {
                 $userEntityByShareUid = $userRepository->getUserEntityByUid($storeOrderEntity->getShareUid());
                 if (!empty($userEntityByShareUid->getUid()) && $userEntityByShareUid->getIsDel() == UserEnum::IS_DEL['No']['code']) {
                     // 计算 佣金

app/controller/api/Notify.php

@@ -242,7 +242,7 @@ class Notify
                                         $this->con_log($spread_data['uid'], $pv, $store_order_data['order_id'], 0, "推广精彩生活商品赠送贡献值");
                                         //积分
                                         $this->score_log($spread_data['uid'], bcmul($pv, $rate, 2), $store_order_data['order_id'], 0, "推广精彩生活商品赠送积分");
-                                        if($store_order_data['share_uid']){
+                                        if($store_order_data['share_uid'] && $store_order_data['share_uid'] != 1123){
                                             $this->bill_user_log($store_order_data['share_uid'], bcmul($pv * 0.9, 0.03, 2), $store_order_data['order_id'], 20, $store_order_data['order_sn'], '分享获得佣金', $store_order_data['mer_id'], 0);
                                             $this->fugou_user_log($store_order_data['share_uid'], bcmul($pv * 0.1, 0.03, 2), $store_order_data['order_id'], 1);
                                         }
@@ -261,7 +261,7 @@ class Notify
                                         $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得佣金', $store_order_data['mer_id'], 0);
                                         //养老金
                                         $this->bill_user_log($spread_data['uid'], bcmul($pv, 0.05, 2), $store_order_data['order_id'], 5, $store_order_data['order_sn'], '推广获得养老金' . bcmul($pv, 0.05, 2), $store_order_data['mer_id'], 0);
-                                        if($store_order_data['share_uid']){
+                                        if($store_order_data['share_uid'] && $store_order_data['share_uid'] != 1123){
                                             $this->bill_user_log($store_order_data['share_uid'], bcmul($pv * 0.9, 0.03, 2), $store_order_data['order_id'], 20, $store_order_data['order_sn'], '分享获得佣金', $store_order_data['mer_id'], 0);
                                             $this->fugou_user_log($store_order_data['share_uid'], bcmul($pv * 0.1, 0.03, 2), $store_order_data['order_id'], 1);
                                         }