ecshop/OMS
1
0
Fork 0
mirror of https://gitee.com/ShopeX/OMS synced 2026-04-05 14:45: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

21
app/ome/lib/sales/original/data.php
View File

@@ -14,16 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
class ome_sales_original_data
{
private $appName = 'ome';
/**
* 设置AppName
* @param mixed $appName appName
* @return mixed 返回操作结果
*/
public function setAppName($appName) {
$this->appName = $appName;
return $this;
@@ -74,6 +68,7 @@ class ome_sales_original_data
if($item['delete'] == 'true'){
$is_item_delete = true;
unset($order_info['order_objects'][$key]['order_items'][$k]);
unset($items[$k]);
$item_delete_flag++;
}
if (!$is_item_delete){
@@ -97,7 +92,8 @@ class ome_sales_original_data
}
$tmp_sale_price = $tmp_sale_price-$item['refund_money'];
$order_info['order_objects'][$key]['order_items'][$k]['sale_price'] = $tmp_sale_price;
// 格式化避免浮点数精度问题导致科学计数法
$order_info['order_objects'][$key]['order_items'][$k]['sale_price'] = floatval(sprintf('%.2f', $tmp_sale_price));
$tmp_item_pmt_price_all += $tmp_item_pmt_price;
}
@@ -113,8 +109,12 @@ class ome_sales_original_data
$order_info['order_objects'][$key]['pmt_price'] = $tmp_obj_pmt_price;
$tmp_obj_sale_price = ($obj['sale_price'] > 0) ? $obj['sale_price'] : ((($tmp_obj_amount-$tmp_obj_pmt_price-$tmp_item_pmt_price_all) > 0) ? ($tmp_obj_amount-$tmp_obj_pmt_price-$tmp_item_pmt_price_all) : 0.000);
$order_info['order_objects'][$key]['sale_price'] = $tmp_obj_sale_price;
// 格式化避免浮点数精度问题导致科学计数法，使用三位小数与原始代码保持一致
$order_info['order_objects'][$key]['sale_price'] = floatval(sprintf('%.3f', $tmp_obj_sale_price));
if($order_info['settlement_amount'] > 0) {
continue;
}
$platformAmount = $couponPlatform->getPlatformAmount($obj);
$order_info['order_objects'][$key]['platform_amount'] = $platformAmount;
$order_info['order_objects'][$key]['settlement_amount'] = $platformAmount + $obj['divide_order_fee'];
@@ -220,7 +220,8 @@ class ome_sales_original_data
$sum -= abs($data['discount']);
}
$sum = $sum - $data['pmt_goods'] - $data['pmt_order'];
// 使用 bcmath 进行精确计算，避免浮点数精度问题
$sum = bcsub(bcsub($sum, $data['pmt_goods'], 3), $data['pmt_order'], 3);
$data['total_amount'] = $data['total_amount']-$data['service_price']-$data['refund_money'];
if(bccomp($data['total_amount'], $sum, 3) == 0){
return true;
@@ -235,4 +236,4 @@ class ome_sales_original_data
}
}
}
}