分红-增加限制分配条件，并增加记录日志

app/common/enum/dividend/DividendLogEnum.php

@@ -13,4 +13,9 @@ class DividendLogEnum extends CommonEnum
         'EquityDividend' => ['code' => 3, 'name' => '股权分红'],
         'CommissionSubsidy' => ['code' => 4, 'name' => '佣金补贴']
     ];
+
+    const IS_TEST = [
+        'No' => ['code' => 0, 'name' => '否'],
+        'Yes' => ['code' => 1, 'name' => '是']
+    ];
 }

app/controller/api/store/merchant/TaskPartnerProfits.php

@@ -292,6 +292,7 @@ class TaskPartnerProfits
             ->setAbatement(json_encode([['code' => 'redEnvelope', 'name' => '红包', 'reason' => '发放的红包金额，需要从赚取的业绩中扣除', 'number' => $redEnvelope]]))
             ->setAllocated($weekRecord)
             ->setRule(json_encode($starList))
+            ->setIsTest($isTest)
             ->setRemark($remark);
 
         // 2、循环星级信息 并分组归类
@@ -477,10 +478,9 @@ class TaskPartnerProfits
                     $dividendLogEntity->setFeeWaiverUids($feeWaiverUids);
                     continue;
                 }
+                $dividendLogEntity->setArrivalPoint(bcadd($dividendLogEntity->getArrivalPoint() ?: '0.00', $allAward, 2));
 
                 if ($isTest == 0) {
-                    $dividendLogEntity->setArrivalPoint(bcadd($dividendLogEntity->getArrivalPoint() ?: '0.00', $allAward, 2));
-
                     $userdatassss = db::name("old_user_jbp")->where("id", $v)->find();
                     $datas_log = [
                         'note' => "名称:" . $userdatassss['nick_name'] . " 用户:" . $v . " 双联盟总业绩:" . $maxValueAll . " 我的双区业绩:" . $myBill . " 小区总业绩:" . $userPvSmallNum . " 我的业绩小的:" . $myMixMoney . "  可分红佣金:" . $amount . "  可分红总佣金:" . $fsMoneyNums . "  小区业绩可分红:" . $myMixMoney . " 双区业绩可分红:" . $myWeightMoney . " 实际分得:" . $yj_90,

app/entity/data/dividend/DividendLogEntity.php

@@ -18,6 +18,7 @@ class DividendLogEntity extends DataEntity
     public $feeWaiverUids = null;  // 免分配人员ID集合（可能由于业绩不达标）
     public $arrivalPoint = null;  // 到账金额
     public $result = null;  // 实际分配结果
+    public $isTest = null;  // 是否为测试数据
     public $remark = null;  // 备注
     public $createTime = null;  // 创建时间
 
@@ -246,6 +247,24 @@ class DividendLogEntity extends DataEntity
     /**
      * @return mixed
      */
+    public function getIsTest()
+    {
+        return $this->isTest;
+    }
+
+    /**
+     * @param mixed $isTest
+     * @return DividendLogEntity
+     */
+    public function setIsTest($isTest): DividendLogEntity
+    {
+        $this->isTest = $isTest;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
     public function getRemark()
     {
         return $this->remark;