From f534205b3d162e36f6e230ae46d811a1edfb6d95 Mon Sep 17 00:00:00 2001 From: zjh <zjh@888> Date: 星期二, 19 十二月 2023 18:06:02 +0800 Subject: [PATCH] zjh 本地 2023/12/19 -1 --- ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 76 +++++++++++++++++++++++++++++--------- 1 files changed, 58 insertions(+), 18 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 635c883..590d55c 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 @@ -884,10 +884,45 @@ tjFlowingWater.setPayStasus(3L); } } + + //璋冪敤SQL server鎷垮彇鏀惰垂鎯呭喌 + //鏍规嵁閰嶇疆璋冨彇瀛樺偍杩囩▼ 灏嗕复鏃惰〃鏁版嵁瀛樺叆棰勭害琛�2023.12.12 + final String getInfoFromSqlData = configService.selectConfigByKey("getInfoFromSqlData"); + 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); + 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(); + } + } + } + + } + } + + 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(), "") + s1); + tjFlowingWater.setWaterId(PinyinUtil.getFirstLetter(tjCustomer.getCusName().toUpperCase(), "") + s1); if (null != mallOrder) { if (mallOrder.getOrderStatus().equals(201L)) { tjFlowingWater.setCopeWith(mallOrder.getActualPrice()); @@ -933,23 +968,28 @@ } //璋冪敤SQL server鎷垮彇鏀惰垂鎯呭喌 - 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(); - } - } - } + //鏍规嵁閰嶇疆璋冨彇瀛樺偍杩囩▼ 灏嗕复鏃惰〃鏁版嵁瀛樺叆棰勭害琛�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(); +// } +// } +// } +// +// } +// } - } return AjaxResult.success(tjNumber); } return AjaxResult.error(); @@ -1658,7 +1698,7 @@ tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber())); } - System.out.println("杩欐浠g爜鏃堕棿" + (System.currentTimeMillis() - l)); +// System.out.println("杩欐浠g爜鏃堕棿" + (System.currentTimeMillis() - l)); } -- Gitblit v1.8.0