Commit ea01bade zshaohui

1.迈征生成工单修改

1 个父辈 9cd1204c
......@@ -92,7 +92,7 @@ public class MaiZhengController {
@RequestMapping("/askReelBox")
@AnonymousAccess
public Map<String, String> askReelBox(@RequestBody AskReelBox askReelBox) {
log.error("收到迈征请求数据为:" + JSON.toJSONString(askReelBox));
log.info("收到迈征请求数据为:" + JSON.toJSONString(askReelBox));
String result = "OK";
askReelBoxMap.put(askReelBox.getGUID(), askReelBox);
Map<String, String> resultMap = new HashMap<>();
......@@ -115,8 +115,8 @@ public class MaiZhengController {
maiZhengApi.prepareReelBox(entry.getKey(), result);
log.info("处理结束:" + entry.getKey() + "的数据,结果为:" + result);
}
askReelBoxMap.clear();
}
}, 10, 5, TimeUnit.SECONDS);
}
......@@ -190,7 +190,6 @@ public class MaiZhengController {
liteOrder = liteOrderManager.save(liteOrder);
liteOrderCache.addOrderToMap(liteOrder);
log.info(guid + "工单任务已经生成,任务数量为:" + orderItemList.size());
askReelBoxMap.remove(guid);
return "OK";
}
......
......@@ -81,9 +81,9 @@ public class MaiZhengDeviceController {
if ("OK".equalsIgnoreCase(resultStr)) {
liteOrder.setTransReelBox(true);
liteOrderManager.save(liteOrder);
return ResultBean.newOkResult("");
return ResultBean.newOkResult(liteOrder);
} else {
return ResultBean.newErrorResult(-1, "smf.maizheng.error", "transReelBox返回异常:" + resultStr);
return ResultBean.newErrorResult(-1, "smf.maizheng.error", liteOrder.getOrderNo()+"transReelBox返回异常:" + resultStr);
}
}
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!