diff --git a/addon/fenxiao/model/FenxiaoOrder.php b/addon/fenxiao/model/FenxiaoOrder.php index 714d9a9..955282c 100644 --- a/addon/fenxiao/model/FenxiaoOrder.php +++ b/addon/fenxiao/model/FenxiaoOrder.php @@ -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'); diff --git a/app/pay/controller/Test.php b/app/pay/controller/Test.php index d015def..12d7164 100644 --- a/app/pay/controller/Test.php +++ b/app/pay/controller/Test.php @@ -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);