Commit 309f39d1 by 罗承锋

随身厅同步接口重复订单处理

parent 6b557a6e
...@@ -185,14 +185,23 @@ public class SyncController { ...@@ -185,14 +185,23 @@ public class SyncController {
return resultJson; return resultJson;
} }
Order order = new Order();;
boolean isInsert = true;
Wrapper<Order> orderWrapper = new EntityWrapper<>();
orderWrapper.eq("order_id", jsonObject.getString("recNo"));
List<Order> orders = orderMapper.selectList(orderWrapper);
if (orders != null && orders.size() > 0) {
order = orders.get(0);
isInsert = false;
}
// 组装hhr_order // 组装hhr_order
Order order = new Order();
String uuid = UUID.randomUUID().toString(); String uuid = UUID.randomUUID().toString();
String id = uuid.split("-")[0] + uuid.split("-")[1]; String id = uuid.split("-")[0] + uuid.split("-")[1];
SimpleDateFormat sd = new SimpleDateFormat("yyyyMMdd"); SimpleDateFormat sd = new SimpleDateFormat("yyyyMMdd");
SimpleDateFormat yyyyMMdd = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat yyyyMMdd = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String orderNumber = "YRYM" + sd.format(new Date()) + id.substring(1, 12); String orderNumber = "YRYM" + sd.format(new Date()) + id.substring(1, 12);
order.setId(id);
order.setHehuorenId(sysUser.getId()); order.setHehuorenId(sysUser.getId());
order.setOrderId(jsonObject.getString("recNo")); order.setOrderId(jsonObject.getString("recNo"));
order.setOrderNumber(orderNumber); order.setOrderNumber(orderNumber);
...@@ -210,10 +219,24 @@ public class SyncController { ...@@ -210,10 +219,24 @@ public class SyncController {
order.setHehuorenArea(sysUser.getSubstName()); order.setHehuorenArea(sysUser.getSubstName());
order.setLzgh(school.get("lzgh") != null ? school.get("lzgh").toString() : null); order.setLzgh(school.get("lzgh") != null ? school.get("lzgh").toString() : null);
order.setOrderStatus("已完成"); order.setOrderStatus("已完成");
orderMapper.insert(order);
// 组装order_view if (isInsert) {
order.setId(id);
orderMapper.insert(order);
}else{
orderMapper.updateById(order);
}
Wrapper<OrderView> orderViewWrapper = new EntityWrapper<>();
orderViewWrapper.eq("orderSeq", order.getKdOrderId());
List<OrderView> orderViews = orderViewMapper.selectList(orderViewWrapper);
OrderView orderView = new OrderView(); OrderView orderView = new OrderView();
if (orderViews != null && orderViews.size() > 0) {
orderView = orderViews.get(0);
}
// 组装order_view
orderView.setOrderSeq(order.getKdOrderId());
orderView.setOrderName(order.getCustomerName()); orderView.setOrderName(order.getCustomerName());
orderView.setOrderPhone(order.getContactNumber()); orderView.setOrderPhone(order.getContactNumber());
orderView.setOrderNumber(order.getIdCard()); orderView.setOrderNumber(order.getIdCard());
...@@ -231,7 +254,12 @@ public class SyncController { ...@@ -231,7 +254,12 @@ public class SyncController {
} }
orderView.setCustomerId("xyzxyql"); orderView.setCustomerId("xyzxyql");
orderView.setOrderCustomerType("学生"); orderView.setOrderCustomerType("学生");
orderViewMapper.insert(orderView);
if (orderView.getOrderId() != null) {
orderViewMapper.updateById(orderView);
}else{
orderViewMapper.insert(orderView);
}
resultJson.put("result", "0"); resultJson.put("result", "0");
resultJson.put("msg", "同步成功"); resultJson.put("msg", "同步成功");
......
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