|
|
@@ -189,12 +189,15 @@ class OrderIssue extends Model
|
|
|
if (empty($orderIssueMap[$key])) return "差异退回";
|
|
|
if(isset($rejectedMap[$key]['正品']) && isset($orderIssueMap[$key])){
|
|
|
if ( $rejectedMap[$key]['正品'] < $orderIssueMap[$key]) $portion += 1;
|
|
|
- if ( $rejectedMap[$key]['正品'] > $orderIssueMap[$key]) return "超量退回"; // 超量退回
|
|
|
+ if ( $rejectedMap[$key]['正品'] > $orderIssueMap[$key]) return "超量退回"; // 超量退回
|
|
|
if ( $rejectedMap[$key]['正品'] == $orderIssueMap[$key]) $equal += 1;
|
|
|
}
|
|
|
}
|
|
|
if ($equal == count($orderIssueMap) && $equal == count($rejectedMap) && $portion == 0) return "全部退回"; // 全部退回
|
|
|
- if ($portion > 0) return "部分退回"; // 部分退回
|
|
|
+ if ($portion > 0) return "部分退回"; // 部分退回
|
|
|
+ // 部分退回
|
|
|
+ if (count(array_diff_key($orderIssueMap,$rejectedMap)) > 0)return '部分退回';
|
|
|
+ if (count(array_diff_key($rejectedMap,$orderIssueMap)) > 0)return '差异退回';
|
|
|
return "无";
|
|
|
}
|
|
|
|