From a4be9afd87293012d34ac7fc0ab6bb6331802a0d Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期三, 26 六月 2024 15:14:10 +0800
Subject: [PATCH] zjh 本地 2024/06/26 --2
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 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..192b101 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
@@ -445,9 +445,8 @@
if (null != tjCustomer) {
order.setTjCustomerSex(tjCustomer.getCusSex());
order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
- order.setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName()));
order.setTjCustomerName(tjCustomer.getCusName());
- order.setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone()));
+ order.setTjCustomerPhone(tjCustomer.getCusPhone());
// order.setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard()));
order.setTjCusIdCard(tjCustomer.getCusIdcard());
order.setCareer(tjCustomer.getCareer());
@@ -1989,7 +1988,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 +2274,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