|
@@ -855,10 +855,14 @@ public class AdminOrderController {
|
|
|
row.add(salesOrder.getSalesPostageCost() == null ? 0 : salesOrder.getSalesPostageCost()/100);
|
|
|
String temp = "京东仓";
|
|
|
if (salesOrder.getSalesSendType() != 3) {
|
|
|
- if (salesOrder.getSalesWarehouseId() == 1) {
|
|
|
- temp = "正常仓库";
|
|
|
+ if (salesOrder.getSalesWarehouseId() == null) {
|
|
|
+ temp = null;
|
|
|
} else {
|
|
|
- temp = "维修仓库";
|
|
|
+ if (salesOrder.getSalesWarehouseId() == 1) {
|
|
|
+ temp = "正常仓库";
|
|
|
+ } else {
|
|
|
+ temp = "维修仓库";
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
row.add(temp);
|