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

29
app/erpapi/lib/shop/matrix/luban/request/aftersale.php
View File

@@ -248,11 +248,12 @@ class erpapi_shop_matrix_luban_request_aftersale extends erpapi_shop_request_aft
}else{
$file_url = is_array($params['reason']) ? $params['reason']['refuse_proof'] : '';
}
$refuse_reason = $this->getRefuseReason();
$arr_params = is_array($params['reason']) ? $params['reason'] : array();
$refuse_reason = ome_func::cast_index_to_key($refuse_reason,'reason_id');
$arr_params = is_array($params['reason']) ? $params['reason'] : array();
//兼容
if(isset($arr_params['reject_reason_code']) && $arr_params['reject_reason_code']){
$arr_params['reject_reason_code'] = trim($arr_params['reject_reason_code']);
@@ -264,7 +265,7 @@ class erpapi_shop_matrix_luban_request_aftersale extends erpapi_shop_request_aft
if(isset($refuse_reason[$arr_params['reject_reason_code']])){
$params['reason'] = $refuse_reason[$arr_params['reject_reason_code']]['reason_text'];
}else{
$params['reason'] = '';
$params['reason'] = (is_string($params['reason']) ? $params['reason'] : '');
}
$params['reject_reason_code'] = $arr_params['reject_reason_code'];
@@ -372,20 +373,32 @@ class erpapi_shop_matrix_luban_request_aftersale extends erpapi_shop_request_aft
}else{
$file_url = is_array($params['reason']) ? $params['reason']['refuse_proof'] : '';
}
$refuse_reason = $this->getRefuseReason();
$arr_params = $params['reason'];
$refuse_reason = ome_func::cast_index_to_key($refuse_reason,'reason_id');
//兼容
$arr_params['reject_reason_code'] = is_array($arr_params) && $arr_params['reject_reason_code'] ? $arr_params['reject_reason_code'] : '1';
// reason
$arr_params = is_array($params['reason']) ? $params['reason'] : array();
//兼容
if(isset($arr_params['reject_reason_code']) && $arr_params['reject_reason_code']){
$arr_params['reject_reason_code'] = trim($arr_params['reject_reason_code']);
}else{
$arr_params['reject_reason_code'] = '1';
}
if(isset($refuse_reason[$arr_params['reject_reason_code']]['reason_text'])){
$params['reason'] = $refuse_reason[$arr_params['reject_reason_code']]['reason_text'];
}else{
$params['reason'] = (is_string($params['reason']) ? $params['reason'] : '');
}
$params['reason'] = $refuse_reason[$arr_params['reject_reason_code']]['reason_text'];
$params['reject_reason_code'] = $arr_params['reject_reason_code'];
$params['remark'] = $arr_params['remark'];
$params['url'] = $file_url;
$params['parse'] = empty($arr_params['parse']) ? 'first' : $arr_params['parse'];
$params['version'] = '2.0';
//[兼容]先同意退货再进行拒绝
if(in_array($aftersale['status'], array('2','3','4'))){
$parseVal = $this->_getParseConfirm($aftersale);