From c84162ef2567ee02a0c94d6df336f78c974aca34 Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期三, 20 十二月 2023 18:41:11 +0800
Subject: [PATCH] zjh 本地 2023/12/12 -1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 132 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 127 insertions(+), 5 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 250602e..bf16abb 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
@@ -24,11 +24,16 @@
import com.ltkj.common.core.domain.entity.SysDept;
import com.ltkj.common.core.domain.entity.SysUser;
import com.ltkj.common.core.redis.RedisCache;
+import com.ltkj.common.enums.DataSourceType;
import com.ltkj.common.utils.SecurityUtils;
import com.ltkj.framework.config.MatchUtils;
import com.ltkj.framework.config.UserHoder;
+import com.ltkj.framework.datasource.DynamicDataSourceContextHolder;
import com.ltkj.hosp.domain.*;
+import com.ltkj.hosp.mapper.TestMapper;
import com.ltkj.hosp.service.*;
+import com.ltkj.hosp.sqlDomain.LtkjMiddleDetail;
+import com.ltkj.hosp.sqlDomain.LtkjMiddleHead;
import com.ltkj.hosp.vodomain.BingZhongVO;
import com.ltkj.hosp.vodomain.HistoryTjOrder;
import com.ltkj.hosp.vodomain.QjDomainVo;
@@ -135,6 +140,15 @@
@Autowired
private ITjReportGetAddressService tjReportGetAddressService;
+
+ @Resource
+ private TestMapper testMapper;
+
+ @Resource
+ private LtkjMiddleDetailService middleDetailService;
+
+ @Resource
+ private LtkjMiddleHeadService headService;
/**
@@ -777,7 +791,7 @@
*/
@PostMapping
@ApiOperation(value = "浣撴绛惧埌鐧昏鎺ュ彛")
- @Transactional
+ //@Transactional (鍒囨崲鏁版嵁搴撳嚭閿欙紝鎵�浠ユ敞閲�)
public AjaxResult addOrderAndDetail(@RequestBody TjOrder tjOrder) throws Exception {
Long userId = Long.valueOf(SecurityUtils.getLoginUser().getUserId());
SysUser sysUser = userService.getById(userId);
@@ -870,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());
@@ -917,6 +966,30 @@
// 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();
+// }
+// }
+// }
+//
+// }
+// }
+
return AjaxResult.success(tjNumber);
}
return AjaxResult.error();
@@ -1243,6 +1316,9 @@
for (TjOrderRemark remark : remarkList) {
TjProject project = projectService.getTjProjectById(String.valueOf(remark.getProId()));
if (null != project) {
+ if ("N".equals(project.getNeedReport())){
+ continue;
+ }
remark.setProCheckType(project.getProCheckType());
remark.setProName(project.getProName());
}
@@ -1625,7 +1701,7 @@
tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
}
- System.out.println("杩欐浠ｇ爜鏃堕棿" + (System.currentTimeMillis() - l));
+// System.out.println("杩欐浠ｇ爜鏃堕棿" + (System.currentTimeMillis() - l));
}
@@ -1674,8 +1750,54 @@
TjCustomer tjCustomer = tjCustomerService.getTjCustomerByCusIdCard(cusIdCard);
if(null !=tjCustomer){
TjOrder order= tjOrderService.getLastTjOrderListByCusId(tjCustomer.getCusId());
-
- return AjaxResult.success(order);
+ if(null !=order){
+ List<Map<String, Object>> list = new ArrayList<>();
+ if(order.getPacId().equals("o")){
+ List<Long> longList = remarkService.getTjProIdsByTjNum(order.getTjNumber());
+ for (Long aLong : longList) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("pacName", "鍗曢」");
+ map.put("proId",aLong);
+ map.put("pacId",null);
+ map.put("parentName", projectService.getById(aLong).getProName());
+ map.put("list",projectService.getTjProjectListBySoneId(String.valueOf(aLong)));
+ BigDecimal proPrice = projectService.getById(aLong).getProPrice();
+ map.put("ordPrice", proPrice);
+ map.put("nowPrice", proPrice);
+ list.add(map);
+ }
+ }
+ if(!order.getPacId().equals("o")){
+ List<Long> longList = remarkService.getTjProIdsByTjNumAndPacIc(order.getTjNumber(),order.getPacId());
+ TjPackage aPackage = tjPackageService.getById(order.getPacId());
+ for (Long aLong : longList) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("pacName",aPackage.getPacName());
+ map.put("pacId",String.valueOf(aPackage.getPacId()));
+ map.put("parentName", projectService.getById(aLong).getProName());
+ map.put("list",projectService.getTjProjectListBySoneId(String.valueOf(aLong)));
+ BigDecimal proPrice = projectService.getById(aLong).getProPrice();
+ map.put("ordPrice", proPrice);
+ map.put("nowPrice",tjPackageProjectService.getPacProPriceByPacIdAndPro(aLong,order.getPacId()));
+ list.add(map);
+ }
+
+ List<Long> longList1 = remarkService.getTjProIdsByTjNumAndPacIc(order.getTjNumber(),order.getPacId());
+ for (Long aLong : longList1) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("pacName", "鍗曢」");
+ map.put("proId",aLong);
+ map.put("pacId",null);
+ map.put("parentName", projectService.getById(aLong).getProName());
+ map.put("list",projectService.getTjProjectListBySoneId(String.valueOf(aLong)));
+ BigDecimal proPrice = projectService.getById(aLong).getProPrice();
+ map.put("ordPrice", proPrice);
+ map.put("nowPrice", proPrice);
+ list.add(map);
+ }
+ }
+ return AjaxResult.success(list);
+ }
}
return AjaxResult.success("鏆傛棤鍘嗗彶璁板綍");
}
--
Gitblit v1.8.0