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

app/common/dao/dividend/DividendLogDao.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace app\common\dao\dividend;
+
+use app\common\dao\BaseDao;
+use app\common\model\dividend\DividendLog;
+
+class DividendLogDao extends BaseDao
+{
+
+    protected function getModel(): string
+    {
+        return DividendLog::class;
+    }
+}

app/common/enum/dividend/DividendLogEnum.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace app\common\enum\dividend;
+
+use app\common\enum\CommonEnum;
+
+class DividendLogEnum extends CommonEnum
+{
+    // 1-合伙人分红；2-联创分红；3-股权分红；4-佣金补贴
+    const TYPE = [
+        'PartnerProfit' => ['code' => 1, 'name' => '合伙人分红'],
+        'CoFounderProfit' => ['code' => 2, 'name' => '联创分红'],
+        'EquityDividend' => ['code' => 3, 'name' => '股权分红'],
+        'CommissionSubsidy' => ['code' => 4, 'name' => '佣金补贴']
+    ];
+}

app/common/model/dividend/DividendLog.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace app\common\model\dividend;
+
+use app\common\model\BaseModel;
+
+class DividendLog extends BaseModel
+{
+
+    public static function tablePk(): string
+    {
+        return 'id';
+    }
+
+    public static function tableName(): string
+    {
+        return 'dividend_logs';
+    }
+}

app/common/repositories/dividend/DividendLogRepository.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace app\common\repositories\dividend;
+
+use app\common\dao\dividend\DividendLogDao;
+use app\common\repositories\BaseRepository;
+use app\entity\data\dividend\DividendLogEntity;
+
+class DividendLogRepository extends BaseRepository
+{
+
+    protected $dao;
+
+    /**
+     * DividendLogRepository constructor.
+     * @param DividendLogDao $dao
+     */
+    public function __construct(DividendLogDao $dao)
+    {
+        $this->dao = $dao;
+    }
+
+    public function create($data)
+    {
+        return $this->dao->create($data);
+    }
+
+    /**
+     * @param DividendLogEntity $dividendLogEntity
+     * @return DividendLogEntity
+     */
+    public function createByEntity(DividendLogEntity $dividendLogEntity): DividendLogEntity
+    {
+        $result = $this->create($dividendLogEntity->toUnderlineArray())->toArray();
+        /** @var DividendLogEntity $entity */
+        $entity = DividendLogEntity::newInstance($result);
+        return $entity;
+    }
+}

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

@@ -4,7 +4,15 @@
 namespace app\controller\api\store\merchant;
 
 
+use app\common\enum\CommonEnum;
+use app\common\enum\dividend\DividendLogEnum;
+use app\common\repositories\dividend\DividendLogRepository;
+use app\entity\data\dividend\DividendLogEntity;
+use think\db\exception\DataNotFoundException;
+use think\db\exception\DbException;
+use think\db\exception\ModelNotFoundException;
 use think\facade\Db;
+use think\facade\Log;
 use think\Request;
 
 class TaskPartnerProfits
@@ -77,6 +85,95 @@ class TaskPartnerProfits
         return $totalPv;
     }
 
+    /**
+     * 获取周期内 所有 有效的下单人ID列表
+     * @param $startTime
+     * @param $endTime
+     * @param array $removeUserIdList
+     * @return array
+     */
+    public function getOrderUidListByTime($startTime, $endTime, array $removeUserIdList = []): array
+    {
+        $uidList = [];
+        try {
+            // 本地订单
+            $storeOrder = Db::name("store_order")
+                ->where('mer_id', '<>', CommonEnum::DESIGN_MERCHANT_ID['Repurchase']['code'])
+                ->whereNotIn('uid', $removeUserIdList)
+                ->whereIn('status', [0, 1, 2, 3])
+                ->whereBetween("pay_time", [$startTime, $endTime])
+                ->whereNotNull("pay_time") // 排除 pay_time 为 NULL 的订单
+                ->field('mer_id, status, pay_time, total_price, uid')
+                ->select()
+                ->toArray();
+            $storeOrderUidList = array_column($storeOrder, 'uid');
+            $uidList = array_merge($uidList, $storeOrderUidList);
+
+            // 话费订单 order_huafei
+            $orderHuafei = Db::name("order_huafei")
+                ->whereNotIn('uid', $removeUserIdList)
+                ->where('status', '<>', 0) // 只要不是待支付的 即算是有效活跃度
+                ->whereBetween("finish_time", [$startTime, $endTime])
+                ->field('order_huafei_id, uid, status, finish_time, amount_price')
+                ->select()
+                ->toArray();
+            $orderHuafeiUidList = array_column($orderHuafei, 'uid');
+            $uidList = array_merge($uidList, $orderHuafeiUidList);
+
+            // 三方订单
+            // 京东
+            $orderJd = Db::name("order_jd")
+                ->whereNotIn('uid', $removeUserIdList)
+                ->where('status', '<>', 15) // 只要不是待支付的 即算是有效活跃度
+                ->whereBetween("create_time", [$startTime, $endTime])
+                ->field('order_jd_id, uid, status, create_time, price')
+                ->select()
+                ->toArray();
+            $orderJdUidList = array_column($orderJd, 'uid');
+            $uidList = array_merge($uidList, $orderJdUidList);
+            // 淘宝
+            $orderTb = Db::name("order_tb")
+                ->whereNotIn('uid', $removeUserIdList)
+                // ->where('status', '<>', 15) // 只要不是待支付的 即算是有效活跃度 不能明确状态信息
+                ->whereBetween("create_time", [$startTime, $endTime])
+                ->field('order_tb_id, uid, tk_status, create_time, pay_price')
+                ->select()
+                ->toArray();
+            $orderTbUidList = array_column($orderTb, 'uid');
+            $uidList = array_merge($uidList, $orderTbUidList);
+            // 拼多多
+            $orderPdd = Db::name("order_pdd")
+                ->whereNotIn('uid', $removeUserIdList)
+                ->where('pin_order_status', '<>', -1) // 只要不是待支付的 即算是有效活跃度 不能明确状态信息
+                ->whereBetween("group_time", [strtotime($startTime), strtotime($endTime)])
+                ->field('order_pdd_id, uid, pin_order_status, create_time, pay_money')
+                ->select()
+                ->toArray();
+            $orderPddUidList = array_column($orderPdd, 'uid');
+            $uidList = array_merge($uidList, $orderPddUidList);
+            // 唯品会
+            $orderVip = Db::name("order_vip")
+                ->whereNotIn('uid', $removeUserIdList)
+                ->where('status', '<>', 0) // 只要不是待支付的 即算是有效活跃度 不能明确状态信息
+                ->whereBetween("order_time", [strtotime($startTime), strtotime($endTime)])
+                ->field('order_vip_id, uid, status, order_time, pay_money')
+                ->select()
+                ->toArray();
+            $orderVipUidList = array_column($orderVip, 'uid');
+            $uidList = array_merge($uidList, $orderVipUidList);
+        } catch (DataNotFoundException|ModelNotFoundException|DbException $e) {
+            Log::error('分红-获取下单用户列表失败：' . json_encode([
+                    'error_message' => $e->getMessage(),
+                    'error_file' => $e->getFile(),
+                    'error_line' => $e->getLine(),
+                    'error_code' => $e->getCode(),
+                    'exception_class' => get_class($e),
+                    'trace' => $e->getTraceAsString()
+                ], JSON_UNESCAPED_UNICODE));
+        }
+        return $uidList;
+    }
+
     public function getRedEnvelopeByTime($startTime, $endTime, $removeUserIdList = [])
     {
         // 查询指定时间区间内的所有订单，并排除 pay_time 为 NULL 的订单
@@ -121,6 +218,7 @@ class TaskPartnerProfits
 
         $startTime = $request->param('startTime', null);
         $endTime = $request->param('endTime', null);
+        $remark = $request->param('remark', '');
         $isTest = $request->param('isTest', 1);
         $maxAllocationAmount = $request->param('maxAllocationAmount', null);
 
@@ -184,6 +282,18 @@ class TaskPartnerProfits
             ->select()
             ->toArray();//星级等级
 
+        // 组装日志信息
+        /** @var DividendLogEntity $dividendLogEntity */
+        $dividendLogEntity = DividendLogEntity::newInstance();
+        $dividendLogEntity->setType(DividendLogEnum::TYPE['PartnerProfit']['code'])
+            ->setStartTime($startTime)
+            ->setEndTime($endTime)
+            ->setPerformance($performance)
+            ->setAbatement(json_encode([['code' => 'redEnvelope', 'name' => '红包', 'reason' => '发放的红包金额，需要从赚取的业绩中扣除', 'number' => $redEnvelope]]))
+            ->setAllocated($weekRecord)
+            ->setRule(json_encode($starList))
+            ->setRemark($remark);
+
         // 2、循环星级信息 并分组归类
         $salesArr = array_column($starList, null, 'title');
 
@@ -251,6 +361,10 @@ class TaskPartnerProfits
             //周总业绩(8400) * 合伙人级别的分佣比例(15%) = 可分红的佣金(1260)
             //            $salesArr[$key]['fs_money_nums'] = round($weekRecord * $value['profit_rate'], 2);
             $salesArr[$key]['fs_money_nums'] = floor(($weekRecord * ($value['profit_rate'] / 100)) * 100) / 100;
+
+            // 日志表 记录应分配金额
+            $dividendLogEntity->setExpected(bcadd($dividendLogEntity->getExpected() ?: '0.00', $salesArr[$key]['fs_money_nums'], 2));
+
             //可分红的业绩(分为两半，各50%，一部分是分给双联盟比例，一部分是小业绩比例)
             //把本周的业绩(8400) * 合伙人级别的分佣比例(15%) * 0.5 = 630（可分红佣金的 50%）
             //            $salesArr[$key]['fs_money'] = round($salesArr[$key]['fs_money_nums'] / 2, 2);
@@ -298,6 +412,11 @@ class TaskPartnerProfits
             }
         }
 
+        // 6、记录日志
+        // 获取周期内所有符合条件的订单
+        $feeUids = $this->getOrderUidListByTime($startTime, $endTime, $removeUserIdList);
+
+
         // 7、执行分红
         $testRecord = [];
         foreach ($salesArr as $key => $value) {
@@ -350,15 +469,27 @@ class TaskPartnerProfits
                 //                }
 
                 if ($isTest == 0) {
+
+                    if (!in_array($v, $feeUids)) {
+                        $feeWaiverUids = $dividendLogEntity->getFeeWaiverUids() ?: [];
+                        $feeWaiverUids[] = [
+                            'uid' => $v,
+                            'remark' => '周期内未完成订单任务'
+                        ];
+                        $dividendLogEntity->setFeeWaiverUids($feeWaiverUids);
+                        continue;
+                    }
+                    $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,
                         'create_time' => date('Y-m-d H:i:s')
                     ];
-                    $con_data = Db::name('test_log')->insert($datas_log);   //数据存到2.0数据表中
+                    Db::name('test_log')->insert($datas_log);   //数据存到2.0数据表中
 
                     # code...
-                    $res = Db::name("user")->where("uid", $v)->inc("total_amount_old", $yj_90)->save();
+                    Db::name("user")->where("uid", $v)->inc("total_amount_old", $yj_90)->save();
 
                     Db::name("user")->where("uid", $v)->inc("amount_old", $yj_90)->save();//不用冻结金额和提现额度来限制佣金发放
                     Db::name("user")->where("uid", $v)->inc("brokerage_price", $yj_90)->save();
@@ -411,6 +542,12 @@ class TaskPartnerProfits
             }
             $salesArr['cs'] = $testRecord;
         }
+        $dividendLogEntity->setResult(json_encode($salesArr, JSON_UNESCAPED_UNICODE));
+
+        /** @var DividendLogRepository $dividendLogRepository */
+        $dividendLogRepository = app()->make(DividendLogRepository::class);
+        $dividendLogRepository->createByEntity($dividendLogEntity);
+
         return json($salesArr);
     }
 

app/entity/data/dividend/DividendLogEntity.php

@@ -0,0 +1,281 @@
+<?php
+
+namespace app\entity\data\dividend;
+
+use app\entity\data\DataEntity;
+
+class DividendLogEntity extends DataEntity
+{
+    public $id = null;  // 主键
+    public $type = null;  // 分润类型：1合伙人分红；2联创分红；3股权分红；4佣金补贴
+    public $startTime = null;  // 分润周期开始时间
+    public $endTime = null;  // 分润周期结束时间
+    public $performance = null;  // 业绩
+    public $abatement = null;  // 扣减项（原因）
+    public $allocated = null;  // 实际分配业绩
+    public $rule = null;  // 分配规则
+    public $expected = null;
+    public $feeWaiverUids = null;  // 免分配人员ID集合（可能由于业绩不达标）
+    public $arrivalPoint = null;  // 到账金额
+    public $result = null;  // 实际分配结果
+    public $remark = null;  // 备注
+    public $createTime = null;  // 创建时间
+
+    /**
+     * @return mixed
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * @param mixed $id
+     * @return DividendLogEntity
+     */
+    public function setId($id): DividendLogEntity
+    {
+        $this->id = $id;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getType()
+    {
+        return $this->type;
+    }
+
+    /**
+     * @param mixed $type
+     * @return DividendLogEntity
+     */
+    public function setType($type): DividendLogEntity
+    {
+        $this->type = $type;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getStartTime()
+    {
+        return $this->startTime;
+    }
+
+    /**
+     * @param mixed $startTime
+     * @return DividendLogEntity
+     */
+    public function setStartTime($startTime): DividendLogEntity
+    {
+        $this->startTime = $startTime;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getEndTime()
+    {
+        return $this->endTime;
+    }
+
+    /**
+     * @param mixed $endTime
+     * @return DividendLogEntity
+     */
+    public function setEndTime($endTime): DividendLogEntity
+    {
+        $this->endTime = $endTime;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getPerformance()
+    {
+        return $this->performance;
+    }
+
+    /**
+     * @param mixed $performance
+     * @return DividendLogEntity
+     */
+    public function setPerformance($performance): DividendLogEntity
+    {
+        $this->performance = $performance;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getAbatement()
+    {
+        return $this->abatement;
+    }
+
+    /**
+     * @param mixed $abatement
+     * @return DividendLogEntity
+     */
+    public function setAbatement($abatement): DividendLogEntity
+    {
+        $this->abatement = $abatement;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getAllocated()
+    {
+        return $this->allocated;
+    }
+
+    /**
+     * @param mixed $allocated
+     * @return DividendLogEntity
+     */
+    public function setAllocated($allocated): DividendLogEntity
+    {
+        $this->allocated = $allocated;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getRule()
+    {
+        return $this->rule;
+    }
+
+    /**
+     * @param mixed $rule
+     * @return DividendLogEntity
+     */
+    public function setRule($rule): DividendLogEntity
+    {
+        $this->rule = $rule;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getExpected()
+    {
+        return $this->expected;
+    }
+
+    /**
+     * @param mixed $expected
+     * @return DividendLogEntity
+     */
+    public function setExpected($expected): DividendLogEntity
+    {
+        $this->expected = $expected;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getFeeWaiverUids()
+    {
+        if (is_string($this->feeWaiverUids)) {
+            return json_decode($this->feeWaiverUids, true);
+        }
+        return $this->feeWaiverUids;
+    }
+
+    /**
+     * @param mixed $feeWaiverUids
+     * @return DividendLogEntity
+     */
+    public function setFeeWaiverUids($feeWaiverUids): DividendLogEntity
+    {
+        if (is_array($feeWaiverUids)) {
+            $feeWaiverUids = json_encode($feeWaiverUids);
+        }
+        $this->feeWaiverUids = $feeWaiverUids;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getArrivalPoint()
+    {
+        return $this->arrivalPoint;
+    }
+
+    /**
+     * @param mixed $arrivalPoint
+     * @return DividendLogEntity
+     */
+    public function setArrivalPoint($arrivalPoint): DividendLogEntity
+    {
+        $this->arrivalPoint = $arrivalPoint;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getResult()
+    {
+        return $this->result;
+    }
+
+    /**
+     * @param mixed $result
+     * @return DividendLogEntity
+     */
+    public function setResult($result): DividendLogEntity
+    {
+        $this->result = $result;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getRemark()
+    {
+        return $this->remark;
+    }
+
+    /**
+     * @param mixed $remark
+     * @return DividendLogEntity
+     */
+    public function setRemark($remark): DividendLogEntity
+    {
+        $this->remark = $remark;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getCreateTime()
+    {
+        return $this->createTime;
+    }
+
+    /**
+     * @param mixed $createTime
+     * @return DividendLogEntity
+     */
+    public function setCreateTime($createTime): DividendLogEntity
+    {
+        $this->createTime = $createTime;
+        return $this;
+    }
+}