From fc868e56b1e8199d2c4267fae74c44cfa62a777f Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期三, 31 一月 2024 09:13:51 +0800
Subject: [PATCH] zjh 本地 2024/01/31 -1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 356 ++++++++++++++++++++++++++++++-----------------------------
1 files changed, 182 insertions(+), 174 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 ae3bb0a..40e7e6e 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
@@ -407,8 +407,10 @@
order.setTjCustomerSex(tjCustomer.getCusSex());
order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
order.setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName()));
+ order.setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName()));
order.setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone()));
- order.setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard()));
+// order.setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard()));
+ order.setTjCusIdCard(tjCustomer.getCusIdcard());
order.setCareer(tjCustomer.getCareer());
order.setIdType(tjCustomer.getIdType());
order.setAgeUnit(tjCustomer.getAgeUnit());
@@ -458,35 +460,39 @@
}
List<TjOrder> collect = null;
if (list.size() > 0) {
- for (TjOrder order : list) {
- TjCustomer tjCustomer = tjCustomerService.getById(order.getUserId());
- if (null != tjCustomer) {
- order.setTjCustomerSex(tjCustomer.getCusSex());
- order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
- order.setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName()));
- order.setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone()));
- order.setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard()));
+
+ for (int i = 0; i < list.size(); i++) {
+ TjCustomer tjCustomer = tjCustomerService.getById(list.get(i).getUserId());
+ if (null == tjCustomer) {
+ list.remove(list.get(i));
+ continue;
}
- String firmId = order.getFirmId();
- if (firmId != null && null != iDictCompService.getById(String.valueOf(order.getFirmId()))) {
- order.setDictCompName(iDictCompService.getById(String.valueOf(order.getFirmId())).getCnName());
+ list.get(i).setTjCustomerSex(tjCustomer.getCusSex());
+ list.get(i).setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
+ list.get(i).setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName()));
+ list.get(i).setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone()));
+ list.get(i).setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard()));
+
+ String firmId = list.get(i).getFirmId();
+ if (firmId != null && null != iDictCompService.getById(String.valueOf(list.get(i).getFirmId()))) {
+ list.get(i).setDictCompName(iDictCompService.getById(String.valueOf(list.get(i).getFirmId())).getCnName());
}
- if (null != order.getPacId()) {
- if (null != tjPackageService.getById(order.getPacId())) {
- order.setPacName(tjPackageService.getById(order.getPacId()).getPacName());
+ if (null != list.get(i).getPacId()) {
+ if (null != tjPackageService.getById(list.get(i).getPacId())) {
+ list.get(i).setPacName(tjPackageService.getById(list.get(i).getPacId()).getPacName());
}
- if (null != dwDeptService.getById(order.getPacId())) {
- order.setPacName(dwDeptService.getById(order.getPacId()).getDwDeptName());
+ if (null != dwDeptService.getById(list.get(i).getPacId())) {
+ list.get(i).setPacName(dwDeptService.getById(list.get(i).getPacId()).getDwDeptName());
}
}
//浠庢墦鍗拌褰曟煡鍑烘渶鏂版墦鍗版椂闂�
LambdaQueryWrapper<TjReportPrint> wqqq = new LambdaQueryWrapper<>();
- wqqq.eq(TjReportPrint::getTjNumber, order.getTjNumber());
+ wqqq.eq(TjReportPrint::getTjNumber, list.get(i).getTjNumber());
wqqq.orderByDesc(TjReportPrint::getPrintTime);
wqqq.last("limit 1");
TjReportPrint one = tjReportPrintService.getOne(wqqq);
if (one != null) {
- order.setPrintLastTime(one.getPrintTime());
+ list.get(i).setPrintLastTime(one.getPrintTime());
}
}
@@ -516,37 +522,40 @@
Page<TjOrder> page2 = tjOrderService.page(page1, wq);
List<TjOrder> list = page2.getRecords();
if (list != null) {
- for (TjOrder order : list) {
- TjCustomer tjCustomer = tjCustomerService.getById(order.getUserId());
- if (null != tjCustomer) {
- order.setTjCustomerSex(tjCustomer.getCusSex());
- order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
- order.setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName()));
- order.setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone()));
- if (tjCustomer.getCusIdcard() != null) {
- order.setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard()));
- }
+ for (int i = 0; i < list.size(); i++) {
+ TjCustomer tjCustomer = tjCustomerService.getById(list.get(i).getUserId());
+ if (null == tjCustomer) {
+ list.remove(list.get(i));
+ continue;
}
- String firmId = order.getFirmId();
- if (firmId != null && null != iDictCompService.getById(String.valueOf(order.getFirmId()))) {
- order.setDictCompName(iDictCompService.getById(String.valueOf(order.getFirmId())).getCnName());
+ list.get(i).setTjCustomerSex(tjCustomer.getCusSex());
+ list.get(i).setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
+ list.get(i).setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName()));
+ list.get(i).setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone()));
+ if (tjCustomer.getCusIdcard() != null) {
+ list.get(i).setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard()));
}
- if (null != order.getPacId()) {
- if (null != tjPackageService.getById(order.getPacId())) {
- order.setPacName(tjPackageService.getById(order.getPacId()).getPacName());
+
+ String firmId = list.get(i).getFirmId();
+ if (firmId != null && null != iDictCompService.getById(String.valueOf(list.get(i).getFirmId()))) {
+ list.get(i).setDictCompName(iDictCompService.getById(String.valueOf(list.get(i).getFirmId())).getCnName());
+ }
+ if (null != list.get(i).getPacId()) {
+ if (null != tjPackageService.getById(list.get(i).getPacId())) {
+ list.get(i).setPacName(tjPackageService.getById(list.get(i).getPacId()).getPacName());
}
- if (null != dwDeptService.getById(order.getPacId())) {
- order.setPacName(dwDeptService.getById(order.getPacId()).getDwDeptName());
+ if (null != dwDeptService.getById(list.get(i).getPacId())) {
+ list.get(i).setPacName(dwDeptService.getById(list.get(i).getPacId()).getDwDeptName());
}
}
//浠庢墦鍗拌褰曟煡鍑烘渶鏂版墦鍗版椂闂�
LambdaQueryWrapper<TjReportPrint> wqqq = new LambdaQueryWrapper<>();
- wqqq.eq(TjReportPrint::getTjNumber, order.getTjNumber());
+ wqqq.eq(TjReportPrint::getTjNumber, list.get(i).getTjNumber());
wqqq.orderByDesc(TjReportPrint::getPrintTime);
wqqq.last("limit 1");
TjReportPrint one = tjReportPrintService.getOne(wqqq);
if (one != null) {
- order.setPrintLastTime(one.getPrintTime());
+ list.get(i).setPrintLastTime(one.getPrintTime());
}
}
}
@@ -794,22 +803,28 @@
*/
@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);
+
+ LambdaQueryWrapper<TjCustomer> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjCustomer::getCusId, tjOrder.getUserId());
+ TjCustomer tjCustomer = tjCustomerService.getOne(wq);
+ if (tjCustomer == null) return AjaxResult.error("璇ュ鎴锋湭鐧昏鎴栦笉瀛樺湪");
+
LambdaQueryWrapper<TjOrder> wqq = new LambdaQueryWrapper<>();
wqq.eq(TjOrder::getUserId, tjOrder.getUserId());
wqq.eq(TjOrder::getCheckStatus, 0);
wqq.isNull(TjOrder::getFinishTime);
+ if (!tjCustomer.getCardId().equals("0")) {
+ wqq.eq(TjOrder::getCardId, tjCustomer.getCardId());
+ }
TjOrder order = tjOrderService.getOne(wqq);
if (null != order) {
+ transitionService.deletedTbTransitionListByCusIdAndTjNum(tjCustomer.getCusIdcard(), tjCustomer.getCardId());
return AjaxResult.error("涓嶅彲閲嶅鐧昏");
}
- LambdaQueryWrapper<TjCustomer> wq = new LambdaQueryWrapper<>();
- wq.eq(TjCustomer::getCusId, tjOrder.getUserId());
- TjCustomer tjCustomer = tjCustomerService.getOne(wq);
- if (tjCustomer == null) return AjaxResult.error("璇ュ鎴锋湭绛惧埌鎴栦笉瀛樺湪");
LambdaQueryWrapper<TjReservation> wq1 = new LambdaQueryWrapper<>();
wq1.eq(TjReservation::getIdCard, tjCustomer.getCusIdcard());
wq1.eq(TjReservation::getIsExpire, 2);
@@ -830,7 +845,8 @@
if (null != tjReservation.getDepartment()) tjOrder.setFirmDeptName(tjReservation.getDepartment());
if (null != tjReservation.getJobNo()) tjOrder.setFirmWorkId(tjReservation.getJobNo());
if (null != tjReservation.getPacId()) tjOrder.setPacId(tjReservation.getPacId());
- if (null != tjReservation.getGroupingId()){
+ if (null != tjReservation.getTjCategory()) tjOrder.setTjCategory(tjReservation.getTjCategory());
+ if (null != tjReservation.getGroupingId()) {
tjOrder.setGroupId(tjReservation.getGroupingId());
tjOrder.setFirmDeptId(tjReservation.getPacId());
}
@@ -867,11 +883,12 @@
//鍒ゆ柇灏忕▼搴忎笂棰勭害鏄惁浠橀挶
if (null != mallOrder) tjOrder.setMallOrderId(String.valueOf(mallOrder.getId()));
tjOrder.setStatus(TjConstants.TJ_BEGIN);
+ tjOrder.setCardId(tjCustomer.getCardId());
if (tjOrderService.save(tjOrder)) {
//淇濆瓨鏀惰揣鍦板潃
- if ("2".equals(tjOrder.getGetType())){
+ if ("2".equals(tjOrder.getGetType())) {
final TjReportGetAddress address = tjOrder.getAddAddress();
- if (address!=null){
+ if (address != null) {
address.setTjNumber(tjNumber);
tjReportGetAddressService.save(address);
}
@@ -879,9 +896,9 @@
Long cusNumber = tjCustomer.getCusNumber();
cusNumber += 1;
tjCustomer.setCusNumber(cusNumber);
- tjCustomerService.updateById(tjCustomer);
BigDecimal discount = BigDecimal.valueOf(Double.parseDouble(tjOrder.getTjFlowingWater().getDiscount())).divide(BigDecimal.valueOf(10));
TjFlowingWater tjFlowingWater = new TjFlowingWater();
+ tjFlowingWater.setPayStasus(0L);
if ("1".equals(tjOrder.getTjType())) {
if (null != tjReservation && tjReservation.getPayType() == 1) {
tjFlowingWater.setPayStasus(3L);
@@ -891,66 +908,44 @@
//璋冪敤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){
+ final String isPay = configService.selectConfigByKey("isPay");
+ if ("Y".equals(getInfoFromSqlData)) {
+ LtkjMiddleHead middleHead = headService.getMiddleHeadByPartId(tjCustomer.getCardId());
+ 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().toUpperCase(), "") + s1);
- if (null != mallOrder) {
- if (mallOrder.getOrderStatus().equals(201L)) {
- tjFlowingWater.setCopeWith(mallOrder.getActualPrice());
- tjFlowingWater.setPaidIn(mallOrder.getActualPrice());
- tjFlowingWater.setDiscount(String.valueOf(1));
- tjFlowingWater.setPayStasus(1L);
- tjFlowingWater.setPayType(3L);
- MallCheckLog checkLog = new MallCheckLog();
- checkLog.setCheckBy(sysUser.getNickName());
- checkLog.setUserId(mallOrder.getUserId());
- checkLog.setConsignee(mallOrder.getConsignee());
- checkLog.setIdCard(mallOrder.getIdCard());
- checkLog.setOrderId(String.valueOf(mallOrder.getId()));
- checkLog.setOrderSn(mallOrder.getOrderSn());
- checkLog.setCheckTime(new Date());
- checkLog.setShipSn("HX" + s1);
- mallCheckLogService.save(checkLog);
- mallOrder.setOrderStatus(301L);
- mallOrderService.updateById(mallOrder);
+ tjFlowingWater.setWaterId(PinyinUtil.getFirstLetter(tjCustomer.getCusName(), "").toUpperCase() + s1);
+ if (isPay.equals("true")) {
+ if (null != mallOrder) {
+ if (mallOrder.getOrderStatus().equals(201L)) {
+ tjFlowingWater.setCopeWith(mallOrder.getActualPrice());
+ tjFlowingWater.setPaidIn(mallOrder.getActualPrice());
+ tjFlowingWater.setDiscount(String.valueOf(1));
+ tjFlowingWater.setPayStasus(1L);
+ tjFlowingWater.setPayType(3L);
+ MallCheckLog checkLog = new MallCheckLog();
+ checkLog.setCheckBy(sysUser.getNickName());
+ checkLog.setUserId(mallOrder.getUserId());
+ checkLog.setConsignee(mallOrder.getConsignee());
+ checkLog.setIdCard(mallOrder.getIdCard());
+ checkLog.setOrderId(String.valueOf(mallOrder.getId()));
+ checkLog.setOrderSn(mallOrder.getOrderSn());
+ checkLog.setCheckTime(new Date());
+ checkLog.setShipSn("HX" + s1);
+ mallCheckLogService.save(checkLog);
+ 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);
}
- } else {
- tjFlowingWater.setCopeWith(tjOrder.getTjFlowingWater().getCopeWith());
- tjFlowingWater.setPaidIn(tjOrder.getTjFlowingWater().getPaidIn());
- tjFlowingWater.setDiscount(tjOrder.getTjFlowingWater().getDiscount());
- tjFlowingWater.setPayStasus(0L);
}
if (tjFlowingWaterService.save(tjFlowingWater)) {
tjOrder.setTjSerialNumber(String.valueOf(tjFlowingWater.getTjSerialNumber()));
@@ -966,7 +961,7 @@
//涓汉
if ("2".equals(tjOrder.getTjType())) {
-// asyncService.newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
+ //asyncService.newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
}
@@ -992,7 +987,8 @@
//
// }
// }
-
+ tjCustomer.setCardId("0");
+ tjCustomerService.updateById(tjCustomer);
return AjaxResult.success(tjNumber);
}
return AjaxResult.error();
@@ -1055,28 +1051,37 @@
if (null != proIds1 && !proIds1.equals("")) {
proIds = JSON.parseArray(proIds1.toString(), Long.class);
}
+ TjCustomer tjCustomer = tjCustomerService.getTjCustomerByCusIdCard(cusId);
+ String cardId = "0";
+ if (null != tjCustomer) {
+ cardId = tjCustomer.getCardId();
+ }
if ((null == proIds || proIds.size() == 0) && (null == packId || packId.equals(""))) {
transitionService.deletedTbTransitionByCusId(cusId);
- if (redisCache.hasKey(cusId)) redisCache.deleteObject(cusId);
- if (redisCache.hasKey(cusId + "cusId")) redisCache.deleteCacheMapValue(cusId + "cusId", cusId);
-
+ if (redisCache.hasKey(cardId + cusId)) {
+ redisCache.deleteObject(cardId + cusId);
+ }
+ if (redisCache.hasKey(cardId + cusId + "cusId")) {
+ redisCache.deleteCacheMapValue(cardId + cusId + "cusId", cardId + cusId);
+ }
}
List<TbTransition> tbTransitionList = null;
- if (!redisCache.hasKey(cusId)) {
+ if (!redisCache.hasKey(cardId + cusId)) {
tbTransitionList = new ArrayList<>();
} else {
- tbTransitionList = redisCache.getCacheList(cusId);
+ tbTransitionList = redisCache.getCacheList(cardId + cusId);
}
//濂楅
if (null != packId && !packId.equals("")) {
Long pacId = Long.valueOf(packId.toString());
List<TbTransition> list = transitionService.getTbTransitionListByCusIdAndPac(cusId, String.valueOf(pacId));
if (null == list || list.size() == 0) {
- transitionService.deletedTbTransitionListByCusIdAndPac(cusId);
- if (redisCache.hasKey(cusId + "cusId")) redisCache.deleteCacheMapValue(cusId + "cusId", cusId);
- if (redisCache.hasKey(cusId)) {
+ transitionService.deletedTbTransitionListByCusIdAndPac(cusId, cardId);
+ if (redisCache.hasKey(cardId + cusId + "cusId"))
+ redisCache.deleteCacheMapValue(cardId + cusId + "cusId", cardId + cusId);
+ if (redisCache.hasKey(cardId + cusId)) {
tbTransitionList = new ArrayList<>();
- redisCache.deleteObject(cusId);
+ redisCache.deleteObject(cardId + cusId);
}
List<TjPackageProject> ppList = tjPackageProjectService.getTjPackageProjectListByPacId(String.valueOf(pacId));
if (null != ppList && ppList.size() > 0) {
@@ -1149,7 +1154,7 @@
tbTransition.setParentProId(tjProject.getProParentId());
if (tjProject.getProParentId() != null) {
TjProject byId = projectService.getById(tjProject.getProParentId());
- if(null !=byId){
+ if (null != byId) {
tbTransition.setParentProName(byId.getProName());
}
}
@@ -1166,13 +1171,13 @@
}
}
if (null != tbTransitionList && tbTransitionList.size() > 0) {
- if (redisCache.hasKey(cusId)) {
- redisCache.deleteObject(cusId);
- redisCache.setCacheList(cusId, tbTransitionList);
- redisCache.setCacheMapValue(cusId + "cusId", cusId, getMaps(cusId));
+ if (redisCache.hasKey(cardId + cusId)) {
+ redisCache.deleteObject(cardId + cusId);
+ redisCache.setCacheList(cardId + cusId, tbTransitionList);
+ redisCache.setCacheMapValue(cardId + cusId + "cusId", cardId + cusId, getMaps(cusId, cardId));
} else {
- redisCache.setCacheList(cusId, tbTransitionList);
- redisCache.setCacheMapValue(cusId + "cusId", cusId, getMaps(cusId));
+ redisCache.setCacheList(cardId + cusId, tbTransitionList);
+ redisCache.setCacheMapValue(cardId + cusId + "cusId", cardId + cusId, getMaps(cusId, cardId));
}
}
return AjaxResult.success();
@@ -1186,7 +1191,12 @@
List<Map<String, Object>> list = redisCache.getCacheMapValue(cusId + "cusId", cusId);
return AjaxResult.success(list);
}
- List<Map<String, Object>> list = getMaps(cusId);
+ TjCustomer tjCustomer = tjCustomerService.getTjCustomerByCusIdCard(cusId);
+ String cardId = "0";
+ if (null != tjCustomer) {
+ cardId = tjCustomer.getCardId();
+ }
+ List<Map<String, Object>> list = getMaps(cusId, cardId);
return AjaxResult.success(list);
}
@@ -1319,7 +1329,7 @@
for (TjOrderRemark remark : remarkList) {
TjProject project = projectService.getTjProjectById(String.valueOf(remark.getProId()));
if (null != project) {
- if ("N".equals(project.getNeedReport())){
+ if ("N".equals(project.getNeedReport())) {
continue;
}
remark.setProCheckType(project.getProCheckType());
@@ -1423,13 +1433,13 @@
}
- private List<Map<String, Object>> getMaps(String cusId) {
+ private List<Map<String, Object>> getMaps(String cusId, String cardId) {
List<TbTransition> transitionList = null;
- if (redisCache.hasKey(cusId)) {
- transitionList = redisCache.getCacheList(cusId);
+ if (redisCache.hasKey(cardId + cusId)) {
+ transitionList = redisCache.getCacheList(cardId + cusId);
} else {
- transitionList = transitionService.getTbTransitionListByCusId(cusId);
+ transitionList = transitionService.getTbTransitionListByCusId(cusId, cardId);
}
if (null == transitionList) return null;
Map<Long, List<TbTransition>> collect = transitionList.stream().collect(Collectors.groupingBy(TbTransition::getParentProId));
@@ -1440,35 +1450,33 @@
if (null != pacId) {
TjPackage aPackage = tjPackageService.getById(entry.getValue().get(0).getPacId());
map.put("pacName", aPackage.getPacName());
+ TjProject tjProject = projectService.getById(entry.getKey());
+ TjPackageProject project = tjPackageProjectService.getOne(new LambdaQueryWrapper<TjPackageProject>().eq(TjPackageProject::getPacId, pacId)
+ .eq(TjPackageProject::getProId, entry.getKey()));
+ map.put("ordPrice", tjProject.getProPrice());
+ if (null != project) {
+ map.put("nowPrice", project.getPriceNow());
+ } else {
+ map.put("nowPrice", tjProject.getProPrice());
+ }
} else {
map.put("pacName", "鍗曢」");
+ List<TbTransition> tbTransitionList = entry.getValue();
+ if (null != tbTransitionList && tbTransitionList.size() > 0) {
+ BigDecimal money1 = new BigDecimal("0.00");
+ BigDecimal money2 = new BigDecimal("0.00");
+ for (TbTransition tbTransition : tbTransitionList) {
+ money1 = money1.add(tbTransition.getOrdPrice());
+ money2 = money2.add(tbTransition.getNowPrice());
+ }
+ map.put("ordPrice", money1);
+ map.put("nowPrice", money2);
+ }
}
map.put("parentName", projectService.getById(entry.getKey()).getProName());
map.put("list", entry.getValue());
- List<TbTransition> tbTransitionList = entry.getValue();
- if (null != tbTransitionList && tbTransitionList.size() > 0) {
- BigDecimal money1 = new BigDecimal("0.00");
- BigDecimal money2 = new BigDecimal("0.00");
- for (TbTransition tbTransition : tbTransitionList) {
- money1 = money1.add(tbTransition.getOrdPrice());
- money2 = money2.add(tbTransition.getNowPrice());
-// if (tbTransition.getOrdPrice().compareTo(BigDecimal.valueOf(0)) == 0 || tbTransition.getNowPrice().compareTo(BigDecimal.valueOf(0)) == 0) {
-// tbTransition.setDiscount("0");
-// } else {
-// tbTransition.setDiscount((tbTransition.getNowPrice()).divide(tbTransition.getOrdPrice(), BigDecimal.ROUND_CEILING).toString());
-// }
-// if (null != tbTransition.getPacId()) {
-// tbTransition.setPacPrice(tjPackageService.getById(tbTransition.getPacId()).getPrice());
-// }
-// if (null != tbTransition.getParentProId()) {
-// tbTransition.setPacPrice(projectService.getTjProjectById(String.valueOf(tbTransition.getParentProId())).getProPrice());
-// }
- }
-// map.put("ordPrice", money1.setScale(Integer.parseInt(configService.selectConfigByKey("sys.price.save")), Integer.parseInt(configService.selectConfigByKey("sys.price"))));
-// map.put("nowPrice", money2.setScale(Integer.parseInt(configService.selectConfigByKey("sys.price.save")), Integer.parseInt(configService.selectConfigByKey("sys.price"))));
- map.put("ordPrice", money1);
- map.put("nowPrice", money2);
- }
+
+
list.add(map);
}
return list;
@@ -1686,11 +1694,11 @@
}
public void newSaveextracted(TjOrder tjOrder, TjCustomer tjCustomer, BigDecimal discount, SysUser sysUser, TjReservation tjReservation, TjFlowingWater tjFlowingWater) {
- long l = System.currentTimeMillis();
tjAskMedicalHistoryService.updateTjAskMedicalHistoryByCusId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjCustomer.getCusId()));
tjOrderDetailService.saveTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()));
- //淇敼姣忛」鐨勫師浠风幇浠�
- transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(), discount);
+ tjOrderDetailService.saveTjPureToneTesByCusId(tjCustomer.getCusIdcard(), tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()));
+ //淇敼姣忛」鐨勫師浠风幇浠� //淇敼涓存椂琛ㄤ綋妫�鍙�
+ transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(), discount, tjOrder.getTjNumber());
//娣诲姞remark琛ㄦ暟鎹�
remarkService.saveTjOrderRemarkByOrderId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjOrder.getOrderId()));
//鍒ゆ柇鏄惁浜ら挶
@@ -1700,7 +1708,7 @@
sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
}
}
- if (tjFlowingWater.getPayStasus() == 1) {
+ if (tjFlowingWater.getPayStasus() == 1L) {
tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
}
@@ -1718,7 +1726,7 @@
byId.setHeshouDoctor(UserHoder.getLoginUser().getUserId());
byId.setHeshouTime(new DateTime());
final boolean b = tjOrderService.updateById(byId);
- if (!b){
+ if (!b) {
return AjaxResult.error("鏍告敹澶辫触");
}
}
@@ -1730,11 +1738,11 @@
@Transactional
public AjaxResult getHistryTjOrderByCusIdCard(@RequestParam String cusIdCard) {
TjCustomer tjCustomer = tjCustomerService.getTjCustomerByCusIdCard(cusIdCard);
- List<HistoryTjOrder> list=new ArrayList<>();
- if(null !=tjCustomer){
+ List<HistoryTjOrder> list = new ArrayList<>();
+ if (null != tjCustomer) {
List<TjOrder> orderList = tjOrderService.getTjOrderListByCusId(tjCustomer.getCusId());
for (TjOrder order : orderList) {
- HistoryTjOrder historyTjOrder=new HistoryTjOrder();
+ HistoryTjOrder historyTjOrder = new HistoryTjOrder();
historyTjOrder.setUserName(tjCustomer.getCusName());
historyTjOrder.setTjNum(order.getTjNumber());
historyTjOrder.setTjTime(order.getCreateTime());
@@ -1751,48 +1759,48 @@
@Transactional
public AjaxResult getHistryTjOrderProByCusIdCard(@RequestParam String cusIdCard) {
TjCustomer tjCustomer = tjCustomerService.getTjCustomerByCusIdCard(cusIdCard);
- if(null !=tjCustomer){
- TjOrder order= tjOrderService.getLastTjOrderListByCusId(tjCustomer.getCusId());
- if(null !=order){
+ if (null != tjCustomer) {
+ TjOrder order = tjOrderService.getLastTjOrderListByCusId(tjCustomer.getCusId());
+ if (null != order) {
List<Map<String, Object>> list = new ArrayList<>();
- if(order.getPacId().equals("o")){
+ 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("proId", aLong);
+ map.put("pacId", null);
map.put("parentName", projectService.getById(aLong).getProName());
- map.put("list",projectService.getTjProjectListBySoneId(String.valueOf(aLong)));
+ 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());
+ 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("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)));
+ 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()));
+ map.put("nowPrice", tjPackageProjectService.getPacProPriceByPacIdAndPro(aLong, order.getPacId()));
list.add(map);
}
- List<Long> longList1 = remarkService.getTjProIdsByTjNumAndPacIc(order.getTjNumber(),order.getPacId());
+ 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("proId", aLong);
+ map.put("pacId", null);
map.put("parentName", projectService.getById(aLong).getProName());
- map.put("list",projectService.getTjProjectListBySoneId(String.valueOf(aLong)));
+ map.put("list", projectService.getTjProjectListBySoneId(String.valueOf(aLong)));
BigDecimal proPrice = projectService.getById(aLong).getProPrice();
map.put("ordPrice", proPrice);
map.put("nowPrice", proPrice);
--
Gitblit v1.8.0