From 1ce606a5cd06b859a57eabf8b12c4fb3704168b4 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 06 一月 2025 16:46:16 +0800
Subject: [PATCH] 20250106
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 73 ++++++++++++++++++------------------
1 files changed, 37 insertions(+), 36 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 63c41d8..fbc2e45 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
@@ -498,13 +498,9 @@
order.setIdType(tjCustomer.getIdType());
order.setAgeUnit(tjCustomer.getAgeUnit());
order.setTjCount(String.valueOf(tjCustomer.getCusNumber()));
- if (null != tjCustomer.getCompName()) {
- order.setDictCompName(tjCustomer.getCompName());
- } else {
- String firmId = order.getFirmId();
- if (firmId != null && null != iDictCompService.getById(String.valueOf(order.getFirmId()))) {
- order.setDictCompName(iDictCompService.getById(String.valueOf(order.getFirmId())).getCnName());
- }
+ String firmName = order.getFirmName();
+ if (StringUtil.isNotBlank(firmName)) {
+ order.setDictCompName(firmName);
}
if (null != order.getPacId()) {
if (null != tjPackageService.getById(order.getPacId())) {
@@ -1039,16 +1035,9 @@
tjOrder.setTjType("2");
}
}
-
- if (null != tjCustomer.getCompName()) {
- tjOrder.setFirmName(tjCustomer.getCompName());
- }
- if (null != tjCustomer.getDictCompId()) {
- tjOrder.setFirmId(String.valueOf(tjCustomer.getDictCompId()));
- } else {
+ if(StringUtil.isBlank(tjOrder.getFirmId())){
tjOrder.setFirmId("0");
}
-
if (null != tjOrder.getPhoto()) {
File file = new File(tjOrder.getPhoto());
@@ -1096,11 +1085,21 @@
@Transactional(propagation = Propagation.REQUIRES_NEW, isolation = Isolation.READ_COMMITTED)
public AjaxResult processOrderWithTransaction(TjOrder tjOrder, TjCustomer tjCustomer, TjReservation tjReservation, TjFlowingWater tjFlowingWater, MallOrder mallOrder, SysUser sysUser) {
- //鐢熸垚浣撴鍙�
- String tjNumber = (SecurityUtils.getUsername() + new SimpleDateFormat("yyMMddHHmmss").format(new Date()));
- tjOrder.setTjNumber(tjNumber);
- BigDecimal discount = BigDecimal.valueOf(Double.parseDouble(tjOrder.getTjFlowingWater().getDiscount()));
+ //鑾峰彇鎷兼帴鍓嶇紑
+ String makeLisTmhPrefix = configService.selectConfigByKey("make_lis_tmh_prefix");
+
+ //鐢熸垚浣撴鍙�
+// String tjNumber = (SecurityUtils.getUsername() + new SimpleDateFormat("yyMMddHHmmss").format(new Date()));
+// if(StringUtil.isNotBlank(makeLisTmhPrefix)) tjNumber=makeLisTmhPrefix+tjNumber;
+
+
+ String tjNumber = (SecurityUtils.getUsername()+IdUtils.getTjNumber());
+ if(StringUtil.isNotBlank(makeLisTmhPrefix)) tjNumber=makeLisTmhPrefix+tjNumber;
+ tjOrder.setTjNumber(tjNumber);
+
+
+ BigDecimal discount = BigDecimal.valueOf(Double.parseDouble(tjOrder.getTjFlowingWater().getDiscount()));
tjOrder.setDiscount(discount.toString());
if (tjOrderService.save(tjOrder)) {
//淇濆瓨鏀惰揣鍦板潃
@@ -3492,24 +3491,26 @@
log.info("閫�璐圭敵璇� 鍏ュ弬 -> {}", JSONUtil.toJsonStr(map));
String post = HttpClientUtils.sendPost(apiUrl + "/api/his/" + hospbm + "/creatCostInfo", map);
log.info("閫�璐圭敵璇� 杩斿洖 -> {}", JSONUtil.toJsonStr(post));
- JSONObject jsonObject = JSONUtil.parseObj(post);
- if (jsonObject.getStr("code").equals("200")) {
- // hisTfWaterId
- String tfid = jsonObject.getJSONObject("data").getStr("feiYongId");
- water.setHisTfWaterId(tfid);
- tjFlowingWaterService.updateById(water);
- if (isDelete) {
- for (TjFlowingWater water1 : yizhifu) {
- String bldh1 = water1.getJxbz();
- remarkService.deleteTjOrderDetailByjxbz(bldh1);
- tjOrderDetailService.deleteTjOrderDetailByjxbz(bldh1);
- tjFlowingWaterService.deleteTjOrderDetailByjxbz(bldh1);
- transitionService.deleteTjOrderDetailByjxbz(bldh1);
- blService.remove(new LambdaQueryWrapper<TjProBl>().eq(TjProBl::getTjh, tjNum).eq(TjProBl::getBldh, bldh1));
- tjSamplingMapper.deleteByTjNumAndCusIdAndJxbzo(tjNum, order.getUserId(), bldh1);
+ if(null !=post){
+ JSONObject jsonObject = JSONUtil.parseObj(post);
+ if (jsonObject.getStr("code").equals("200")) {
+ // hisTfWaterId
+ String tfid = jsonObject.getJSONObject("data").getStr("feiYongId");
+ water.setHisTfWaterId(tfid);
+ tjFlowingWaterService.updateById(water);
+ if (isDelete) {
+ for (TjFlowingWater water1 : yizhifu) {
+ String bldh1 = water1.getJxbz();
+ remarkService.deleteTjOrderDetailByjxbz(bldh1);
+ tjOrderDetailService.deleteTjOrderDetailByjxbz(bldh1);
+ tjFlowingWaterService.deleteTjOrderDetailByjxbz(bldh1);
+ transitionService.deleteTjOrderDetailByjxbz(bldh1);
+ blService.remove(new LambdaQueryWrapper<TjProBl>().eq(TjProBl::getTjh, tjNum).eq(TjProBl::getBldh, bldh1));
+ tjSamplingMapper.deleteByTjNumAndCusIdAndJxbzo(tjNum, order.getUserId(), bldh1);
+ }
}
- }
- } else return AjaxResult.error();
+ } else return AjaxResult.error();
+ }
}
}
return null;
--
Gitblit v1.8.0