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

48
app/openapi/lib/data/original/sales.php
View File

@@ -16,13 +16,6 @@
*/
class openapi_data_original_sales{
/**
* 获取List
* @param mixed $filter filter
* @param mixed $offset offset
* @param mixed $limit limit
* @return mixed 返回结果
*/
public function getList($filter,$offset=0,$limit=100){
$sqlstr = '1';
$shopObj = app::get('ome')->model('shop');
@@ -450,14 +443,32 @@ class openapi_data_original_sales{
}
/**
* SalesAmount
* @param mixed $start_time start_time
* @param mixed $end_time end_time
* @param mixed $offset offset
* @param mixed $limit limit
* @param mixed $shop_bn shop_bn
* @return mixed 返回值
* 返回所有备注内容
* @param string $mark_text 序列化的备注数据
* @return string 所有op_content内容，用||连接
* @access public
*/
function getAllMarkText($mark_text)
{
if (empty($mark_text)) {
return '';
}
$mark = @unserialize($mark_text);
if (!is_array($mark) || empty($mark)) {
return '';
}
$opContents = array();
foreach ($mark as $item) {
if (is_array($item) && isset($item['op_content']) && !empty($item['op_content'])) {
$opContents[] = $item['op_content'];
}
}
return implode('||', $opContents);
}
public function SalesAmount($start_time,$end_time,$offset=0,$limit=100,$shop_bn = false){
if(empty($start_time) || empty($end_time)){
return false;
@@ -534,11 +545,11 @@ class openapi_data_original_sales{
/**
* 销售发货明细
*
*
* @return array
* @author CP
* @version 4.3.9 2021-08-14T10:54:17+08:00
* */
**/
public function getDeliveryList($filter, $offset = 0, $limit = 100)
{
$saleDelivMdl = app::get('sales')->model('delivery_order');
@@ -583,7 +594,7 @@ class openapi_data_original_sales{
$materialExtList = array_column($materialExtList, null, 'bm_id');
//获取订单支付方式
$orderIds = array_column($itemTmpList, 'order_id');
$orders = app::get('ome')->model('orders')->getList('order_id,platform_order_bn,payment,relate_order_bn,order_type',['order_id'=>$orderIds]);
$orders = app::get('ome')->model('orders')->getList('order_id,platform_order_bn,payment,relate_order_bn,order_type,mark_text',['order_id'=>$orderIds]);
$orders = array_column($orders, null, 'order_id');
$sales_arr = app::get('ome')->model('sales')->getList('sale_id,order_id,sale_bn',array('order_id'=>$orderIds),0,-1);
$sales_arr = array_column($sales_arr, null, 'order_id');
@@ -651,6 +662,7 @@ class openapi_data_original_sales{
'order_item_id'=>$value['order_item_id'],
'cost_tax' => $cost_tax,
'pay_method' => (string) $orders[$value['order_id']]['payment'],
'mark_text' => $this->getAllMarkText($orders[$value['order_id']]['mark_text']),
'batchs' => $this->_getBatchs($useLifeLog_arr, $value),
'props' => $this->_getProps($doiPropsItems[$value['id']]),
];
@@ -855,4 +867,4 @@ class openapi_data_original_sales{
'count' => $count,
];
}
}
}