Merge branch 'master' of https://git.bjtdba.com/shop/php

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

@@ -9624,8 +9624,10 @@ class StoreOrderRepository extends BaseRepository
                 // 贡献值
                 $this->con_log($user_data['uid'], $pv, $store_order_data['order_id'], 11, "购买精彩生活商品赠送贡献值");
                 $this->con_log_pv($user_data['uid'], $pv, $store_order_data['order_id'], 11, "购买精彩生活商品赠送PV值");
-                // 红包
-                $this->giveHongBao($user_data['uid'], $pv, $store_order_data['order_id'], '购买精彩生活商品赠送红包');
+                if (!empty($user_data['is_old'])) {
+                    // 红包
+                    $this->giveHongBao($user_data['uid'], $pv, $store_order_data['order_id'], '购买精彩生活商品赠送红包');
+                }
                 // 积分
                 $this->score_log($user_data['uid'], $pv, $store_order_data['order_id'], 11, "购买精彩生活商品赠送积分");
 
@@ -9852,8 +9854,10 @@ class StoreOrderRepository extends BaseRepository
                 $this->con_log($user_data['uid'], $pv, $store_order_data['order_id'], 12, "购买商贸区商品赠送贡献值");
                 // 购买商贸区赠送PV值
                 $this->con_log_pv($user_data['uid'], $pv, $store_order_data['order_id'], 12, "购买商贸区赠送PV值");
-                // 红包
-                $this->giveHongBao($user_data['uid'], $pv, $store_order_data['order_id'], '购买商贸区商品赠送红包');
+                if (!empty($user_data['is_old'])) {
+                    // 红包
+                    $this->giveHongBao($user_data['uid'], $pv, $store_order_data['order_id'], '购买商贸区商品赠送红包');
+                }
                 // 积分
                 $this->score_log($user_data['uid'], $pv, $store_order_data['order_id'], 12, "购买商贸区商品赠送积分");
 

app/controller/api/Notify.php

@@ -187,8 +187,10 @@ class Notify
                                     $this->con_log_pv($user_data['uid'],$pv,$store_order_data['order_id'],11,"购买精彩生活商品赠送pv");
                                     $this->con_log($user_data['uid'],$pv,$store_order_data['order_id'],11,"购买精彩生活商品赠送贡献值");
                                     $this->score_log($user_data['uid'],$pv,$store_order_data['order_id'],11,"购买精彩生活商品赠送积分");
-                                    // 红包
-                                    $this->giveHongBao($user_data['uid'], $pv, $store_order_data['order_id'], '购买精彩生活商品赠送红包');
+                                    if (!empty($user_data['is_old'])) {
+                                        // 红包
+                                        $this->giveHongBao($user_data['uid'], $pv, $store_order_data['order_id'], '购买精彩生活商品赠送红包');
+                                    }
 
                                     //给推广者分配养老金
                                     //给推广者分配佣金
@@ -627,9 +629,10 @@ class Notify
                                     $this->con_log_pv($user_data['uid'], $pv, $store_order_data['order_id'], 12, "购买商贸区赠送PV值");
                                     // 积分
                                     $this->score_log($user_data['uid'], $pv, $store_order_data['order_id'], 12, "购买商贸区商品赠送积分");
-                                    // 红包
-                                    $this->giveHongBao($user_data['uid'], $pv, $store_order_data['order_id'], '购买商贸区商品赠送红包');
-
+                                    if (!empty($user_data['is_old'])) {
+                                        // 红包
+                                        $this->giveHongBao($user_data['uid'], $pv, $store_order_data['order_id'], '购买商贸区商品赠送红包');
+                                    }
                                     $spread_data = Db::name('user')->where('uid',$user_data['spread_uid'])->find();
                                     if($spread_data) {
                                         $StoreOrderRepository = app()->make(StoreOrderRepository::class);