From 46d3403bb8dcfeed6dd04c8f492a830e3ea8160b Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期一, 24 六月 2024 20:15:16 +0800
Subject: [PATCH] zjh 本地 2024/06/24 --1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
index 5d106d5..683f1b6 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -1989,7 +1989,7 @@
// } else {
// map.put("nowPrice", tjProject.getProPrice());
// }
- map.put("nowPrice", transitionService.getTbTransitionDxPriceByPac(cusId, entry.getKey(), cardId, pacId));
+ map.put("nowPrice",tjProject.getProPrice());
} else {
map.put("tjCategory",null);
map.put("pacName", "鍗曢」");
@@ -2275,7 +2275,9 @@
obj.putOpt("num",num);
BigDecimal price = ordPrice.divide(new BigDecimal(num));
obj.putOpt("danjia",price);
- obj.putOpt("time",tbTransition.getCreateTime());
+ Date createTime = tbTransition.getCreateTime();
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ obj.putOpt("time",dateFormat.format(createTime));
info.put(obj);
}
HashMap<String, Object> map = new HashMap<>();
--
Gitblit v1.8.0