ecshop/OMS
1
0
Fork 0
mirror of https://gitee.com/ShopeX/OMS synced 2026-04-23 05:05:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

1. 【新增】售后单售后原因类型支持搜索

Browse Source 
2. 【新增】手工创建订单折扣可输入正数

3. 【优化】盘点申请单确认

4. 【修复】采购退货单模拟出库失败问题

5. 【新增】订单金额客户实付与结算金额

6. 【优化】仓库发货统计报表物料名称显示

7. 【优化】自有仓储虚拟发货逻辑

8. 【修复】基础物料分类管理问题
This commit is contained in:
chenping
2026-04-01 11:59:17 +08:00
parent 9341122827
commit 61783b7d01
754 changed files with 46179 additions and 5700 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
app/erpapi/lib/shop/matrix/aikucun/response/order.php
View File

@@ -53,6 +53,40 @@ class erpapi_shop_matrix_aikucun_response_order extends erpapi_shop_response_ord
if ($this->_ordersdf['shipping']['shipping_name'] == '98') {
$this->_ordersdf['shipping']['shipping_name'] = '';
}
// 如果 cost_item 为 0 或空，根据 order_objects 的 amount 重新计算
// 如果 pmt_goods 为 0 或空，根据 order_objects 的 pmt_price 重新计算
$need_recalc_cost_item = empty($this->_ordersdf['cost_item']) || (float)$this->_ordersdf['cost_item'] == 0;
$need_recalc_pmt_goods = empty($this->_ordersdf['pmt_goods']) || (float)$this->_ordersdf['pmt_goods'] == 0;
if ($need_recalc_cost_item || $need_recalc_pmt_goods) {
$cost_item = 0;
$pmt_goods = 0;
if (!empty($this->_ordersdf['order_objects']) && is_array($this->_ordersdf['order_objects'])) {
foreach ($this->_ordersdf['order_objects'] as $object) {
// 跳过 status == 'close' 的对象（与基础验证逻辑一致）
if (isset($object['status']) && $object['status'] == 'close') {
continue;
}
// 累加每个对象的 amount 字段（用于计算 cost_item）
if ($need_recalc_cost_item && isset($object['amount'])) {
$cost_item = bcadd($cost_item, (float)$object['amount'], 3);
}
// 累加每个对象的 pmt_price 字段（用于计算 pmt_goods）
if ($need_recalc_pmt_goods && isset($object['pmt_price'])) {
$pmt_goods = bcadd($pmt_goods, (float)$object['pmt_price'], 3);
}
}
}
// 如果计算出的 cost_item > 0，则更新
if ($need_recalc_cost_item && $cost_item > 0) {
$this->_ordersdf['cost_item'] = $cost_item;
}
// 如果计算出的 pmt_goods > 0，则更新
if ($need_recalc_pmt_goods && $pmt_goods > 0) {
$this->_ordersdf['pmt_goods'] = $pmt_goods;
}
}
}
/**