|
@@ -1347,18 +1347,17 @@ public class OmstruckOrderController extends BaseRESTfulController {
|
|
|
@ApiOperation(value = "通过运输订单Id查询订单信息给司机")
|
|
|
@PostMapping("/getMessageToApp")
|
|
|
public Map<String, Object> getMessageToApp(@RequestBody(required = false) Map<String,Object> mapvalue) {
|
|
|
- if(mapvalue.get("orderId") == null && mapvalue.get("orderNumber") == null)
|
|
|
+ if(mapvalue.get("orderId") == null && mapvalue.get("orderNumber") == null){
|
|
|
return null;
|
|
|
- BigDecimal orderId = null;
|
|
|
+ }
|
|
|
if(mapvalue.get("orderId") == null){
|
|
|
//通过运输订单号查询运输订单Id
|
|
|
String orderNumber = (String) mapvalue.get("orderNumber");
|
|
|
- if("\n".equals(orderNumber.substring(orderNumber.length()-1)))
|
|
|
+ if("\n".equals(orderNumber.substring(orderNumber.length()-1))){
|
|
|
orderNumber = orderNumber.substring(0, orderNumber.length() - 1);
|
|
|
+ }
|
|
|
Integer id = omstruckOrderMapper.getOrderIdByOrderNumber(orderNumber);
|
|
|
- orderId = new BigDecimal(id);
|
|
|
- }else {
|
|
|
- orderId = DataChange.dataToBigDecimal(mapvalue.get("orderId"));
|
|
|
+ mapvalue.put("orderId", id);
|
|
|
}
|
|
|
return omstruckOrderService.getMessageToApp(mapvalue);
|
|
|
}
|