From 7f73120f52656d8fa62f0107d4c9df6b0067e66f Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期五, 22 十二月 2023 11:40:14 +0800
Subject: [PATCH] zjh 本地 2023/12/22 -2
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java | 3 ++-
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 51 +++++++++++++++++++++++++++------------------------
2 files changed, 29 insertions(+), 25 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
index e769abc..8de8799 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
@@ -7,6 +7,7 @@
import javax.servlet.http.HttpServletResponse;
import cn.hutool.core.date.DateUtil;
+import cn.hutool.extra.pinyin.PinyinUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ltkj.common.core.domain.entity.SysUser;
import com.ltkj.common.utils.SecurityUtils;
@@ -205,7 +206,7 @@
TjOrder order = orderService.getById(tjFlowingWater.getOrderId());
TjCustomer customer = customerService.getById(order.getUserId());
if (null != tjFlowingWater.getTjProIds() && tjFlowingWater.getTjProIds().length > 0) {
- tjFlowingWater.setWaterId(SecurityUtils.getUsername() + DateUtil.format(new Date(), "yyMMddHHmmssSSS"));
+ tjFlowingWater.setWaterId(PinyinUtil.getFirstLetter(customer.getCusName(), "").toUpperCase() + DateUtil.format(new Date(), "yyMMddHHmmssSSS"));
tjFlowingWater.setIsAddition("Y");
if (tjFlowingWaterService.save(tjFlowingWater)) {
//寮傛鍗曢」鏀惰垂鏄庣粏
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 ae3bb0a..0b18e13 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
@@ -407,8 +407,10 @@
order.setTjCustomerSex(tjCustomer.getCusSex());
order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
order.setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName()));
+ order.setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName()));
order.setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone()));
- order.setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard()));
+// order.setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard()));
+ order.setTjCusIdCard(tjCustomer.getCusIdcard());
order.setCareer(tjCustomer.getCareer());
order.setIdType(tjCustomer.getIdType());
order.setAgeUnit(tjCustomer.getAgeUnit());
@@ -894,38 +896,39 @@
if ("Y".equals(getInfoFromSqlData)){
//鏌ヨ鏄惁his宸叉敹璐� 鑻ユ敹璐瑰垯灏嗘祦姘磋〃鏀惰垂鐘舵�佹敼鎴愬凡鏀惰垂
- LambdaQueryWrapper<LtkjMiddleHead> middleHeadLambdaQueryWrapper =new LambdaQueryWrapper<>();
- middleHeadLambdaQueryWrapper.eq(LtkjMiddleHead::getPatId,tjCustomer.getCusIdcard());
- middleHeadLambdaQueryWrapper.eq(LtkjMiddleHead::getIsCanceled,"N");
- middleHeadLambdaQueryWrapper.eq(LtkjMiddleHead::getIsChg,"Y");
- LtkjMiddleHead middleHead = headService.getOne(middleHeadLambdaQueryWrapper);
+// LambdaQueryWrapper<LtkjMiddleHead> middleHeadLambdaQueryWrapper =new LambdaQueryWrapper<>();
+// middleHeadLambdaQueryWrapper.eq(LtkjMiddleHead::getPatId,tjCustomer.getCusIdcard());
+// middleHeadLambdaQueryWrapper.eq(LtkjMiddleHead::getIsCanceled,"N");
+// middleHeadLambdaQueryWrapper.eq(LtkjMiddleHead::getIsChg,"Y");
+// LtkjMiddleHead middleHead = headService.getOne(middleHeadLambdaQueryWrapper);
+ LtkjMiddleHead middleHead = testMapper.getMiddleHeadByPartId(tjCustomer.getCardId());
if(null !=middleHead){
tjFlowingWater.setPayStasus(1L);
}
- List<LtkjMiddleHead> one = testMapper.saveMiddleHeadByPatId(tjCustomer.getCusIdcard());
- if (one!=null){
- for (LtkjMiddleHead ltkjMiddleHead : one) {
- DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
- headService.save(ltkjMiddleHead);
- DynamicDataSourceContextHolder.clearDataSourceType();
- List<LtkjMiddleDetail> detailList = testMapper.getMiddleDetailByHeadId(ltkjMiddleHead.getFeadId());
- if (detailList!=null){
- for (LtkjMiddleDetail ltkjMiddleDetail : detailList) {
- DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
- middleDetailService.save(ltkjMiddleDetail);
- DynamicDataSourceContextHolder.clearDataSourceType();
- }
- }
- }
-
- }
+// List<LtkjMiddleHead> one = testMapper.saveMiddleHeadByPatId(tjCustomer.getCusIdcard());
+// if (one!=null){
+// for (LtkjMiddleHead ltkjMiddleHead : one) {
+// DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
+// headService.save(ltkjMiddleHead);
+// DynamicDataSourceContextHolder.clearDataSourceType();
+// List<LtkjMiddleDetail> detailList = testMapper.getMiddleDetailByHeadId(ltkjMiddleHead.getFeadId());
+// if (detailList!=null){
+// for (LtkjMiddleDetail ltkjMiddleDetail : detailList) {
+// DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
+// middleDetailService.save(ltkjMiddleDetail);
+// DynamicDataSourceContextHolder.clearDataSourceType();
+// }
+// }
+// }
+//
+// }
}
tjFlowingWater.setOrderId(tjOrder.getOrderId());
Date date1 = new Date(System.currentTimeMillis());
String s1 = SecurityUtils.getUsername() + new SimpleDateFormat("yyMMddHHmmssSSS").format(date1);
- tjFlowingWater.setWaterId(PinyinUtil.getFirstLetter(tjCustomer.getCusName().toUpperCase(), "") + s1);
+ tjFlowingWater.setWaterId(PinyinUtil.getFirstLetter(tjCustomer.getCusName(), "").toUpperCase() + s1);
if (null != mallOrder) {
if (mallOrder.getOrderStatus().equals(201L)) {
tjFlowingWater.setCopeWith(mallOrder.getActualPrice());
--
Gitblit v1.8.0