From 809b68d15efe4dbc20f2eb28639606529743652d Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 15 九月 2023 16:34:06 +0800
Subject: [PATCH] zjh 2023/09/15---2

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java |   15 ++++-----------
 1 files changed, 4 insertions(+), 11 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 338ecb8..34c95d8 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
@@ -15,6 +15,7 @@
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.crypto.symmetric.DES;
+import cn.hutool.extra.pinyin.PinyinUtil;
 import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -817,10 +818,8 @@
             }
             tjFlowingWater.setOrderId(tjOrder.getOrderId());
             Date date1 = new Date(System.currentTimeMillis());
-            SimpleDateFormat sdf = new SimpleDateFormat("yyMMddHHmmssSSS");
-            String userId1 = SecurityUtils.getUsername();
-            String s1 = userId1 + sdf.format(date1);
-            tjFlowingWater.setWaterId(s1);
+            String s1 = SecurityUtils.getUsername() + new SimpleDateFormat("yyMMddHHmmssSSS").format(date1);
+            tjFlowingWater.setWaterId(PinyinUtil.getFirstLetter(tjCustomer.getCusName(),"")+s1);
             if (null != mallOrder) {
                 if (mallOrder.getOrderStatus().equals(201L)) {
                     tjFlowingWater.setCopeWith(mallOrder.getActualPrice());
@@ -1551,17 +1550,12 @@
 
     public void newSaveextracted(TjOrder tjOrder, TjCustomer tjCustomer, BigDecimal discount, SysUser sysUser, TjReservation tjReservation, TjFlowingWater tjFlowingWater) {
         long l = System.currentTimeMillis();
-
-
         tjAskMedicalHistoryService.updateTjAskMedicalHistoryByCusId(tjOrder.getTjNumber(),sysUser.getNickName(),String.valueOf(sysUser.getUserId()), String.valueOf(tjCustomer.getCusId()));
-
         tjOrderDetailService.saveTjOrderDetailsByCusId(tjCustomer.getCusIdcard(),String.valueOf(tjOrder.getOrderId()),sysUser.getNickName(),String.valueOf(sysUser.getUserId()));
         //淇敼姣忛」鐨勫師浠风幇浠�
         transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(),discount);
-
         //娣诲姞remark琛ㄦ暟鎹�
         remarkService.saveTjOrderRemarkByOrderId(tjOrder.getTjNumber(),sysUser.getNickName(),String.valueOf(sysUser.getUserId()), String.valueOf(tjOrder.getOrderId()));
-
         //鍒ゆ柇鏄惁浜ら挶
         if ("1".equals(tjOrder.getTjType())) {
             if (null != tjReservation && tjReservation.getPayType() == 1) {
@@ -1573,8 +1567,7 @@
             tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
                     sysUser.getNickName(), String.valueOf(sysUser.getUserId()),String.valueOf(tjFlowingWater.getTjSerialNumber()));
         }
-
-        System.out.println("杩欐浠g爜鏃堕棿"+( l - (System.currentTimeMillis()) ));
+        System.out.println("杩欐浠g爜鏃堕棿"+(System.currentTimeMillis()-l));
     }
 
 }

--
Gitblit v1.8.0