Merge branch 'master' into dev

app/common/dao/dividend/DividendLogDao.php

@@ -4,6 +4,7 @@ namespace app\common\dao\dividend;
 
 use app\common\dao\BaseDao;
 use app\common\model\dividend\DividendLog;
+use app\entity\data\dividend\DividendLogEntity;
 
 class DividendLogDao extends BaseDao
 {
@@ -12,4 +13,29 @@ class DividendLogDao extends BaseDao
     {
         return DividendLog::class;
     }
+
+    /**
+     * @param array $idList
+     * @return DividendLogEntity[]
+     */
+    public function getDividendLogEntityListByIdList(array $idList): array
+    {
+        $entityList = [];
+        try {
+            /** @var DividendLog $model */
+            $model = $this->getModel();
+            $dataRes = $model::getDB()
+                ->whereIn('id', $idList)
+                ->select()
+                ->toArray();
+            if (!empty($dataRes)) {
+                $entityList = array_map(function ($data) {
+                    return DividendLogEntity::newInstance($data);
+                }, $dataRes);
+            }
+        } catch (\Exception $e) {
+
+        }
+        return $entityList;
+    }
 }

app/common/repositories/dividend/DividendLogRepository.php

@@ -20,6 +20,31 @@ class DividendLogRepository extends BaseRepository
         $this->dao = $dao;
     }
 
+    /**
+     * @param int $id
+     * @return DividendLogEntity
+     */
+    public function getDividendLogEntityById(int $id): DividendLogEntity
+    {
+        $entityList = $this->getDividendLogEntityListByIdList([$id]);
+        $entity = array_shift($entityList);
+        if ($entity instanceof DividendLogEntity) {
+            return $entity;
+        } else {
+            /** @var DividendLogEntity */
+            return DividendLogEntity::newInstance();
+        }
+    }
+
+    /**
+     * @param array $idList
+     * @return DividendLogEntity[]
+     */
+    public function getDividendLogEntityListByIdList(array $idList): array
+    {
+        return $this->dao->getDividendLogEntityListByIdList($idList);
+    }
+
     public function create($data)
     {
         return $this->dao->create($data);

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

@@ -1013,4 +1013,132 @@ class TaskPartnerProfits
 
         Db::name('user_sign_fugou')->insert($bill);
     }
+
+    /**
+     * 补发分红
+     * @param Request $request
+     * @return mixed
+     */
+    public function resendUnissued(Request $request)
+    {
+        $dividendLogId = $request->param('dividendLogId', 0);
+        if (empty($dividendLogId)) {
+            return app('json')->fail('无效记录ID');
+        }
+        /** @var DividendLogRepository $dividendLogRepository */
+        $dividendLogRepository = app()->make(DividendLogRepository::class);
+        $dividendLogEntity = $dividendLogRepository->getDividendLogEntityById($dividendLogId);
+        if (empty($dividendLogEntity->getId())) {
+            return app('json')->fail('无效记录');
+        }
+
+        $dividendLogEntityByResend = DividendLogEntity::newInstance()
+            ->setType($dividendLogEntity->getType())
+            ->setStartTime($dividendLogEntity->getStartTime())
+            ->setEndTime($dividendLogEntity->getEndTime())
+            ->setPerformance($dividendLogEntity->getPerformance())
+            ->setAbatement($dividendLogEntity->getAbatement())
+            ->setAllocated($dividendLogEntity->getAllocated())
+            ->setRule($dividendLogEntity->getRule())
+            ->setExpected(bcsub($dividendLogEntity->getExpected(), $dividendLogEntity->getArrivalPoint(), 2))
+            ->setFeeWaiverUids([])
+            ->setResult($dividendLogEntity->getResult())
+            ->setIsTest(DividendLogEnum::IS_TEST['No']['code'])
+            ->setReissueId($dividendLogEntity->getId());
+
+        $startTime = $dividendLogEntity->getStartTime();
+        $endTime = $dividendLogEntity->getEndTime();
+        $performance = $dividendLogEntity->getPerformance();
+        $weekRecord = $dividendLogEntity->getAllocated();
+        $feeWaiverUids = $dividendLogEntity->getFeeWaiverUids();
+        $feeWaiverUids = array_column($feeWaiverUids, 'uid');
+        $redEnvelope = 0.00;
+        if (!empty($dividendLogEntity->getAbatement())) {
+            $abatement = json_decode($dividendLogEntity->getAbatement(), true);
+            if (is_array($abatement)) {
+                foreach ($abatement as $item) {
+                    if ($item['code'] == 'redEnvelope') {
+                        $redEnvelope = $item['number'] ?? 0.00;
+                    }
+                }
+            }
+        }
+
+        $salesArr = $dividendLogEntity->getResult();
+        foreach ($salesArr as $key => $value) {
+            if (empty($value)) {
+                continue;
+            }
+            if (count($value['dividerPeoplePv']) <= 0) {
+                continue;
+            }
+            $fsMoneyNums = $value['fs_money_nums'];//中级合伙人级别，可分红的总佣金
+            $maxValueAll = $value['maxValueAll'];//当前级别合伙人下面所有的双联盟业绩
+            $sumOfOthersAll = $value['sumOfOthersAll'];//当前级别合伙人下面所有的小区(业绩小的部分)总业绩
+
+            //每人分红金额
+            foreach ($value['dividerPeoplePv'] as $uid => $item) {
+
+
+                $allAward = bcadd($item['myWeightMoney'], $item['myMixMoney'], 2);
+                //90%给佣金，10给复购金
+                $yj_90 = floor($allAward * 0.9 * 100) / 100;
+                $fg_10 = floor($allAward * 0.1 * 100) / 100;
+
+                if (!in_array($uid, $feeWaiverUids)) {
+                    // $feeWaiverUids = $dividendLogEntity->getFeeWaiverUids() ?: [];
+                    // $feeWaiverUids[] = [
+                    //     'uid' => $uid,
+                    //     'remark' => '此次发放为补发，只发放上次未发放人员数据'
+                    // ];
+                    // $dividendLogEntity->setFeeWaiverUids($feeWaiverUids);
+                    continue;
+                }
+                $dividendLogEntity->setArrivalPoint(bcadd($dividendLogEntity->getArrivalPoint() ?: '0.00', $allAward, 2));
+                $arrivalInfo = $dividendLogEntity->getArrivalInfo() ?: [];
+                $arrivalInfo[$uid]['allAward'] = $allAward;
+                $arrivalInfo[$uid]['orderInfo'] = [];
+                $dividendLogEntity->setArrivalInfo($arrivalInfo);
+
+
+                # code...
+                Db::name("user")->where("uid", $uid)->inc("total_amount_old", $yj_90)->save();
+                Db::name("user")->where("uid", $uid)->inc("amount_old", $yj_90)->save();//不用冻结金额和提现额度来限制佣金发放
+                Db::name("user")->where("uid", $uid)->inc("brokerage_price", $yj_90)->save();
+                Db::name("user")->where("uid", $uid)->inc("fugou", $fg_10)->save();
+
+                $this->change_user_log($uid, 'amount_old', 1, $yj_90, "member_award", "星级分红入账" . "-" . $value['title']);//释放佣金
+
+                // 入账记录
+                $week_data = [];
+                $week_data['user_id'] = $uid;
+                $week_data['user_group'] = $value['user_group'];
+                $week_data['start_time'] = $startTime;
+                $week_data['end_time'] = $endTime;
+                $week_data['performance'] = $performance;
+                $week_data['red_envelope'] = $redEnvelope;
+                $week_data['reality_performance'] = $weekRecord;
+                $week_data['dividend_ratio'] = $value['profit_rate'];
+                $week_data['dividend'] = $fsMoneyNums;
+                $week_data['performance_part'] = $item['sumOfOthers'] ?? '0.00';
+                $week_data['performance_part_all'] = $sumOfOthersAll;
+                $week_data['part_money'] = $item['myMixMoney'];
+                $week_data['performance_total'] = bcadd($item['maxValue'] ?? '0.00', $item['sumOfOthers'] ?? '0.00', 2);
+                $week_data['performance_total_all'] = ($maxValueAll + $sumOfOthersAll);
+                $week_data['total_money'] = $item['myWeightMoney'];
+                $week_data['brokerage'] = $yj_90;
+                $week_data['fugou'] = $fg_10;
+                $week_data['radio'] = 2;
+                $week_data['create_time'] = date('Y-m-d H:i:s');
+                Db::name("partner_profit_records")->insert($week_data);
+
+                $this->bill_user_log111111($uid, "合伙人分佣", $yj_90, "合伙人分佣明细入账", 11);//联创分佣明细2.0系统
+                $this->fugou_user_log($uid, $fg_10, 16, 1, 1);//复购金明细入账
+            }
+        }
+        /** @var DividendLogRepository $dividendLogRepository */
+        $dividendLogRepository = app()->make(DividendLogRepository::class);
+        $dividendLogRepository->createByEntity($dividendLogEntityByResend);
+        return app('json')->success($salesArr);
+    }
 }

app/entity/data/dividend/DividendLogEntity.php

@@ -22,6 +22,7 @@ class DividendLogEntity extends DataEntity
     public $isTest = null;  // 是否为测试数据
     public $remark = null;  // 备注
     public $createTime = null;  // 创建时间
+    public $reissueId = null;  // 补发ID
 
     /**
      * @return mixed
@@ -322,4 +323,22 @@ class DividendLogEntity extends DataEntity
         $this->createTime = $createTime;
         return $this;
     }
+
+    /**
+     * @return mixed
+     */
+    public function getReissueId()
+    {
+        return $this->reissueId;
+    }
+
+    /**
+     * @param mixed $reissueId
+     * @return DividendLogEntity
+     */
+    public function setReissueId($reissueId): DividendLogEntity
+    {
+        $this->reissueId = $reissueId;
+        return $this;
+    }
 }

route/api.php

@@ -1336,6 +1336,7 @@ Route::group('api/', function () {
     ->middleware(\app\common\middleware\CheckSiteOpenMiddleware::class);
 Route::get('/test/assignment', 'api.store.merchant.Taskorderguquan/assignment');
 Route::get('test_hehuoren', 'api.store.merchant.TaskPartnerProfits/partnerProfits');
+Route::get('test_resendUnissued', 'api.store.merchant.TaskPartnerProfits/resendUnissued');
 Route::get('test_hehuoren_zero', 'api.store.merchant.TaskZeroLinePartnerProfits/partnerProfitsByZeroLine');
 Route::get('test_guquan', 'api.store.merchant.Taskorderguquan/lst6');
 Route::get('test_lianchuang', 'api.store.merchant.Taskorderlianc/lst2');