From db92e88a70a59437b48c9369cf1c46dba0ecb0a5 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期日, 15 十月 2023 13:25:33 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
index 0f56ff6..1d66c6e 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -198,17 +198,29 @@
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, String> param = new HashMap<>();
+ 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);
+
+ List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(orderId);
+
+ for (OrderDetl orderDetl : orderDetls){
+ Map<String, Object> odMap = new HashMap<>();
+ odMap.put("autoid",orderDetl.getItemNum());
+ odMap.put("iQuantity",orderDetl.getQty());
+ orderDetlsParam.add(odMap);
+ }
int code = doHttpRequest(param, "鍗曟嵁瀹℃牳", url, orderReportPath, null, "127.0.0.1");
//int code = doHttpRequest(param, "鍗曟嵁瀹℃牳", "localhost:8080", "/test/report", null, "127.0.0.1");
- if(code == 200){
+ if(code == 0){
order.setSettle(6L);
this.updateById(order);
}
--
Gitblit v1.9.1