From ccbcd23becc1359f26d8cc571005e546e2ed6053 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 22 五月 2024 17:59:39 +0800
Subject: [PATCH] zjh 2024/05/22-1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 89 +++++++++++++++++++++++---------------------
1 files changed, 47 insertions(+), 42 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 1756b81..27a6210 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
@@ -33,6 +33,7 @@
import com.ltkj.framework.config.UserHoder;
import com.ltkj.framework.datasource.DynamicDataSourceContextHolder;
import com.ltkj.hosp.domain.*;
+import com.ltkj.hosp.dto.QianDaoDto;
import com.ltkj.hosp.mapper.TestMapper;
import com.ltkj.hosp.service.*;
import com.ltkj.hosp.sqlDomain.LtkjMiddleDetail;
@@ -1015,10 +1016,10 @@
@PostMapping("/addPlOrderAndDetail")
@ApiOperation(value = "浣撴鎵归噺绛惧埌鐧昏鎺ュ彛")
@Transactional //(鍒囨崲鏁版嵁搴撳嚭閿欙紝鎵�浠ユ敞閲�)
- public AjaxResult addPlOrderAndDetail(@RequestBody List<String> cusIds){
+ public AjaxResult addPlOrderAndDetail(@RequestBody QianDaoDto daoDto){
SysUser sysUser = UserHoder.getLoginUser().getUser();
+ List<String> cusIds = daoDto.getCusIds();
if(null !=cusIds && cusIds.size()>0){
-
ExecutorService threadPools = Executors.newFixedThreadPool(cusIds.size());
for (String cusId : cusIds) {
threadPools.execute(new Runnable() {
@@ -1038,7 +1039,7 @@
@Override
public void run() {
try {
- getAjaxResult(aLong,sysUser);
+ getAjaxResult(aLong,sysUser,daoDto.getTjCategory());
threadPool.shutdown();
} catch (IOException e) {
e.printStackTrace();
@@ -1105,14 +1106,14 @@
wq.eq(TjReservation::getIsExpire, 2);
TjReservation tjReservation = tjReservationService.getOne(wq);
if (tjReservation != null) {
- if (DateUtil.endOfDay(new Date()).before(tjReservation.getReservationTime())) {
+/* if (DateUtil.endOfDay(new Date()).before(tjReservation.getReservationTime())) {
// return AjaxResult.error("鏈埌棰勭害鏃堕棿");
}
if (null != tjReservation.getReservationTime() && DateUtil.endOfDay(tjReservation.getReservationTime()).before(new Date())) {
tjReservation.setIsExpire(1);
tjReservationService.updateById(tjReservation);
// return AjaxResult.error("瀵逛笉璧锋偍鐨勯绾﹀凡瓒呮椂璇烽噸鏂伴绾�");
- }
+ }*/
LambdaQueryWrapper<TjCustomer> qw = new LambdaQueryWrapper<>();
qw.eq(TjCustomer::getCusIdcard, cusIdcard);
TjCustomer tjCustomer1 = tjCustomerService.getOne(qw);
@@ -1131,40 +1132,34 @@
tjCustomer1.setAgeUnit(tjReservation.getAgeUnit());
tjCustomer1.setCareer(tjReservation.getCareer());
tjCustomerService.updateById(tjCustomer1);
+ }else {
+ TjCustomer tjCustomer = new TjCustomer();
+ tjCustomer.setCusIdcard(tjReservation.getIdCard());
+ tjCustomer.setCusName(tjReservation.getName());
+ tjCustomer.setCusSex(Long.valueOf(tjReservation.getSex()));
+ tjCustomer.setCusBrithday(tjReservation.getBirthday());
+ tjCustomer.setCusPhone(tjReservation.getPhoe());
+ tjCustomer.setCusEmail(tjReservation.getEmail());
+ tjCustomer.setCusAddr(tjReservation.getAddress());
+ tjCustomer.setCusMarryStatus(String.valueOf(tjReservation.getMarriage()));
+ tjCustomer.setCusNational(String.valueOf(tjReservation.getNation()));
+ tjCustomer.setIdType(tjReservation.getIdType());
+ tjCustomer.setAge(tjReservation.getAge());
+ tjCustomer.setAgeUnit(tjReservation.getAgeUnit());
+ tjCustomer.setCareer(tjReservation.getCareer());
+ tjCustomer.setDwPhone(tjReservation.getDwPhone());
+ tjCustomer.setCardId(tjReservation.getCardId());
+ tjCustomer.setIndexCard(tjReservation.getIndexCard());
+ //鎴彇瀵嗙爜鑷姩鐢熸垚set杩涘幓
+ String substring = cusIdcard.substring(cusIdcard.length() - 6);
+ substring = DigestUtils.md5DigestAsHex(substring.getBytes());
+ tjCustomer.setCusPassword(substring);
+ tjCustomer.setTjType(tjReservation.getTjType());
+ tjCustomerService.save(tjCustomer);
}
- TjCustomer tjCustomer = new TjCustomer();
- tjCustomer.setCusIdcard(tjReservation.getIdCard());
- tjCustomer.setCusName(tjReservation.getName());
- tjCustomer.setCusSex(Long.valueOf(tjReservation.getSex()));
- tjCustomer.setCusBrithday(tjReservation.getBirthday());
- tjCustomer.setCusPhone(tjReservation.getPhoe());
- tjCustomer.setCusEmail(tjReservation.getEmail());
- tjCustomer.setCusAddr(tjReservation.getAddress());
- tjCustomer.setCusMarryStatus(String.valueOf(tjReservation.getMarriage()));
- tjCustomer.setCusNational(String.valueOf(tjReservation.getNation()));
-
- tjCustomer.setIdType(tjReservation.getIdType());
- tjCustomer.setAge(tjReservation.getAge());
- tjCustomer.setAgeUnit(tjReservation.getAgeUnit());
- tjCustomer.setCareer(tjReservation.getCareer());
- tjCustomer.setDwPhone(tjReservation.getDwPhone());
- tjCustomer.setCardId(tjReservation.getCardId());
- tjCustomer.setIndexCard(tjReservation.getIndexCard());
-
- //鎴彇瀵嗙爜鑷姩鐢熸垚set杩涘幓
- String substring = cusIdcard.substring(cusIdcard.length() - 6);
- substring = DigestUtils.md5DigestAsHex(substring.getBytes());
- tjCustomer.setCusPassword(substring);
- tjCustomer.setTjType(tjReservation.getTjType());
- tjCustomerService.save(tjCustomer);
-// return success(tjCustomer);
}
-// LambdaQueryWrapper<TjCustomer> qw = new LambdaQueryWrapper<>();
-// qw.eq(TjCustomer::getCusIdcard, cusIdcard);
-// TjCustomer tjCustomer = tjCustomerService.getOne(qw);
-// return AjaxResult.success("鏆傛棤棰勭害淇℃伅",tjCustomer);
+
}
-// return error("韬唤璇佸彿涓嶅瓨鍦�");
}
private void extracteds(TjCustomer customer) {
@@ -1191,7 +1186,7 @@
DynamicDataSourceContextHolder.clearDataSourceType();
}
- private AjaxResult getAjaxResult(Long userId,SysUser sysUser) throws IOException {
+ private AjaxResult getAjaxResult(Long userId,SysUser sysUser,String tjCategory) throws IOException {
LambdaQueryWrapper<TjCustomer> wq = new LambdaQueryWrapper<>();
wq.eq(TjCustomer::getCusId,userId);
@@ -1211,7 +1206,13 @@
return AjaxResult.error("涓嶅彲閲嶅鐧昏");
}
TjOrder tjOrder=new TjOrder();
+ Date date=new Date();
+ tjOrder.setCreateTime(date);
+ tjOrder.setUpdateTime(date);
+ tjOrder.setCreateBy(sysUser.getNickName());
+ tjOrder.setUpdateBy(sysUser.getNickName());
tjOrder.setUserId(userId);
+ tjOrder.setTjCategory(tjCategory);
LambdaQueryWrapper<TjReservation> wq1 = new LambdaQueryWrapper<>();
wq1.eq(TjReservation::getIdCard, tjCustomer.getCusIdcard());
wq1.eq(TjReservation::getIsExpire, 2);
@@ -1239,14 +1240,17 @@
}
tjReservation.setIsExpire(1);
tjReservationService.updateById(tjReservation);
- if (null != tjReservation.getTeamNo()) {
- tjOrder.setTjType("1");
- } else {
- tjOrder.setTjType("2");
- }
+// if (null != tjReservation.getTeamNo()) {
+// tjOrder.setTjType("1");
+// } else {
+// tjOrder.setTjType("2");
+// }
}
//鐢熸垚浣撴鍙�
String tjNumber = (sysUser.getUserName() + new SimpleDateFormat("yyMMddHHmmss").format(new Date()));
+
+ tjNumber=tjNumber.replaceAll(".{4}$",userId.toString().substring(userId.toString().length() - 4));
+
tjOrder.setTjNumber(tjNumber);
if (null != tjOrder.getPhoto()) {
File file = new File(tjOrder.getPhoto());
@@ -1270,6 +1274,7 @@
if (null != mallOrder) tjOrder.setMallOrderId(String.valueOf(mallOrder.getId()));
tjOrder.setStatus(TjConstants.TJ_BEGIN);
tjOrder.setCardId(tjCustomer.getCardId());
+ tjOrder.setTjType("1");
if (tjOrderService.save(tjOrder)) {
//淇濆瓨鏀惰揣鍦板潃
if ("2".equals(tjOrder.getGetType())) {
--
Gitblit v1.8.0