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

分销订单只统计进货产品的金额

This commit is contained in:
liqianjin 2024-09-26 16:03:07 +08:00
parent 84daf86f43
commit f61b59ab47
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
addon/fenxiao/model/FenxiaoOrder.php
View File

@ -192,9 +192,10 @@ class FenxiaoOrder extends BaseModel
private function getWholesaleFenXiaoCommission($fenxiao_info,$v,&$order_fenxiao_data,$config,$goods_kind = 0,$fenxiao_type = 1){
//不是报单商品才有自购
if($config['self_purchase_rebate'] && $fenxiao_info['level_num'] > 0 && $goods_kind === 0){
$rate = $this->getLevelRate(1,$v['site_id'],$v['goods_id'],$v['sku_id'],$fenxiao_info['level_id'],$config,$fenxiao_type);
$order_fenxiao_data['wholesale_fenxiao_id'][] = $fenxiao_info['fenxiao_id'];
$order_fenxiao_data['commission_rate'] += $order_fenxiao_data[ 'wholesale_rate' ] = $fenxiao_info[ 'one_rate' ];
$commission = $fenxiao_info[ 'one_rate' ] * $v[ 'real_goods_money' ] / 100;
$order_fenxiao_data['commission_rate'] += $order_fenxiao_data[ 'wholesale_rate' ] = $rate;
$commission = $rate * $v[ 'real_goods_money' ] / 100;
$order_fenxiao_data['commission'] += $order_fenxiao_data[ 'wholesale_commission' ] = $commission;
$order_fenxiao_data['wholesale_fenxiao_detail'][] = ['name' => $fenxiao_info['fenxiao_name'], 'commission' => $commission];
}
@ -381,6 +382,11 @@ class FenxiaoOrder extends BaseModel
public function calculateOrder($order_id)
{
$fenxiao_order_info = model('fenxiao_order')->getFirstData([ [ 'order_id', '=', $order_id ] ], 'one_fenxiao_id');
// $alias = 'a';
// $join = [
// ['goods g', 'a.goods_id = g.goods_id', 'right']
// ];
// $order_goods = model('order_goods')->getSum([ [ 'a.order_id', '=', $order_id ], [ 'a.is_fenxiao', '=', 1 ] ], 'a.real_goods_money',$alias,$join);
if (!empty($fenxiao_order_info)) {
$one_commission_sum = model('fenxiao_order')->getSum([ [ 'order_id', '=', $order_id ] ], 'one_commission');
$one_fenxiao_total_order = model('fenxiao_order')->getSum([ [ 'order_id', '=', $order_id ] ], 'real_goods_money');

6
app/pay/controller/Test.php
View File

@ -28,10 +28,10 @@ class Test{
$order_info = model('order')->getInfo(['order_id' => $orderId]);
// $fenxiao_order = new OrderPay();
// $res = $fenxiao_order->handle($order_info);
$fenxiao_order = new FenxiaoOrder();
$res = $fenxiao_order->calculate($order_info);
// $fenxiao_order = new FenxiaoOrder();
// $res = $fenxiao_order->calculate($order_info);
$fenxiao_order_model = new FenxiaoOrder();
// $res = $fenxiao_order_model->calculateOrder($order_info['order_id']);
$res = $fenxiao_order_model->calculateOrder($order_info['order_id']);
// $fenxiao_id = 195;
// $fenxiao = new Fenxiao();
// $res = $fenxiao->fenxiaoUpgrade($fenxiao_id);