src/main/java/com/zy/asrs/controller/OrderController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/asrs/service/OrderService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/controller/OrderController.java
@@ -363,7 +363,7 @@ @ManagerAuth(memo = "手动上传订单") @Transactional public R report(@RequestParam Long orderId){ orderService.report(orderId,getUserId()); orderService.report(orderId,getUser().getUsername()); return R.ok(); } src/main/java/com/zy/asrs/service/OrderService.java
@@ -23,7 +23,7 @@ void remove(Long orderId); void report(Long orderId, Long userId); void report(Long orderId, String username); List<Order> selectComplete(); src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -198,13 +198,13 @@ orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", orderId)); } public void report(Long orderId, Long userId) { public void report(Long orderId, String username) { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); Order order = this.selectById(orderId); Map<String, Object> param = new HashMap<>(); param.put("id",order.getOrderNo()); param.put("dDate",sdf.format(new Date())); param.put("cHandler",userId.toString()); param.put("cHandler",username); List<Map<String,Object>> orderDetlsParam = new ArrayList<>(); param.put("orderDetails",orderDetlsParam);