From 8121a08267c5d13708df744d5d6a129cc9a04e9f Mon Sep 17 00:00:00 2001 From: wuhui_zzw <1760308791@qq.com> Date: Mon, 18 Dec 2023 18:32:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E7=BB=8F=E9=94=80?= =?UTF-8?q?=E5=95=86=E5=8F=97=E7=9B=8A=E6=98=BE=E7=A4=BA=E6=9C=AA=E6=8F=90?= =?UTF-8?q?=E7=8E=B0=E6=95=B0=E9=87=8F=20=E4=BF=AE=E5=A4=8D=EF=BC=9A?= =?UTF-8?q?=E5=90=88=E4=BC=99=E4=BA=BA=E5=8F=97=E7=9B=8A=20=E6=8F=90?= =?UTF-8?q?=E7=8E=B0=E6=89=8B=E7=BB=AD=E8=B4=B9=E7=BB=9F=E8=AE=A1=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/admin/IndexController.php | 20 ++++++++++++- .../src/api/IndexController.php | 8 +++-- .../src/models/ContributionBonusLog.php | 2 +- .../src/admin/SetController.php | 29 +++++++++++++++---- .../src/admin/TeamAgencyController.php | 24 ++++++++++++++- 5 files changed, 71 insertions(+), 12 deletions(-) diff --git a/plugins/cultural-space/src/admin/IndexController.php b/plugins/cultural-space/src/admin/IndexController.php index 6960e178..5a7c889d 100644 --- a/plugins/cultural-space/src/admin/IndexController.php +++ b/plugins/cultural-space/src/admin/IndexController.php @@ -51,7 +51,25 @@ class IndexController extends BaseController{ // (new ContributionBonusLog())->contributionBonusSettlement(); - debug(["结束" => time()]); + + // 遍历所有订单 以天为周期重新计算贡献值分红 + // $minTime = Order::uniacid()->where('pay_time','>',0)->min('pay_time'); + // $startTime = strtotime(date("Y-m-d",$minTime));// 本年1号0点 + // $endTime = strtotime(date("Y-m-d",$minTime). " +1 day");// 下一年1号0点 + // do { + // + // (new ContributionBonusLog())->bonusInit($startTime,$endTime); + // (new ContributionBonusLog())->contributionBonusSettlement(); + // echo "
执行时间：".date("Y-m-d H:i:s",$startTime)."结束时间：".date("Y-m-d H:i:s",$endTime); + // + // + // + // $startTime = strtotime(date("Y-m-d",$startTime). " +1 day");// 本年1号0点 + // $endTime = strtotime(date("Y-m-d",$endTime). " +1 day");// 下一年1号0点 + // } while ($endTime <= time()); + + + debug(["结束,," => time()]); } diff --git a/plugins/cultural-space/src/api/IndexController.php b/plugins/cultural-space/src/api/IndexController.php index fd11b88e..e1cedd8c 100644 --- a/plugins/cultural-space/src/api/IndexController.php +++ b/plugins/cultural-space/src/api/IndexController.php @@ -516,7 +516,7 @@ class IndexController extends ApiController{ 'service_income' => CommissionOrder::getIncome((int)$uid,(int)1,'undrawn',2)->sum('yz_member_income.amount'),// 服务受益 'contribution_income' => TeamDividendModel::getTypeTotalIncome((int)$uid,(int)5)->sum('yz_member_income.amount'),// 生态贡献 // 'commission' => TeamDividendModel::getTypeTotalIncome((int)$uid,(int)6)->sum('yz_member_income.amount'),// 生态服务 - 'commission' => TeamDividendModel::getTypeTotalIncome((int)$uid,(int)4)->sum('yz_member_income.amount'),// 经销商受益 + 'commission' => TeamDividendModel::getTypeTotalIncome((int)$uid,(int)4,'undrawn')->sum('yz_member_income.amount'),// 经销商受益 'share_reward' => CommissionOrder::getIncome((int)$uid,(int)1,'undrawn',1)->sum('yz_member_income.amount'),// 销售受益 // 'commission' => $poundage,// 总手续费 // 'withdrawal' => $amount,// 总提现金额 @@ -538,8 +538,8 @@ class IndexController extends ApiController{ break; // 股权收益 合伙人受益 case 'shareholding': - $poundage = Income::uniacid() + ->select(['yz_withdraw.id','yz_withdraw.poundage']) ->leftJoin('yz_shareholder_dividend','yz_shareholder_dividend.id','yz_member_income.incometable_id') ->leftJoin('yz_withdraw_income_apply','yz_withdraw_income_apply.income_id','yz_member_income.id') ->leftJoin('yz_withdraw','yz_withdraw.id','yz_withdraw_income_apply.withdraw_id') @@ -547,7 +547,9 @@ class IndexController extends ApiController{ ->where('yz_member_income.status', Income::STATUS_WITHDRAW) ->where('yz_member_income.member_id', $uid) ->where('yz_shareholder_dividend.income_type', 1) - ->groupBy('yz_withdraw_income_apply.withdraw_id') + // ->groupBy('yz_withdraw_income_apply.withdraw_id') + ->distinct() + // ->get()->toArray(); ->sum('yz_withdraw.poundage'); diff --git a/plugins/cultural-space/src/models/ContributionBonusLog.php b/plugins/cultural-space/src/models/ContributionBonusLog.php index eba53849..94499702 100644 --- a/plugins/cultural-space/src/models/ContributionBonusLog.php +++ b/plugins/cultural-space/src/models/ContributionBonusLog.php @@ -135,7 +135,7 @@ class ContributionBonusLog extends BaseModel{ ->where('yz_order.pay_time','<',$endTime) ->where('yz_order.price','>',0) ->whereIn('yz_order.status',[Order::WAIT_SEND,Order::WAIT_RECEIVE,Order::COMPLETE])// 待发货、待收货、已完成 - ->sum('yz_order_goods.price'); + ->sum('yz_order_goods.payment_amount'); // $this->orderTotalMoney = (float)Order::uniacid() // ->where('pay_time','>=',$startTime) // ->where('pay_time','<',$endTime) diff --git a/plugins/shareholder-dividend/src/admin/SetController.php b/plugins/shareholder-dividend/src/admin/SetController.php index 94acab11..d370ea50 100644 --- a/plugins/shareholder-dividend/src/admin/SetController.php +++ b/plugins/shareholder-dividend/src/admin/SetController.php @@ -8,6 +8,7 @@ use app\common\helpers\Url; use app\common\models\Goods; use app\common\models\Income; use app\common\models\notice\MessageTemp; +use app\common\models\Order; use Yunshop\ShareholderDividend\models\ShareholderDividendModel; use Yunshop\ShareholderDividend\models\TeamAgentModel; use Yunshop\ShareholderDividend\services\TimedTaskService; @@ -38,6 +39,28 @@ class SetController extends BaseController dd('ok'); } + public function test(){ + + + // 遍历全部订单 重新处理按单结算的股东分红 + // $orderList = Order::uniacid()->pluck('id')->toArray(); + // foreach($orderList as $orderId){ + // + // (new TimedTaskService())->shareholderDividendOrder($orderId); + // } + + + + + debug("调试完成"); + } + + + + + + + /** * @return \Laracasts\Flash\FlashNotifier|mixed|string * @throws \Throwable @@ -94,12 +117,6 @@ class SetController extends BaseController ])->render(); } -// public function test() -// { -// (new \Yunshop\ShareholderDividend\services\TimedTaskService)->handle(); -// return $this->message('设置成功', Url::absoluteWeb('plugin.shareholder-dividend.admin.set')); -// } - // plugin.channel.admin.goods.goods.search public function searchGoods() { diff --git a/plugins/team-dividend/src/admin/TeamAgencyController.php b/plugins/team-dividend/src/admin/TeamAgencyController.php index de1fea0b..17491527 100644 --- a/plugins/team-dividend/src/admin/TeamAgencyController.php +++ b/plugins/team-dividend/src/admin/TeamAgencyController.php @@ -391,7 +391,29 @@ class TeamAgencyController extends BaseController - debug("结束"); + // 全部订单重新处理分红 + // $orderList = Order::uniacid()->get(); + // foreach($orderList as $order){ + // // $order = Order::find(43); + // $TeamReturnService = ReturnConfig::getClass(); + // if (app('plugins')->isEnabled('team-sideways')) debug('经销商订单创建终止:team-sideways'); + // $set = $order->getSetting('plugin.team_dividend'); + // if (!$set['is_team_dividend']) debug('是否开启经销商插件'); + // $buyMember = $order->belongsToMember; + // $agents = GetAgentsService::index($set, $order->uid, $order->create_time); + // foreach ($order->hasManyOrderGoods as $order_goods) { + // // 普通经销商提成处理 + // $TeamReturnService->setData($order, $set, $buyMember, $order_goods, $agents); + // $TeamReturnService->handle(); + // $this->totalDividend += $TeamReturnService->totalDividend; + // } + // } + + + + + + debug("结束。。。"); }