diff --git a/app/common/listeners/member/AfterOrderPaidListener.php b/app/common/listeners/member/AfterOrderPaidListener.php index 55e4397b..bd26d52a 100644 --- a/app/common/listeners/member/AfterOrderPaidListener.php +++ b/app/common/listeners/member/AfterOrderPaidListener.php @@ -19,7 +19,7 @@ class AfterOrderPaidListener \Log::debug('AfterOrderPaidEvent'.$model->id); - \Log::debug('推广资格-' . $model->uid); + // \Log::debug('推广资格-' . $model->uid); // Yy edit:2019-03-06 MemberRelation::checkOrderPay($model->uid, $model->id); } diff --git a/app/common/listeners/point/PointListener.php b/app/common/listeners/point/PointListener.php index 051305a1..337b8b04 100644 --- a/app/common/listeners/point/PointListener.php +++ b/app/common/listeners/point/PointListener.php @@ -182,7 +182,7 @@ class PointListener */ public function afterChangePoint(AfterOrderPaidEvent $event) { - \Log::debug('支付完成赠送积分,订单ID' . $event->getOrderModel()->id); + // \Log::debug('支付完成赠送积分,订单ID' . $event->getOrderModel()->id); $this->orderModel = Order::find($event->getOrderModel()->id); // 当会员为0 || 插件id为152(插件: 面对面服务). @@ -334,10 +334,10 @@ class PointListener //商品设置不是 订单支付后赠送 if ($goodsSale->point_type != 2) { - \Log::debug('支付-商品营销设置积分赠送,goods_id='.$orderGoods->goods_id,[ - 'order_goods_id' => $orderGoods->id, - 'point_type' => $goodsSale->point_type, - ]); + // \Log::debug('支付-商品营销设置积分赠送,goods_id='.$orderGoods->goods_id,[ + // 'order_goods_id' => $orderGoods->id, + // 'point_type' => $goodsSale->point_type, + // ]); continue; } diff --git a/app/common/models/MemberRelation.php b/app/common/models/MemberRelation.php index ec39e5d7..c3643427 100644 --- a/app/common/models/MemberRelation.php +++ b/app/common/models/MemberRelation.php @@ -363,7 +363,7 @@ class MemberRelation extends BaseModel if (empty($member)) { return; } - \Log::debug(sprintf('会员上线-%d', $member->parent_id)); + // \Log::debug(sprintf('会员上线-%d', $member->parent_id)); $become_child = intval($set->become_child); $curr_parent_id = $member->parent_id; $parent = MemberShopInfo::getMemberShopInfo($member->parent_id); @@ -391,8 +391,8 @@ class MemberRelation extends BaseModel } //发展下线资格 $isagent = $member->is_agent == 1 && $member->status == 2; - \Log::debug('会员成为推广员',$isagent); - \Log::debug('会员成为推广员设置',$set); + // \Log::debug('会员成为推广员',$isagent); + // \Log::debug('会员成为推广员设置',$set); if (!$isagent && empty($set->become_order)) { $become_term = unserialize($set->become_term); //或 @@ -434,8 +434,8 @@ class MemberRelation extends BaseModel $isagent = $member->is_agent == 1 && $member->status == 2; - \Log::debug('会员成为推广员',$isagent); - \Log::debug('会员成为推广员设置',$set); + // \Log::debug('会员成为推广员',$isagent); + // \Log::debug('会员成为推广员设置',$set); if (!$isagent && $set->become_order == 1) { $become_term = unserialize($set->become_term); //如果设置为空时添加默认值,防止程序出错 diff --git a/app/common/services/PayFactory.php b/app/common/services/PayFactory.php index ac9bab3f..10839749 100644 --- a/app/common/services/PayFactory.php +++ b/app/common/services/PayFactory.php @@ -558,7 +558,7 @@ class PayFactory break; case self::PAY_SEPARATE: - \Log::debug('--------payFactory---------'); + // \Log::debug('--------payFactory---------'); if (!app('plugins')->isEnabled('separate')) { throw new AppException('插件未开启'); } @@ -1109,7 +1109,7 @@ class PayFactory break; } - \Log::debug('--------payFactory---------$className', print_r(get_class($className), 1)); + // \Log::debug('--------payFactory---------$className', print_r(get_class($className), 1)); return $className; } diff --git a/app/common/services/finance/BalanceChange.php b/app/common/services/finance/BalanceChange.php index 7dd5717e..b8d93caa 100644 --- a/app/common/services/finance/BalanceChange.php +++ b/app/common/services/finance/BalanceChange.php @@ -413,7 +413,7 @@ class BalanceChange extends Credit { try { if ($this->source != 1) { - \Log::debug('不是充值不需要发送短信'); + // \Log::debug('不是充值不需要发送短信'); return true; } diff --git a/app/common/services/finance/CalculationPointService.php b/app/common/services/finance/CalculationPointService.php index 39cc2e78..98e82e71 100644 --- a/app/common/services/finance/CalculationPointService.php +++ b/app/common/services/finance/CalculationPointService.php @@ -58,7 +58,7 @@ class CalculationPointService } $point_data['remark'] = "购买商品[统一设置(比例:" . $point_set['give_point'] . ")]赠送[{$point_data['point']}]积分!"; } - \Log::debug("个人会员奖励积分kk:", $point_data); + // \Log::debug("个人会员奖励积分kk:", $point_data); return $point_data; } diff --git a/app/common/services/member/level/LevelUpgradeService.php b/app/common/services/member/level/LevelUpgradeService.php index a0a81051..e728d48c 100644 --- a/app/common/services/member/level/LevelUpgradeService.php +++ b/app/common/services/member/level/LevelUpgradeService.php @@ -115,7 +115,7 @@ class LevelUpgradeService $uniacid = $this->orderModel->uniacid; \Setting::$uniqueAccountId = \YunShop::app()->uniacid = $uniacid; //\Event::getListeners('app\common\events\order\AfterOrderPaidEvent'); - \Log::debug('checkUpgradeAfterPaid'); + // \Log::debug('checkUpgradeAfterPaid'); $set = \Setting::get('shop.member'); diff --git a/app/common/services/notice/applet/OrderPayedMinNotice.php b/app/common/services/notice/applet/OrderPayedMinNotice.php index 49f2908b..78528fa6 100644 --- a/app/common/services/notice/applet/OrderPayedMinNotice.php +++ b/app/common/services/notice/applet/OrderPayedMinNotice.php @@ -56,7 +56,7 @@ class OrderPayedMinNotice extends BaseMessageBody $this->getBackMember(); if (empty($this->temp_open)) { $back['message'] = "消息通知未开启"; - \Log::debug($back['message']); + // \Log::debug($back['message']); } $this->organizeData(); diff --git a/app/common/services/notice/official/OfficialMessageNotice.php b/app/common/services/notice/official/OfficialMessageNotice.php index 751c9f6c..e9177c97 100644 --- a/app/common/services/notice/official/OfficialMessageNotice.php +++ b/app/common/services/notice/official/OfficialMessageNotice.php @@ -23,7 +23,7 @@ class OfficialMessageNotice extends BaseMessageNotice { if (empty($this->template_id) || count($this->data) <= 0) { $this->back['status'] = 0; - $this->back['message'] = "模板ID为空或发送数据为空"; + // $this->back['message'] = "模板ID为空或发送数据为空"; return ; } diff --git a/app/common/services/notice/official/OrderLevelNotice.php b/app/common/services/notice/official/OrderLevelNotice.php index 654dd762..c16ec425 100644 --- a/app/common/services/notice/official/OrderLevelNotice.php +++ b/app/common/services/notice/official/OrderLevelNotice.php @@ -52,7 +52,7 @@ class OrderLevelNotice extends BaseMessageBody // TODO: Implement sendMessage() method. if(\Setting::get('shop.notice.other_toggle') == false){ - \Log::debug("--两级消息通知---",'已关闭'); + // \Log::debug("--两级消息通知---",'已关闭'); return false; } diff --git a/app/common/services/point/ParentReward.php b/app/common/services/point/ParentReward.php index fee847c5..122dd586 100644 --- a/app/common/services/point/ParentReward.php +++ b/app/common/services/point/ParentReward.php @@ -464,7 +464,7 @@ class ParentReward public function debug($msg = '', $data = '') { $base_msg = $this->order->id ? "上级赠送积分异常,订单{$this->order->id},原因:" : "上级赠送积分异常,原因:"; - \Log::debug($base_msg . $msg, $data); + // \Log::debug($base_msg . $msg, $data); } } diff --git a/plugins/commission/src/Listener/OrderCreatedListener.php b/plugins/commission/src/Listener/OrderCreatedListener.php index 063554bd..a3b94cf2 100644 --- a/plugins/commission/src/Listener/OrderCreatedListener.php +++ b/plugins/commission/src/Listener/OrderCreatedListener.php @@ -169,7 +169,7 @@ class OrderCreatedListener // 计算普通等级佣金 $commission = CommissionOrderService::getCommission($this->order, $agent['agent'], $this->set); if ($commission['commission'] > 0) $this->addCommissionOrder($commission, $agent, $hierarchy, $level); - else \Log::debug('订单分销没有佣金 - 普通等级'.$order_id,$agent['agent']); + // else \Log::debug('订单分销没有佣金 - 普通等级'.$order_id,$agent['agent']); // 计算文创等级分红 $culturalAgent = $agent; $culturalAgent['agent']['agent_level'] = $culturalAgent['agent']['cultural_level']; @@ -183,7 +183,7 @@ class OrderCreatedListener // 不包括自己 不管是不是开启了内购 // \Log::debug('分销额外分红比对',[$agent->id,$agent['member_id'],$agent['agent']['agent_level']['level'],$this->level_weight]); if ($agent['agent']['agent_level']['level'] >= $this->level_weight && $agent['member_id'] != $this->buyer_uid) { - \Log::debug('分销进入额外分红',$agent); + // \Log::debug('分销进入额外分红',$agent); $is_additiona_commission = true; $additiona_commission = CommissionOrderService::getAdditionalCommission($this->order, $agent['agent'], $this->set); if ($additiona_commission['commission'] > 0) { diff --git a/plugins/commission/src/services/CommissionOrderService.php b/plugins/commission/src/services/CommissionOrderService.php index 935da7b8..59d52a9b 100644 --- a/plugins/commission/src/services/CommissionOrderService.php +++ b/plugins/commission/src/services/CommissionOrderService.php @@ -388,7 +388,7 @@ class CommissionOrderService //临时解决分销等级删除后,分销订单不能使用默认等级计算问题 if (!$agent['agent_level_id'] || !$agent['agent_level']['additional_ratio']) { - \Log::debug('无分销商等级或者没设置分红比例', $agent); + // \Log::debug('无分销商等级或者没设置分红比例', $agent); return [ 'commission_amount' => $commissionAmount, 'formula' => $formula, diff --git a/plugins/red-packet/src/services/RedOrderService.php b/plugins/red-packet/src/services/RedOrderService.php index 118e0566..2f49fdda 100644 --- a/plugins/red-packet/src/services/RedOrderService.php +++ b/plugins/red-packet/src/services/RedOrderService.php @@ -27,7 +27,7 @@ class RedOrderService return $red_packet_order->receive_amount; } - \Log::debug('订单类型值:',$order->plugin_id); + // \Log::debug('订单类型值:',$order->plugin_id); if (app('plugins')->isEnabled('store-cashier')) { @@ -138,7 +138,7 @@ class RedOrderService } if (empty($ratio)) { - \Log::debug('比例未设置'); + // \Log::debug('比例未设置'); continue ; } $this->createRedPacketLogs($ratio,$order); diff --git a/plugins/redpack/src/Listener/OrderPaidListener.php b/plugins/redpack/src/Listener/OrderPaidListener.php index e2f4d5e5..07f68dd6 100644 --- a/plugins/redpack/src/Listener/OrderPaidListener.php +++ b/plugins/redpack/src/Listener/OrderPaidListener.php @@ -39,7 +39,7 @@ class OrderPaidListener //监听用户累计消费和购买指定商品记录 \YunShop::app()->uniacid = $this->order_model->uniacid; if(!$activity_list = ActivityService::getIssetActivity(['goods','consume'])){ - \Log::debug('口令红包订单记录:'.$this->order_id.'无进行中活动'); + // \Log::debug('口令红包订单记录:'.$this->order_id.'无进行中活动'); return; } diff --git a/plugins/shareholder-dividend/src/services/TimedTaskService.php b/plugins/shareholder-dividend/src/services/TimedTaskService.php index 3c900dca..461f8595 100644 --- a/plugins/shareholder-dividend/src/services/TimedTaskService.php +++ b/plugins/shareholder-dividend/src/services/TimedTaskService.php @@ -333,7 +333,8 @@ class TimedTaskService if ($rate > 0 && (($settlementType == 'cycle' && $levelSettlementType == 0) || ($settlementType == 'order' && $levelSettlementType == 1))) { $levelBonusType = (float)$this->set['level_bonus_type']['level_' . $teamLevel['id']]; // 分红方式:0=按权重值比例,1=平均分 if($levelBonusType == 1){ - $teamAgents = TeamAgentModel::getTeamAgentByLevelId($teamLevel['id']); // 等级下团队代理 + if($teamLevel['level_type'] == 1) $teamAgents = TeamAgentModel::uniacid()->whereHas('hasOneMember')->where('cultural_level_id',$teamLevel['id']); // 等级下团队代理 + else $teamAgents = TeamAgentModel::getTeamAgentByLevelId($teamLevel['id']); // 等级下团队代理 }else{ // 每次分红 遍历全部的经销商 $teamAgents = TeamAgentModel::uniacid() diff --git a/plugins/team-dividend/src/Listener/OrderPaidListener.php b/plugins/team-dividend/src/Listener/OrderPaidListener.php index 1d9a38b5..172efa09 100644 --- a/plugins/team-dividend/src/Listener/OrderPaidListener.php +++ b/plugins/team-dividend/src/Listener/OrderPaidListener.php @@ -56,16 +56,16 @@ class OrderPaidListener //添加字段 $teamDividendData['is_pay'] = $model->status >= 1 ? 1 : 0; - \Log::debug('--------更改已支付状态 0/1--------', [ - 'order_status' => $model->status, - 'is_pay' => $teamDividendData['is_pay'], - 'order_sn' => $model->order_sn, - ]); + // \Log::debug('--------更改已支付状态 0/1--------', [ + // 'order_status' => $model->status, + // 'is_pay' => $teamDividendData['is_pay'], + // 'order_sn' => $model->order_sn, + // ]); $team_dividend_ids = TeamDividendModel::where('order_sn', $model->order_sn)->orderBy('id', 'asc')->pluck('id'); $result = TeamDividendModel::whereIn('id', $team_dividend_ids)->update($teamDividendData); // $teamDividendWhere = ['order_sn' => $model->order_sn]; // $result = TeamDividendModel::updatedTeamDividend($teamDividendData, $teamDividendWhere); - \Log::debug('--------记录更新影响条数--------', $result); +// \Log::debug('--------记录更新影响条数--------', $result); //支付后发送公众号消息通知 (new SendMessageService($model))->handle(); diff --git a/plugins/team-dividend/src/jobs/NewUpgrateJob.php b/plugins/team-dividend/src/jobs/NewUpgrateJob.php index a81e7d3c..8528438b 100644 --- a/plugins/team-dividend/src/jobs/NewUpgrateJob.php +++ b/plugins/team-dividend/src/jobs/NewUpgrateJob.php @@ -70,6 +70,7 @@ class NewUpgrateJob implements ShouldQueue // 黑名单不升级 if ($agent['teamDividend']->is_black) continue; // 升级处理 + \Log::debug('经销商升级 - 开始:',$agent['uid']); $this->eachLevelHandle($agent);// 普通等级升级处理 $this->eachCulturalLevelHandle($agent);// 文创等级升级处理 } @@ -95,7 +96,7 @@ class NewUpgrateJob implements ShouldQueue return; } - \Log::debug('经销商升级 - 开始处理:',$agent['uid']); + // \Log::debug('经销商升级 - 开始处理:',$agent['uid']); // 默认可以升级 $upgradeRet = false; foreach ($upgradeLevels as $level) { @@ -338,7 +339,7 @@ class NewUpgrateJob implements ShouldQueue $oldUpgrade = new UpgradeService(); $upgradeLevels = $this->getUpgrateLevelsByWeight($agent,1); if ($upgradeLevels->isEmpty()) return; - \Log::debug('经销商升级 - 文创等级 - 开始处理:',$agent['uid']); + // \Log::debug('经销商升级 - 文创等级 - 开始处理:',$agent['uid']); // 默认可以升级 $upgradeRet = false; foreach ($upgradeLevels as $level) { diff --git a/plugins/team-dividend/src/services/TimedTaskService.php b/plugins/team-dividend/src/services/TimedTaskService.php index fc7af6b9..ba9323d7 100644 --- a/plugins/team-dividend/src/services/TimedTaskService.php +++ b/plugins/team-dividend/src/services/TimedTaskService.php @@ -138,7 +138,7 @@ class TimedTaskService 'lower_level_name' => $name->nickname, 'dividend_id' => $item['id'], ]; - \Log::debug('===================hahaha==========',$notice); + // \Log::debug('===================hahaha==========',$notice); MessageService::dividend($notice, $member->hasOneFans); } DB::commit();