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

修改分销订单问题

This commit is contained in:
古明 2024-11-17 22:47:47 +08:00
parent 2c5d73a885
commit 683553430b
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,7 +12,7 @@ use app\model\BaseModel;
use app\model\message\Message; use app\model\message\Message;
use app\model\system\Stat; use app\model\system\Stat;
use think\facade\Db; use think\facade\Db;
use addon\fenxiao\model\Config as ConfigModel;
/** /**
* 分销商品 * 分销商品
*/ */
@ -202,7 +202,7 @@ class FenxiaoOrder extends BaseModel
private function getWholesaleFenXiaoCommission($fenxiao_info,$v,&$order_fenxiao_data,$config,$goods_kind = 0,$fenxiao_type = 1){ 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){ 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); $rate = $this->getLevelRate(0,$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['wholesale_fenxiao_id'][] = $fenxiao_info['fenxiao_id'];
$order_fenxiao_data['commission_rate'] += $order_fenxiao_data[ 'wholesale_rate' ] = $rate; $order_fenxiao_data['commission_rate'] += $order_fenxiao_data[ 'wholesale_rate' ] = $rate;
@ -280,6 +280,7 @@ class FenxiaoOrder extends BaseModel
if(!$order_fenxiao_data['is_weight'] && $goods_kind === 0){ if(!$order_fenxiao_data['is_weight'] && $goods_kind === 0){
$is_weight = $user['is_weight']; $is_weight = $user['is_weight'];
if($is_weight){ if($is_weight){
$weight_money = $config['weight_rate'] * $v[ 'goods_money' ] / 100; $weight_money = $config['weight_rate'] * $v[ 'goods_money' ] / 100;
$order_fenxiao_data['weight_money'] = $weight_money; $order_fenxiao_data['weight_money'] = $weight_money;
} }

3
addon/fenxiao/shop/controller/Config.php
View File

@ -58,11 +58,12 @@ class Config extends BaseShop
'weight_rate' => input('weight_rate', 0.00), 'weight_rate' => input('weight_rate', 0.00),
'is_support_cashier' => input('is_support_cashier', 0) 'is_support_cashier' => input('is_support_cashier', 0)
]; ];
$res = $model->setFenxiaoBasicsConfig($data, 1, $this->site_id); $res = $model->setFenxiaoBasicsConfig($data, 1, $this->site_id);
return $res; return $res;
} else { } else {
$basics = $model->getFenxiaoBasicsConfig($this->site_id); $basics = $model->getFenxiaoBasicsConfig($this->site_id);
// dump($basics);die;
$this->assign("basics_info", $basics[ 'data' ][ 'value' ]); $this->assign("basics_info", $basics[ 'data' ][ 'value' ]);
$fenxiao = $model->getFenxiaoConfig($this->site_id); $fenxiao = $model->getFenxiaoConfig($this->site_id);