ecshop/OMS
1
0
Fork 0
mirror of https://gitee.com/ShopeX/OMS synced 2026-04-19 03:35:28 +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

8
app/ome/lib/order/coupon.php
View File

@@ -191,7 +191,7 @@ class ome_order_coupon
'coupon_type' => $coupon_type,
'amount' => $v,
'total_amount' => $v * $value['count'],
'create_time' => kernel::single('ome_func')->date2time($ext_data['createtime']),
'create_time' => sprintf('%.0f', time()),
'pay_time' => kernel::single('ome_func')->date2time($ext_data['payment_detail']['pay_time']),
'shop_type' => $ext_data['shop_type'],
'source' => $ext_data['coupon_source'],
@@ -250,7 +250,7 @@ class ome_order_coupon
'coupon_type' => '0',
'amount' => $calcPrice > 0 ? $calcPrice : 0,
'total_amount' => $total_amount,
'create_time' => kernel::single('ome_func')->date2time($ext_data['createtime']),
'create_time' => sprintf('%.0f', time()),
'pay_time' => kernel::single('ome_func')->date2time($ext_data['payment_detail']['pay_time']),
'shop_type' => $ext_data['shop_type'],
'source' => $ext_data['coupon_source'],
@@ -264,7 +264,7 @@ class ome_order_coupon
'material_name' => $value['skuName'],
'material_bn' => $orderObjects[$value['skuCode']]['bn'],
'oid' => $value['skuCode'],
'create_time' => kernel::single('ome_func')->date2time($ext_data['createtime']),
'create_time' => sprintf('%.0f', time()),
'shop_id' => $ext_data['shop_id'],
'shop_type' => $ext_data['shop_type'],
'source' => $ext_data['coupon_source'],
@@ -339,7 +339,7 @@ class ome_order_coupon
'coupon_type' => '1',
'amount' => $_saleMaterial['platform_discount'] / $_saleMaterial['quantity'],
'total_amount' => $_saleMaterial['platform_discount'],
'create_time' => $data['createtime'],
'create_time' => sprintf('%.0f', time()),
'pay_time' => $data['paytime'],
'shop_type' => $data['shop_type'],
'source' => 'rpc',