增加分享人收益、修改退款时候type类型问题、增加结算退款时å分润记录处理

app/command/PensionTasks.php

@@ -1896,6 +1896,24 @@ class PensionTasks extends Command
             }
         }
 
+        // 结算分润值
+        $user_fenrun_list = Db::name('user_sign_fenrun')
+            ->where('status', -1)
+            ->where('order_id', $online['order_id'])
+            ->where('order_type', $order_type)
+            ->select()
+            ->toArray();
+        if($user_fenrun_list) {
+            foreach ($user_fenrun_list as $user_fenrun) {
+                Db::name('user_sign_fenrun')
+                    ->where('id', $user_fenrun['id'])
+                    ->update([
+                        'status'          => 1,
+                        'settlement_time' => date('Y-m-d H:i:s')
+                    ]);
+            }
+        }
+
 
         // 结算佣金养老金
         $user_bill_list = Db::name('user_bill')

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

@@ -9431,7 +9431,7 @@ class StoreOrderRepository extends BaseRepository
         if($status == 1) {
             $data['settlement_time'] = date('Y-m-d H:i:s');
         }
-        Db::name("user_pv_log")->insert($data);//添加pv记录
+        Db::name("user_sign_fenrun")->insert($data);
     }
 
     //添加贡献值日志
@@ -9627,6 +9627,8 @@ class StoreOrderRepository extends BaseRepository
         } else if ($comm_order_type == 5) {
             $name = '养老金';
             //$user_bill_status = Db::name('store_order')->where("order_id",$order_id)->update(['gzc'=>1]);
+        } else if ($comm_order_type == 20) {
+            $name = '分享收益';
         }
 
         $bill = [
@@ -9751,6 +9753,10 @@ 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']){
+                            $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);
+                        }
                     } else if ($spread_data['user_group'] > 1) {
 
                         $ssf = bcmul($pv, $rate, 2);
@@ -9766,6 +9772,10 @@ 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']){
+                            $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);
+                        }
                     }
                 }
 

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

@@ -1563,36 +1563,49 @@ class StoreRefundOrderRepository extends BaseRepository
         Db::name("user_bill")
             ->where('link_id', $orderId)
             ->where('status', 0)
+            ->where('type_shop', 0)
             ->update(['status' => -1]);
 
         Db::name("user_sign_fugou")
             ->where('order_id', $orderId)
             ->where('status', -1)
+            ->where('order_type', 0)
             ->update(['status' => 0]);
 
         Db::name("user_sign_score")
             ->where('order_id', $orderId)
             ->where('status', -1)
+            ->where('order_type', 0)
             ->update(['status' => 0]);
 
         Db::name("user_sign_gongxian")
             ->where('order_id', $orderId)
             ->where('status', -1)
+            ->where('order_type', 0)
             ->update(['status' => 0]);
 
         Db::name("user_pv_log")
             ->where('order_id', $orderId)
             ->where('status', -1)
+            ->where('order_type', 0)
             ->update(['status' => 0]);
 
         Db::name("user_sign_hongbao")
             ->where('order_id', $orderId)
             ->where('status', -1)
+            ->where('order_type', 0)
             ->update(['status' => 0]);
 
         Db::name("user_sign_jingdou")
             ->where('order_id', $orderId)
             ->where('status', -1)
+            ->where('order_type', 0)
+            ->update(['status' => 0]);
+
+        Db::name("user_sign_fenrun")
+            ->where('order_id', $orderId)
+            ->where('status', -1)
+            ->where('order_type', 0)
             ->update(['status' => 0]);
     }
 }

app/controller/api/Notify.php

@@ -217,6 +217,10 @@ 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']){
+                                            $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);
+                                        }
                                     } else if ($spread_data['user_group'] > 1) {
 
                                         $ssf = bcmul($pv, $rate, 2);
@@ -232,6 +236,10 @@ 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']){
+                                            $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);
+                                        }
                                     }
 
                                     //锁客收益

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

@@ -650,7 +650,7 @@ class StoreOrder extends BaseController
 
         makeLock()->lock();
         try {
-            $groupOrder = $this->repository->createOrder($this->request->userInfo(), $payType, [$cartId], $addressId, 0,0, 0,0,0,0,0,$mer_id,0,0,0,0,0,0,$fzone_paytype,$getuserofgoodsid,$array_fzone_paytype_all);
+            $groupOrder = $this->repository->createOrder($this->request->userInfo(), $payType, [$cartId], $addressId, 0,0, 0,0,0,$share_id,0,$mer_id,0,0,0,0,0,0,$fzone_paytype,$getuserofgoodsid,$array_fzone_paytype_all);
             //var_dump($groupOrder);
         } catch (\Throwable $e) {
             makeLock()->unlock();