From ea7e9351b88a5c8075b1abb8336bc4fc808fe896 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 24 五月 2024 15:34:02 +0800
Subject: [PATCH] zjh 2024/05/24-1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 52 ++++------------------------------------------------
1 files changed, 4 insertions(+), 48 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 e2dc3e3..5a6dff8 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
@@ -1240,12 +1240,7 @@
}
tjReservation.setIsExpire(1);
tjReservationService.updateById(tjReservation);
-// if (null != tjReservation.getTeamNo()) {
-// tjOrder.setTjType("1");
-// } else {
-// tjOrder.setTjType("2");
-// }
- }
+
//鐢熸垚浣撴鍙�
String tjNumber = (sysUser.getUserName() + new SimpleDateFormat("yyMMddHHmmss").format(new Date()));
@@ -1291,7 +1286,7 @@
TjFlowingWater tjFlowingWater = new TjFlowingWater();
tjFlowingWater.setPayStasus(0L);
if ("1".equals(tjOrder.getTjType())) {
- if (null != tjReservation && tjReservation.getPayType() == 1) {
+ if (tjReservation.getPayType() == 1) {
tjFlowingWater.setPayStasus(3L);
}
}
@@ -1310,11 +1305,6 @@
Date date1 = new Date(System.currentTimeMillis());
String s1 = sysUser.getUserName() + new SimpleDateFormat("yyMMddHHmmssSSS").format(date1);
tjFlowingWater.setWaterId(PinyinUtil.getFirstLetter(tjCustomer.getCusName(), "").toUpperCase() + s1);
-
-
-// tjFlowingWater.setCopeWith(tjOrder.getTjFlowingWater().getCopeWith());
-// tjFlowingWater.setPaidIn(tjOrder.getTjFlowingWater().getPaidIn());
-// tjFlowingWater.setDiscount(tjOrder.getTjFlowingWater().getDiscount());
if (isPay.equals("true")) {
if (null != mallOrder) {
@@ -1337,11 +1327,6 @@
mallOrder.setOrderStatus(301L);
mallOrderService.updateById(mallOrder);
}
- } else {
-// tjFlowingWater.setCopeWith(tjOrder.getTjFlowingWater().getCopeWith());
-// tjFlowingWater.setPaidIn(tjOrder.getTjFlowingWater().getPaidIn());
-// tjFlowingWater.setDiscount(tjOrder.getTjFlowingWater().getDiscount());
-// tjFlowingWater.setPayStasus(0L);
}
}
if (tjFlowingWaterService.save(tjFlowingWater)) {
@@ -1350,43 +1335,14 @@
}
-
- //鍥綋
-// if ("1".equals(tjOrder.getTjType())) {
asyncService.ttextracted(tjOrder, tjCustomer, sysUser, tjReservation, tjFlowingWater);
-// }
- //涓汉
-// if ("2".equals(tjOrder.getTjType())) {
-// //asyncService.newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
-// newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
-// }
- //璋冪敤SQL server鎷垮彇鏀惰垂鎯呭喌
- //鏍规嵁閰嶇疆璋冨彇瀛樺偍杩囩▼ 灏嗕复鏃惰〃鏁版嵁瀛樺叆棰勭害琛�2023.12.12
-// final String getInfoFromSqlData = configService.selectConfigByKey("getInfoFromSqlData");
-// if ("Y".equals(getInfoFromSqlData)){
-// 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();
-// }
-// }
-// }
-//
-// }
-// }
+
tjCustomer.setCardId("0");
tjCustomerService.updateById(tjCustomer);
return AjaxResult.success(tjNumber);
}
+ }
return AjaxResult.error();
}
--
Gitblit v1.8.0