Commit 21312808 by 罗承锋

提交小白卡错误

parent fdba89f7
......@@ -76,6 +76,8 @@ public class ChooseController {
Order order = orderMapper.selectList(orderWrapper).get(0);
orderId = order.getOrderId();
log.info("" + "待识别".equals(order.getOrderStatus()));
if("待活体".equals(order.getOrderStatus()) || "待识别".equals(order.getOrderStatus())){
general(order);
}
......@@ -156,6 +158,8 @@ public class ChooseController {
try{
Map<String, Object> dataMapping = new HashMap<>();
JSONObject jsonObject = XbkUtil.orderInfoJT0006(order.getXbOrderId());
log.info("订单信息:" + JSONObject.toJSONString(order));
log.info("小白卡获取状态:" + jsonObject);
if (jsonObject.get("code") != null && jsonObject.get("code").toString().equals("0")) {
String dataArray = jsonObject.getString("dataArray");
Map<String,Object> map = JSON.parseObject(dataArray, HashMap.class);
......@@ -165,13 +169,13 @@ public class ChooseController {
map.get("orderState").toString().equals("21") ){
Order updateOrder = new Order();
updateOrder.setOrderStatus("待处理");
if (map.get("tj_type").toString().equals("0")) {
if (order.getTjType().equals("0")) {
updateOrder.setOrderStatus("待活体");
}
OrderHistory orderHistory = new OrderHistory();
orderHistory.setOrderId(order.getId());
orderHistory.setCreateDate(new Date());
if (map.get("tj_type").equals("0")) {
if (order.getTjType().equals("0")) {
orderHistory.setStatus("已上传三证等待活体");
} else {
orderHistory.setStatus("已上传三证等待配送后进行活体");
......@@ -210,6 +214,7 @@ public class ChooseController {
}
}
} catch (Exception e) {
e.printStackTrace();
log.error(order.getXbOrderId()+"订单更新失败",e.getMessage());
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment