Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev
This commit is contained in:
commit
cffd49c8cc
@ -326,7 +326,7 @@ class StoreOrderRepository extends BaseRepository
|
||||
|
||||
$_payPrice = bcsub($_payPrice, $_order_rate, 2);
|
||||
// 结算各镇 小组佣金
|
||||
// event('order.paySuccessOrder', compact('order','_order_rate'));
|
||||
event('order.paySuccessOrder', compact('order','_order_rate'));
|
||||
|
||||
}
|
||||
|
||||
|
@ -47,16 +47,16 @@ class paySuccessOrder
|
||||
$this->totalAmount = bcmul($realPrice, (string)$commission_rate, 2);
|
||||
$this->remain = $this->totalAmount;
|
||||
|
||||
$typeTownServerId = Db::name('MerchantType')->where('type_code', Merchant::TypeCode['TypeTownServer'])->value('mer_type_id');
|
||||
$typeVillageServerId = Db::name('MerchantType')->where('type_code', Merchant::TypeCode['TypeVillageServer'])->value('mer_type_id');
|
||||
$typeTeamServerId = Db::name('MerchantType')->where('type_code', Merchant::TypeCode['TypeTeamServer'])->value('mer_type_id');
|
||||
// $typeTownServerId = Db::name('MerchantType')->where('type_code', Merchant::TypeCode['TypeTownServer'])->value('mer_type_id');
|
||||
// $typeVillageServerId = Db::name('MerchantType')->where('type_code', Merchant::TypeCode['TypeVillageServer'])->value('mer_type_id');
|
||||
// $typeTeamServerId = Db::name('MerchantType')->where('type_code', Merchant::TypeCode['TypeTeamServer'])->value('mer_type_id');
|
||||
|
||||
//镇团队佣金
|
||||
$this->calculate($typeTownServerId, 'commission_to_town_rate');
|
||||
//村团队佣金
|
||||
$this->calculate($typeVillageServerId, 'commission_to_village_rate');
|
||||
//小组服务团队佣金
|
||||
$this->calculate($typeTeamServerId, 'commission_to_service_team_rate');
|
||||
// //镇团队佣金
|
||||
// $this->calculate($typeTownServerId, 'commission_to_town_rate');
|
||||
// //村团队佣金
|
||||
// $this->calculate($typeVillageServerId, 'commission_to_village_rate');
|
||||
// //小组服务团队佣金
|
||||
// $this->calculate($typeTeamServerId, 'commission_to_service_team_rate');
|
||||
|
||||
//订单购物详情表是否有云仓数据
|
||||
$orderProduct = Db::name('store_order_product')
|
||||
|
Loading…
x
Reference in New Issue
Block a user