Merge branch 'refs/heads/dev-sc-260204' into dev

app/common/enum/shared/SharedProsperityBalanceLogEnum.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace app\common\enum\shared;
+
+use app\common\enum\CommonEnum;
+
+class SharedProsperityBalanceLogEnum extends CommonEnum
+{
+    // 收支类型
+    const PM = [
+        'EXPEND' => ['code' => 0, 'name' => '支出'],
+        'INCOME' => ['code' => 1, 'name' => '获得'],
+    ];
+
+    // 明细类型  commission佣金
+    const TYPE = [
+        'PARTNER' => ['code' => 1, 'name' => '合伙人分红'],
+        'GROUP' => ['code' => 2, 'name' => '共富奖'],
+    ];
+}

app/entity/data/shared/SharedProsperityBalanceEntity.php

@@ -4,16 +4,19 @@ namespace app\entity\data\shared;
 
 use app\entity\data\DataEntity;
 
-class SharedProsperityBalanceEntity extends DataEntity
+class SharedProsperityBalanceLogEntity extends DataEntity
 {
     public $id = null;  // 主键
     public $userId = null;  // 用户id
+    public $pm = null;  // 1增加 0减少
+    public $type = null;  // 类型 1合伙人分红 2共富奖
     public $level = null;  // 用户等级
     public $radio = null;  // 分配比例
     public $total_profit = null; // 总佣金
     public $old = null;  // 变更前佣金
     public $number = null;  // 操作佣金
     public $after = null;  // 变更后佣金
+    public $status = null;  // 状态 -1失效 0待生效 1已生效
     public $createTime = null;  // 创建时间
 
     public function getId()
@@ -21,18 +24,40 @@ class SharedProsperityBalanceEntity extends DataEntity
         return $this->id;
     }
 
-    public function setId($id): SharedProsperityBalanceEntity
+    public function setId($id): SharedProsperityBalanceLogEntity
     {
         $this->id = $id;
         return $this;
     }
 
+    public function getPm()
+    {
+        return $this->pm;
+    }
+
+    public function setPm($pm): SharedProsperityBalanceLogEntity
+    {
+        $this->pm = $pm;
+        return $this;
+    }
+
+    public function getType()
+    {
+        return $this->type;
+    }
+
+    public function setType($type): SharedProsperityBalanceLogEntity
+    {
+        $this->type = $type;
+        return $this;
+    }
+
     public function getUserId()
     {
         return $this->userId;
     }
 
-    public function setUserId($userId): SharedProsperityBalanceEntity
+    public function setUserId($userId): SharedProsperityBalanceLogEntity
     {
         $this->userId = $userId;
         return $this;
@@ -43,7 +68,7 @@ class SharedProsperityBalanceEntity extends DataEntity
         return $this->level;
     }
 
-    public function setLevel($level): SharedProsperityBalanceEntity
+    public function setLevel($level): SharedProsperityBalanceLogEntity
     {
         $this->level = $level;
         return $this;
@@ -54,7 +79,7 @@ class SharedProsperityBalanceEntity extends DataEntity
         return $this->radio;
     }
 
-    public function setRadio($radio): SharedProsperityBalanceEntity
+    public function setRadio($radio): SharedProsperityBalanceLogEntity
     {
         $this->radio = $radio;
         return $this;
@@ -65,7 +90,7 @@ class SharedProsperityBalanceEntity extends DataEntity
         return $this->total_profit;
     }
 
-    public function setTotalProfit($total_profit): SharedProsperityBalanceEntity
+    public function setTotalProfit($total_profit): SharedProsperityBalanceLogEntity
     {
         $this->total_profit = $total_profit;
         return $this;
@@ -76,7 +101,7 @@ class SharedProsperityBalanceEntity extends DataEntity
         return $this->old;
     }
 
-    public function setOld($old): SharedProsperityBalanceEntity
+    public function setOld($old): SharedProsperityBalanceLogEntity
     {
         $this->old = $old;
         return $this;
@@ -87,7 +112,7 @@ class SharedProsperityBalanceEntity extends DataEntity
         return $this->number;
     }
 
-    public function setNumber($number): SharedProsperityBalanceEntity
+    public function setNumber($number): SharedProsperityBalanceLogEntity
     {
         $this->number = $number;
         return $this;
@@ -98,18 +123,29 @@ class SharedProsperityBalanceEntity extends DataEntity
         return $this->after;
     }
 
-    public function setAfter($after): SharedProsperityBalanceEntity
+    public function setAfter($after): SharedProsperityBalanceLogEntity
     {
         $this->after = $after;
         return $this;
     }
 
+    public function getStatus()
+    {
+        return $this->status;
+    }
+
+    public function setStatus($status): SharedProsperityBalanceLogEntity
+    {
+        $this->status = $status;
+        return $this;
+    }
+
     public function getCreateTime()
     {
         return $this->createTime;
     }
 
-    public function setCreateTime($createTime): SharedProsperityBalanceEntity
+    public function setCreateTime($createTime): SharedProsperityBalanceLogEntity
     {
         $this->createTime = $createTime;
         return $this;