| Line 164... |
Line 164... |
| 164 |
}
|
164 |
}
|
| 165 |
}else if(action.equals("markrejected")){
|
165 |
}else if(action.equals("markrejected")){
|
| 166 |
long orderId = Long.parseLong(orderIdString);
|
166 |
long orderId = Long.parseLong(orderIdString);
|
| 167 |
Order order = client.getOrder(orderId);
|
167 |
Order order = client.getOrder(orderId);
|
| 168 |
String reason = request.getParameter("reason");
|
168 |
String reason = request.getParameter("reason");
|
| - |
|
169 |
if(reason == null || reason.isEmpty()){
|
| - |
|
170 |
reason = request.getParameter("selectreason");
|
| - |
|
171 |
}
|
| 169 |
DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
172 |
DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
| 170 |
String returnReason = formatter.format(Calendar.getInstance().getTime()) + "|" + reason;
|
173 |
String returnReason = formatter.format(Calendar.getInstance().getTime()) + "|" + reason;
|
| 171 |
HashMap<String, String> orderMap = new HashMap<String, String>();
|
174 |
HashMap<String, String> orderMap = new HashMap<String, String>();
|
| 172 |
orderMap.put(order.getAirwaybill_no(), returnReason);
|
175 |
orderMap.put(order.getAirwaybill_no(), returnReason);
|
| 173 |
client.markAsRTOrders(order.getLogistics_provider_id(), orderMap);
|
176 |
client.markAsRTOrders(order.getLogistics_provider_id(), orderMap);
|