mkm/multi-store
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(admin): 修复订单总价计算错误

Browse Source 
- 在 BeforehandOrderLogic 中添加总价计算逻辑
- 修正 StoreProductLogic 中商品分类数组的生成逻辑
- 修改 IndexController 中的查询条件和字段
- 调整 OrderAllocation 中的表格列标题和数据填充
This commit is contained in:
mkm 2024-11-11 11:16:43 +08:00
parent 91546d26d1
commit 4199943282
4 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/admin/logic/beforehand_order/BeforehandOrderLogic.php
View File

@ -66,6 +66,7 @@ class BeforehandOrderLogic extends BaseLogic
unset($params['product_arr'][$k]);
continue;
}
$total_prices=bcmul($v['price'],$v['nums'],2);
$datas[$k]['purchase'] = $v['purchase'];
$datas[$k]['mark'] = $v['mark'] ?? '';
$datas[$k]['product_id'] = $v['product_id'];
@ -81,12 +82,12 @@ class BeforehandOrderLogic extends BaseLogic
$datas[$k]['accept_num'] = $v['nums'];
$datas[$k]['price'] = $v['price'];
$datas[$k]['package'] = $v['package'] ?? '';
$datas[$k]['total_price'] = $v['total_price'];
$datas[$k]['pay_price'] = $v['total_price'];
$datas[$k]['total_price'] =$total_prices;
$datas[$k]['pay_price'] = $total_prices;
$datas[$k]['create_time'] = time();
$datas[$k]['update_time'] = time();
$total_num += $v['nums'];
$total_price += $v['total_price'];
$total_price += $total_prices;
}
$order = BeforehandOrder::create([
'order_id' => getNewOrderId('YG'),

7
app/admin/logic/store_product/StoreProductLogic.php
View File

@ -292,6 +292,13 @@ class StoreProductLogic extends BaseLogic
if(empty($data)){
throw new BusinessException('商品不存在');
}
$data['cate_arr']=[$data['top_cate_id']];
if($data['two_cate_id'] == $data['top_cate_id']){
$data['cate_arr'][]=$data['cate_id'];
}else{
$data['cate_arr'][]=$data['two_cate_id'];
$data['cate_arr'][]=$data['cate_id'];
}
$data['unit_name']=StoreProductUnit::where('id', $data['unit'])->value('name');
return $data;
}

2
app/api/controller/IndexController.php
View File

@ -55,7 +55,7 @@ class IndexController extends BaseApiController
{
d(1);
$arr=StoreOrder::where('store_id',8)->where('paid',1)->field('id,pay_price')->select()->toArray();
$arr=StoreOrder::where('store_id',3)->where('paid',1)->field('id,pay_price,deduction_price,refund_price')->select()->toArray();
$data=[];
foreach ($arr as $k => $v) {
$total_price=StoreOrderCartInfo::where('oid', $v['id'])->sum('total_price');

8
app/common/service/xlsx/OrderAllocation.php
View File

@ -50,13 +50,13 @@ class OrderAllocation
$sheet->setCellValue('A4', '编号');
$sheet->setCellValue('B4', '品名');
$sheet->setCellValue('C4', '型号');
$sheet->setCellValue('C4', '数量');
$sheet->setCellValue('D4', '包装');
$sheet->setCellValue('E4', '毛重');
$sheet->setCellValue('F4', '净重（约）');
$sheet->setCellValue('G4', '单位');
$sheet->setCellValue('H4', '销售单价');
$sheet->setCellValue('I4', '下单数量');
$sheet->setCellValue('I4', '型号');
$sheet->setCellValue('J4', '下单金额');
$sheet->setCellValue('K4', '发货量');
$sheet->setCellValue('L4', '实发量');
@ -79,13 +79,13 @@ class OrderAllocation
foreach ($data as $k => $v) {
$sheet->setCellValue('A' . ($k + 5), $v['product_id']);
$sheet->setCellValue('B' . ($k + 5), $v['store_name']);
$sheet->setCellValue('C' . ($k + 5), $v['marques']);
$sheet->setCellValue('C' . ($k + 5), $v['cart_num']);
$sheet->setCellValue('D' . ($k + 5), $v['package']);
$sheet->setCellValue('E' . ($k + 5), $v['gross_weight']);
$sheet->setCellValue('F' . ($k + 5), $v['net_weight']);
$sheet->setCellValue('G' . ($k + 5), $v['unit_name']);
$sheet->setCellValue('H' . ($k + 5), $v['price']);
$sheet->setCellValue('I' . ($k + 5), $v['cart_num']);
$sheet->setCellValue('I' . ($k + 5), $v['marques']);
$sheet->setCellValue('J' . ($k + 5), $v['total_price']);
$sheet->setCellValue('K' . ($k + 5), $v['accept_num']);
$sheet->setCellValue('L' . ($k + 5),$v['accept_num']);