bztang
/
bztang-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复：购买商品奖励贡献值时会出现错误导致奖励失败的问题

This commit is contained in:
wuhui_zzw 2023-11-20 18:29:06 +08:00
parent a8bc88a75e
commit f2def9cdea
13 changed files with 47 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/common/models/MemberRelation.php
View File

@ -313,7 +313,7 @@ class MemberRelation extends BaseModel
$curr_parent_id = $member->parent_id;
$become_child = intval($set->become_child);
if ($member->parent_id == 0) {
\Log::debug(sprintf('会员上线ID进入时1-: %d', $member->parent_id));
// \Log::debug(sprintf('会员上线ID进入时1-: %d', $member->parent_id));
if ($become_child == 1 && empty($member->inviter)) {
$member->child_time = time();
$member->inviter = 1;
@ -322,7 +322,7 @@ class MemberRelation extends BaseModel
}
} else {
$parent = MemberShopInfo::getMemberShopInfo($member->parent_id);
\Log::debug(sprintf('会员上线ID进入时2-: %d', $member->parent_id));
// \Log::debug(sprintf('会员上线ID进入时2-: %d', $member->parent_id));
$parent_is_agent = !empty($parent) && $parent->is_agent == 1 && $parent->status == 2;
if ($parent_is_agent && $become_child == 1 && !$member->inviter && $member->member_id != $parent->member_id) {
\Log::debug(sprintf('会员赋值 parent_id: %d', $parent->member_id));

6
app/common/services/notice/official/BalanceChangeNotice.php
View File

@ -51,9 +51,9 @@ class BalanceChangeNotice extends BaseMessageBody
$this->getTemplate('balance_change');
$this->organizeData();
\Log::debug("新版公众号消息-余额1",$this->template_id);
\Log::debug("新版公众号消息-余额2",$this->member->hasOneFans->openid);
\Log::debug("新版公众号消息-余额3",$this->data);
// \Log::debug("新版公众号消息-余额1",$this->template_id);
// \Log::debug("新版公众号消息-余额2",$this->member->hasOneFans->openid);
// \Log::debug("新版公众号消息-余额3",$this->data);
$this->url = $this->url ? : yzAppFullUrl('/member/detailed');
$result = (new OfficialMessageNotice($this->temp_id,$this->member->hasOneFans->openid,$this->data,[],1,$this->url))->sendMessage();

6
app/common/services/notice/official/BalanceDeficiencyNotice.php
View File

@ -47,9 +47,9 @@ class BalanceDeficiencyNotice extends BaseMessageBody
$this->getTemplate('balance_deficiency');
$this->organizeData();
\Log::debug("新版公众号消息-余额不足1",$this->template_id);
\Log::debug("新版公众号消息-余额不足2",$this->member->hasOneFans->openid);
\Log::debug("新版公众号消息-余额不足3",$this->data);
// \Log::debug("新版公众号消息-余额不足1",$this->template_id);
// \Log::debug("新版公众号消息-余额不足2",$this->member->hasOneFans->openid);
// \Log::debug("新版公众号消息-余额不足3",$this->data);
$result = (new OfficialMessageNotice($this->temp_id,$this->member->hasOneFans->openid,$this->data,[],1,$this->url))->sendMessage();
if ($result['status'] == 0) {

6
plugins/area-dividend/src/Listener/CreatedCommissionListener.php
View File

@ -80,7 +80,7 @@ class CreatedCommissionListener
public function getAreaAgent($address)
{
\Log::debug('getAreaAgent()');
// \Log::debug('getAreaAgent()');
//区域代理
$area_level = [];
$area_agent = [];
@ -101,10 +101,10 @@ class CreatedCommissionListener
$area_level['level_1'] = $this->getLevelStatus($area_agent['province']);
}
if ($area_agent) {
\Log::debug('区域代理不为空,继续');
// \Log::debug('区域代理不为空,继续');
$this->runDividendData($area_agent, $area_level);
} else {
\Log::debug('区域代理为空,返回');
// \Log::debug('区域代理为空,返回');
}
}

8
plugins/area-dividend/src/Listener/OrderCreatedListener--old.php
View File

@ -81,7 +81,7 @@ class OrderCreatedListener
*/
public function getAreaAgent($address)
{
\Log::debug('getAreaAgent()');
// \Log::debug('getAreaAgent()');
//区域代理
$area_level = [];
$area_agent = [];
@ -108,9 +108,9 @@ class OrderCreatedListener
}
if (!$area_agent) {
\Log::debug('区域代理为空,返回');
// \Log::debug('区域代理为空,返回');
} else {
\Log::debug('区域代理不为空,继续');
// \Log::debug('区域代理不为空,继续');
$this->runDividendData($area_agent, $area_level);
}
}
@ -230,7 +230,7 @@ class OrderCreatedListener
}
}else{
\Log::debug('区域分红' . $this->model->id .$key.'团队为空');
// \Log::debug('区域分红' . $this->model->id .$key.'团队为空');
}
}
}

18
plugins/area-dividend/src/Listener/OrderCreatedListener.php
View File

@ -54,7 +54,7 @@ class OrderCreatedListener
}
$this->set = $order->getSetting('plugin.area_dividend');
\Log::debug('区域分红执行设置:', json_encode($this->set, 256));
// \Log::debug('区域分红执行设置:', json_encode($this->set, 256));
$this->dividend($order);
\Log::debug('区域分红' . $this->model->id . '完成');
@ -82,11 +82,11 @@ class OrderCreatedListener
return;
}
\Log::debug('区域分红订单模型:', json_encode($this->model, 256));
\Log::debug('区域分红特殊数据:', [
'extra_plugin_id' => $this->extra_plugin_id,
'extra_id' => $this->extra_id,
]);
// \Log::debug('区域分红订单模型:', json_encode($this->model, 256));
// \Log::debug('区域分红特殊数据:', [
// 'extra_plugin_id' => $this->extra_plugin_id,
// 'extra_id' => $this->extra_id,
// ]);
if ($this->extra_address) {
\Log::debug('区域分红特殊地址', [
'province_id' => $this->extra_address && intval($this->extra_address->province_id) ? intval($this->extra_address->province_id) : 0,
@ -111,7 +111,7 @@ class OrderCreatedListener
*/
public function getAreaAgent($address)
{
\Log::debug('getAreaAgent()');
// \Log::debug('getAreaAgent()');
//区域代理
$area_level = [];
$area_agent = [];
@ -139,9 +139,9 @@ class OrderCreatedListener
event(new AfterDetermineRegionEvent($this->model, $area_agent, $area_level));
if (!$area_agent) {
\Log::debug('区域代理为空,返回');
// \Log::debug('区域代理为空,返回');
} else {
\Log::debug('区域代理不为空,继续');
// \Log::debug('区域代理不为空,继续');
$this->runDividendData($area_agent, $area_level);
}
}

8
plugins/area-dividend/src/Listener/OrderCreatedOldListener.php
View File

@ -81,7 +81,7 @@ class OrderCreatedOldListener
*/
public function getAreaAgent($address)
{
\Log::debug('getAreaAgent()');
// \Log::debug('getAreaAgent()');
//区域代理
$area_level = [];
$area_agent = [];
@ -108,9 +108,9 @@ class OrderCreatedOldListener
}
if (!$area_agent) {
\Log::debug('区域代理为空,返回');
// \Log::debug('区域代理为空,返回');
} else {
\Log::debug('区域代理不为空,继续');
// \Log::debug('区域代理不为空,继续');
$this->runDividendData($area_agent, $area_level);
}
}
@ -230,7 +230,7 @@ class OrderCreatedOldListener
}
}else{
\Log::debug('区域分红' . $this->model->id .$key.'团队为空');
// \Log::debug('区域分红' . $this->model->id .$key.'团队为空');
}
}
}

2
plugins/area-dividend/src/event/BeforeAreaDividendCreatedEvent.php
View File

@ -16,7 +16,7 @@ class BeforeAreaDividendCreatedEvent extends Event
public function __construct($order, $extra_plugin_id, $extra_id)
{
\Log::debug('区域分红：创建执行前事件', $order->id);
// \Log::debug('区域分红：创建执行前事件', $order->id);
$this->order = $order;
$this->extra_plugin_id = $extra_plugin_id;
$this->extra_id = $extra_id;

2
plugins/area-dividend/src/services/AppointmentService.php
View File

@ -52,7 +52,7 @@ class AppointmentService
if (!$area_agent) {
\Log::info('门店预约区域代理为空,返回');
} else {
\Log::info('门店预约区域代理不为空,继续');
// \Log::info('门店预约区域代理不为空,继续');
$this->runDividendData($area_agent);
}
}

6
plugins/commission/src/Listener/OrderCreatedListener.php
View File

@ -101,14 +101,14 @@ class OrderCreatedListener
//获取上级关系链
$this->requestAgents = OrderCreatedService::getParentAgents($this->model->uid, $this->set['self_buy']);
\Log::debug('订单分销' . $orderModel->id . '关系链', $this->requestAgents);
// \Log::debug('订单分销' . $orderModel->id . '关系链', $this->requestAgents);
if (!$this->requestAgents) {
return '没有关系链';
}
//确认分销商层级
$agents = AgentService::getParentAgents($this->requestAgents->toArray(), $this->set, $orderModel);
\Log::debug('订单分销' . $orderModel->id . '层级', $agents);
// \Log::debug('订单分销' . $orderModel->id . '层级', $agents);
if (!isset($agents['first_level'])) {
\Log::debug('订单分销没有上级',print_r($orderModel->id,true));
@ -186,7 +186,7 @@ class OrderCreatedListener
// 额外分红
if (!$is_additiona_commission) {
// 不包括自己 不管是不是开启了内购
\Log::debug('分销额外分红比对',[$agent->id,$agent['member_id'],$agent['agent']['agent_level']['level'],$this->level_weight]);
// \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);
$is_additiona_commission = true;

12
plugins/cultural-space/src/models/CulturalSpace.php
View File

@ -115,12 +115,22 @@ class CulturalSpace extends BaseModel
}
// 数据操作
if (count($changeList) > 0) {
$this->batchUpdate($memberList, 'uid', 'uid');
$newMemberList = [];
foreach($memberList as $key => $val){
$newMemberList[$key] = [
'id' => $val['id'],
'contribution' => $val['contribution']
];
}
$this->batchUpdate($newMemberList);
ContributionLog::insert($changeList);
}
DB::commit();
} catch (\Exception $e) {
debug($e->getMessage());
\Log::debug('文创空间 - 购买商品奖励贡献值 - 错误抛出', $e->getMessage());
DB::rollBack();
}

4
plugins/team-dividend/src/Listener/OrderCreatedListener.php
View File

@ -79,7 +79,7 @@ class OrderCreatedListener
$set = $order->getSetting('plugin.team_dividend');
\Log::debug('经销商管理基础设置',$set);
// \Log::debug('经销商管理基础设置',$set);
//是否开启经销商插件
if (!$set['is_team_dividend']) {
@ -88,7 +88,7 @@ class OrderCreatedListener
$buyMember = $order->belongsToMember;
$agents = GetAgentsService::index($set, $order->uid, $order->create_time);
\Log::debug('经销商-获取经销商',$agents);
// \Log::debug('经销商-获取经销商',$agents);
foreach ($order->hasManyOrderGoods as $order_goods) {
// 普通经销商提成处理
$TeamReturnService->setData($order, $set, $buyMember, $order_goods, $agents);

2
plugins/team-dividend/src/services/TeamReturnService.php
View File

@ -73,7 +73,7 @@ class TeamReturnService
$this->team_goods = GoodsTeamDividend::getGoodsByGoodsId($this->order_goods->goods_id)->first();
$this->levels = TeamDividendLevelModel::uniacid()->orderBy('level_weight','asc')->get()->toArray();
$this->flat_prize_limit = 0;
\Log::debug('经销商创建-team_goods:' . $this->order_goods->goods_id, $this->team_goods ? $this->team_goods->toArray() : []);
// \Log::debug('经销商创建-team_goods:' . $this->order_goods->goods_id, $this->team_goods ? $this->team_goods->toArray() : []);
$this->init();
}