From ea7e9351b88a5c8075b1abb8336bc4fc808fe896 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 24 五月 2024 15:34:02 +0800
Subject: [PATCH] zjh 2024/05/24-1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 473 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 455 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 aad0ec9..5a6dff8 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
@@ -7,6 +7,8 @@
import java.time.OffsetTime;
import java.util.*;
import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import javax.annotation.Resource;
@@ -20,6 +22,7 @@
import cn.hutool.extra.pinyin.PinyinUtil;
import com.alibaba.fastjson2.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fasterxml.jackson.databind.BeanProperty;
import com.ltkj.common.core.domain.entity.SysDept;
@@ -31,10 +34,12 @@
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;
import com.ltkj.hosp.sqlDomain.LtkjMiddleHead;
+import com.ltkj.hosp.sqlDomain.LtkjTjPat;
import com.ltkj.hosp.vodomain.BingZhongVO;
import com.ltkj.hosp.vodomain.HistoryTjOrder;
import com.ltkj.hosp.vodomain.QjDomainVo;
@@ -52,11 +57,13 @@
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
+import org.aspectj.weaver.ast.Var;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpRequest;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.DigestUtils;
import org.springframework.web.bind.annotation.*;
import com.ltkj.common.annotation.Log;
import com.ltkj.common.core.controller.BaseController;
@@ -151,6 +158,8 @@
@Resource
private LtkjMiddleHeadService headService;
+ @Resource
+ private TjvLtkjvtjpatService tjvLtkjvtjpatService;
/**
@@ -833,6 +842,7 @@
TjReservation tjReservation = tjReservationService.getOne(wq1);
MallOrder mallOrder = null;
if (tjReservation != null) {
+ order.setReservationId(tjReservation.getId());
mallOrder = mallOrderService.getOne(new LambdaQueryWrapper<MallOrder>().eq(MallOrder::getReservationId, tjReservation.getId()));
if (DateUtil.endOfDay(new Date()).before(tjReservation.getReservationTime())) {
return AjaxResult.error("鏈埌棰勭害鏃堕棿");
@@ -948,8 +958,7 @@
mallOrder.setOrderStatus(301L);
mallOrderService.updateById(mallOrder);
}
- }
- else {
+ } else {
tjFlowingWater.setCopeWith(tjOrder.getTjFlowingWater().getCopeWith());
tjFlowingWater.setPaidIn(tjOrder.getTjFlowingWater().getPaidIn());
tjFlowingWater.setDiscount(tjOrder.getTjFlowingWater().getDiscount());
@@ -999,6 +1008,341 @@
tjCustomerService.updateById(tjCustomer);
return AjaxResult.success(tjNumber);
}
+ return AjaxResult.error();
+ }
+
+
+ @PostMapping("/addPlOrderAndDetail")
+ @ApiOperation(value = "浣撴鎵归噺绛惧埌鐧昏鎺ュ彛")
+ @Transactional //(鍒囨崲鏁版嵁搴撳嚭閿欙紝鎵�浠ユ敞閲�)
+ 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() {
+ @Override
+ public void run() {
+ getAjaxResults(cusId);
+ }
+ });
+ }
+ LambdaQueryWrapper<TjCustomer> wq = new LambdaQueryWrapper<>();
+ wq.in(TjCustomer::getCusIdcard, cusIds);
+ List<Long> list = tjCustomerService.list(wq).stream().map(TjCustomer::getCusId).collect(Collectors.toList());
+ if (list.size() > 0) {
+ ExecutorService threadPool = Executors.newFixedThreadPool(list.size());
+ for (Long aLong : list) {
+ threadPool.execute(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ getAjaxResult(aLong, sysUser, daoDto.getTjCategory());
+ threadPool.shutdown();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ });
+ }
+ }
+ }
+ return AjaxResult.success("鎿嶄綔鎴愬姛");
+ }
+
+ private void getAjaxResults(String cusIdcard) {
+ if (!"".equals(cusIdcard) && cusIdcard != null) {
+ //鏍规嵁閰嶇疆璋冨彇瀛樺偍杩囩▼ 灏嗕复鏃惰〃鏁版嵁瀛樺叆棰勭害琛�2023.12.12
+ final String getInfoFromSqlData = configService.selectConfigByKey("getInfoFromSqlData");
+ if ("Y".equals(getInfoFromSqlData)) {
+ //鏍规嵁韬唤璇佸彿浠巋is鏌ヤ俊鎭�
+ LtkjTjPat tjPatByIdCard = testMapper.getTjPatByIdCard(cusIdcard);
+ if (null != tjPatByIdCard) {
+ String fcardNo = tjPatByIdCard.getFcardNo();
+ if (null != fcardNo && !fcardNo.equals("")) {
+ fcardNo = fcardNo.trim();
+ tjPatByIdCard.setFcardNo(fcardNo);
+ } else {
+ fcardNo = cusIdcard.trim();
+ tjPatByIdCard.setFcardNo(fcardNo);
+ }
+ //鏍规嵁韬唤璇佸彿浠庢暟鎹簱鎷夸俊鎭� 娌℃湁鐨勮瘽淇濆瓨
+ LtkjTjPat ltkjTjPat = tjvLtkjvtjpatService.getLtkjTjPatByCusIdCard(cusIdcard);
+ if (null == ltkjTjPat) {
+ tjvLtkjvtjpatService.save(tjPatByIdCard);
+ }
+ DynamicDataSourceContextHolder.clearDataSourceType();
+ //鍐嶆牴鎹韩浠借瘉鍙峰啓customer琛�
+ TjCustomer tjCustomer = tjCustomerService.getTjCustomerByCusIdCard(tjPatByIdCard.getFcardNo());
+ if (null == tjCustomer) {
+ //涓虹┖鐨勮瘽鎺夊瓨鍌ㄨ繃绋嬩繚瀛樺埌瀹㈡埛琛�
+ testMapper.getTjPatByCusId(cusIdcard);
+ LambdaQueryWrapper<TjCustomer> qw = new LambdaQueryWrapper<>();
+ qw.eq(TjCustomer::getCusIdcard, tjPatByIdCard.getFcardNo());
+ TjCustomer customer = tjCustomerService.getOne(qw);
+ customer.setReservationId(customer.getCardId());
+ extracteds(customer);
+ } else {
+ String cardId = tjPatByIdCard.getFcardId();
+ if (null != cardId && !cardId.equals("0")) {
+ int i = tjOrderService.selectTjOrderByCardId(cardId);
+ if (i > 0) {
+// return AjaxResult.error("涓嶅彲閲嶅绛惧埌");
+ }
+ }
+ tjCustomer.setReservationId(tjCustomer.getCardId());
+ tjCustomer.setCardId(tjPatByIdCard.getFcardId());
+ tjCustomerService.updateById(tjCustomer);
+ extracteds(tjCustomer);
+ }
+
+ }
+ }
+ //end====2023.12.12
+ LambdaQueryWrapper<TjReservation> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjReservation::getIdCard, cusIdcard);
+ wq.eq(TjReservation::getIsExpire, 2);
+ TjReservation tjReservation = tjReservationService.getOne(wq);
+ if (tjReservation != null) {
+/* 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);
+ if (tjCustomer1 != null) {
+ tjCustomer1.setTjType(tjReservation.getTjType());
+ tjCustomer1.setCusName(tjReservation.getName());
+ tjCustomer1.setCusSex(Long.valueOf(tjReservation.getSex()));
+ tjCustomer1.setCusBrithday(tjReservation.getBirthday());
+ tjCustomer1.setCusPhone(tjReservation.getPhoe());
+ tjCustomer1.setCusEmail(tjReservation.getEmail());
+ tjCustomer1.setCusAddr(tjReservation.getAddress());
+ tjCustomer1.setCusMarryStatus(String.valueOf(tjReservation.getMarriage()));
+ tjCustomer1.setCusNational(String.valueOf(tjReservation.getNation()));
+ tjCustomer1.setIdType(tjReservation.getIdType());
+ tjCustomer1.setAge(tjReservation.getAge());
+ 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);
+ }
+ }
+
+ }
+ }
+
+ private void extracteds(TjCustomer customer) {
+ //浠巋is琛ㄦ姄鏁版嵁
+ LtkjMiddleHead pat = testMapper.getMiddleHeadByPartId(customer.getCardId());
+ if (null != pat) {
+ LambdaQueryWrapper<LtkjMiddleHead> wq1 = new LambdaQueryWrapper<>();
+ wq1.eq(LtkjMiddleHead::getFeadId, customer.getCardId());
+ headService.remove(wq1);
+ LambdaQueryWrapper<LtkjMiddleDetail> wq0 = new LambdaQueryWrapper<>();
+ wq0.eq(LtkjMiddleDetail::getFheadId, pat.getFeadId());
+ middleDetailService.remove(wq0);
+ List<LtkjMiddleDetail> list = testMapper.getMiddleDetailByFeadId(pat.getFeadId());
+ DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
+ LtkjMiddleHead o = headService.getMiddleHeadByPartId(customer.getCardId());
+ if (o == null) {
+ headService.save(pat);
+ for (LtkjMiddleDetail ltkjMiddleDetail : list) {
+ middleDetailService.save(ltkjMiddleDetail);
+ }
+ }
+ testMapper.saveTjProByCusId(customer.getCardId(), customer.getCusIdcard());
+ }
+ DynamicDataSourceContextHolder.clearDataSourceType();
+ }
+
+ private AjaxResult getAjaxResult(Long userId, SysUser sysUser, String tjCategory) throws IOException {
+
+ LambdaQueryWrapper<TjCustomer> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjCustomer::getCusId, userId);
+ TjCustomer tjCustomer = tjCustomerService.getOne(wq);
+ if (tjCustomer == null) return AjaxResult.error("璇ュ鎴锋湭鐧昏鎴栦笉瀛樺湪");
+
+ LambdaQueryWrapper<TjOrder> wqq = new LambdaQueryWrapper<>();
+ wqq.eq(TjOrder::getUserId, userId);
+ 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("涓嶅彲閲嶅鐧昏");
+ }
+ 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);
+ TjReservation tjReservation = tjReservationService.getOne(wq1);
+ MallOrder mallOrder = null;
+ if (tjReservation != null) {
+ tjOrder.setReservationId(tjReservation.getId());
+ mallOrder = mallOrderService.getOne(new LambdaQueryWrapper<MallOrder>().eq(MallOrder::getReservationId, tjReservation.getId()));
+ if (DateUtil.endOfDay(new Date()).before(tjReservation.getReservationTime())) {
+ return AjaxResult.error("鏈埌棰勭害鏃堕棿");
+ }
+ if (DateUtil.endOfDay(tjReservation.getReservationTime()).before(new Date())) {
+ tjReservation.setIsExpire(1);
+ tjReservationService.updateById(tjReservation);
+ return AjaxResult.error("瀵逛笉璧锋偍鐨勯绾﹀凡瓒呮椂璇烽噸鏂伴绾�");
+ }
+ if (null != tjReservation.getTeamNo()) tjOrder.setTeamNo(tjReservation.getTeamNo());
+ if (null != tjReservation.getCompanyId()) tjOrder.setFirmId(tjReservation.getCompanyId());
+ 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.getTjCategory()) tjOrder.setTjCategory(tjReservation.getTjCategory());
+ if (null != tjReservation.getGroupingId()) {
+ tjOrder.setGroupId(tjReservation.getGroupingId());
+ tjOrder.setFirmDeptId(tjReservation.getPacId());
+ }
+ tjReservation.setIsExpire(1);
+ tjReservationService.updateById(tjReservation);
+
+ //鐢熸垚浣撴鍙�
+ 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());
+ if (file.isFile()) {
+ FileInputStream fileInputStream = new FileInputStream(file);
+ byte[] bytes = new byte[fileInputStream.available()];
+ fileInputStream.read(bytes); // 璇诲彇鍒� byte 閲岄潰
+ fileInputStream.close();
+ // 寰楀埌鏂囦欢 涔嬪悗杞垚beye 鐒跺悗浣跨敤base64杞爜
+ String encode = Base64.encode(bytes);
+ tjOrder.setPhoto(encode);
+ }
+ }
+ if (tjOrder.getFirmId() == null) {
+ tjOrder.setFirmId("0");
+ }
+ if (null == tjOrder.getPacId() && null != transitionService.getTbTransitionPacIdByCusIdAndPac(String.valueOf(tjOrder.getUserId()))) {
+ tjOrder.setPacId(transitionService.getTbTransitionPacIdByCusIdAndPac(String.valueOf(tjOrder.getUserId())));
+ }
+ //鍒ゆ柇灏忕▼搴忎笂棰勭害鏄惁浠橀挶
+ 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())) {
+ final TjReportGetAddress address = tjOrder.getAddAddress();
+ if (address != null) {
+ address.setTjNumber(tjNumber);
+ tjReportGetAddressService.save(address);
+ }
+ }
+ Long cusNumber = tjCustomer.getCusNumber();
+ cusNumber += 1;
+ tjCustomer.setCusNumber(cusNumber);
+// 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 (tjReservation.getPayType() == 1) {
+ tjFlowingWater.setPayStasus(3L);
+ }
+ }
+
+ //璋冪敤SQL server鎷垮彇鏀惰垂鎯呭喌
+ //鏍规嵁閰嶇疆璋冨彇瀛樺偍杩囩▼ 灏嗕复鏃惰〃鏁版嵁瀛樺叆棰勭害琛�2023.12.12
+ String getInfoFromSqlData = configService.selectConfigByKey("getInfoFromSqlData");
+ String isPay = configService.selectConfigByKey("isPay");
+ if ("Y".equals(getInfoFromSqlData)) {
+ LtkjMiddleHead middleHead = headService.getMiddleHeadByPartId(tjCustomer.getCardId());
+ if (null != middleHead) {
+ tjFlowingWater.setPayStasus(1L);
+ }
+ }
+ tjFlowingWater.setOrderId(tjOrder.getOrderId());
+ Date date1 = new Date(System.currentTimeMillis());
+ String s1 = sysUser.getUserName() + new SimpleDateFormat("yyMMddHHmmssSSS").format(date1);
+ 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);
+ }
+ }
+ }
+ if (tjFlowingWaterService.save(tjFlowingWater)) {
+ tjOrder.setTjSerialNumber(String.valueOf(tjFlowingWater.getTjSerialNumber()));
+ tjOrderService.updateById(tjOrder);
+
+
+ }
+ asyncService.ttextracted(tjOrder, tjCustomer, sysUser, tjReservation, tjFlowingWater);
+
+
+ tjCustomer.setCardId("0");
+ tjCustomerService.updateById(tjCustomer);
+ return AjaxResult.success(tjNumber);
+ }
+ }
return AjaxResult.error();
}
@@ -1101,10 +1445,10 @@
if (null != project) {
BigDecimal divide = BigDecimal.valueOf(0);
- if(tjPackageProject.getPriceNow().compareTo(BigDecimal.valueOf(0))==0 || project.getProPrice().compareTo(BigDecimal.valueOf(0))==0 ){
- divide=BigDecimal.valueOf(0);
- }else {
- divide=tjPackageProject.getPriceNow().divide(project.getProPrice(), 5, RoundingMode.HALF_DOWN);
+ if (tjPackageProject.getPriceNow().compareTo(BigDecimal.valueOf(0)) == 0 || project.getProPrice().compareTo(BigDecimal.valueOf(0)) == 0) {
+ divide = BigDecimal.valueOf(0);
+ } else {
+ divide = tjPackageProject.getPriceNow().divide(project.getProPrice(), 5, RoundingMode.HALF_DOWN);
}
List<TjProject> tjProSonList = projectService.getTjProjectListBySoneId(String.valueOf(project.getProId()));
if (null != tjProSonList && tjProSonList.size() > 0) {
@@ -1456,7 +1800,7 @@
// if (redisCache.hasKey(cardId + cusId)) {
// transitionList = redisCache.getCacheList(cardId + cusId);
// } else {
- transitionList = transitionService.getTbTransitionListByCusId(cusId, cardId);
+ transitionList = transitionService.getTbTransitionListByCusId(cusId, cardId);
// }
if (null == transitionList) return null;
Map<Long, List<TbTransition>> collect = transitionList.stream().collect(Collectors.groupingBy(TbTransition::getParentProId));
@@ -1468,14 +1812,15 @@
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()));
+// 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());
- }
+// if (null != project) {
+// map.put("nowPrice", project.getPriceNow());
+// } else {
+// map.put("nowPrice", tjProject.getProPrice());
+// }
+ map.put("nowPrice", transitionService.getTbTransitionDxPriceByPac(cusId, entry.getKey(), cardId, pacId));
} else {
map.put("pacName", "鍗曢」");
List<TbTransition> tbTransitionList = entry.getValue();
@@ -1492,8 +1837,6 @@
}
map.put("parentName", projectService.getById(entry.getKey()).getProName());
map.put("list", entry.getValue());
-
-
list.add(map);
}
return list;
@@ -1715,7 +2058,7 @@
tjOrderDetailService.saveTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()));
tjOrderDetailService.saveTjPureToneTesByCusId(tjCustomer.getCusIdcard(), tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()));
//淇敼姣忛」鐨勫師浠风幇浠� //淇敼涓存椂琛ㄤ綋妫�鍙�
-// transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(), discount, tjOrder.getTjNumber());
+ transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(), discount, tjOrder.getTjNumber());
//娣诲姞remark琛ㄦ暟鎹�
remarkService.saveTjOrderRemarkByOrderId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjOrder.getOrderId()));
//鍒ゆ柇鏄惁浜ら挶
@@ -1858,7 +2201,7 @@
final List<TjFlowingWater> list1 = tjFlowingWaterService.list(wqq);
if (list1 != null) {
for (TjFlowingWater tjFlowingWater : list1) {
- if (tjFlowingWater!=null && tjFlowingWater.getPaidIn()!=null){
+ if (tjFlowingWater != null && tjFlowingWater.getPaidIn() != null) {
res.add(tjFlowingWater.getPaidIn());
}
}
@@ -1870,5 +2213,99 @@
return AjaxResult.success(list);
}
+
+ @GetMapping("/revokeTjOrderByTjNum")
+ @ApiOperation(value = "鏍规嵁瀹㈡埛浣撴鍙锋挙閿�浣撴璁板綍")
+ @Transactional
+ public AjaxResult revokeTjOrderByTjNum(@RequestParam @ApiParam(value = "浣撴鍙�") String tjNum) {
+
+ TjOrder order = tjOrderService.getOrderByTjNum(tjNum);
+ if (null != order) {
+ String payByTjNum = tjOrderService.isPayByTjNum(String.valueOf(order.getOrderId()));
+ if (null != payByTjNum) {
+ return AjaxResult.success("璇ョ敤鎴峰凡鏀惰垂涓嶅彲鎾ら攢绛惧埌!");
+ }
+ tjOrderService.deleteTjOrderByOrderId(order.getOrderId());
+ tjOrderDetailService.deleteTjOrderDetailByOrderDetailId(String.valueOf(order.getOrderId()));
+ remarkService.deletedOrderRemarkByTjNum(tjNum);
+ tjFlowingWaterService.deleteTjFlowingWaterByOrderId(String.valueOf(order.getOrderId()));
+ transitionService.deletedTbTransitionByTjNum(tjNum);
+ transitionService.updateTbTransitionByTjNum(tjNum);
+ return AjaxResult.success("鎾ら攢鎴愬姛!!!");
+ }
+ return AjaxResult.success("绛惧埌璁板綍涓嶅瓨鍦�!");
+ }
+
+
+ @GetMapping("/getCusTomterListByCompId")
+ @ApiOperation(value = "鑾峰彇鍗曚綅id浣撴浜轰俊鎭帴鍙�")
+ public AjaxResult getCusTomterListByCompId(@RequestParam(required = false) @ApiParam(value = "鍗曚綅id") String compId,
+ @RequestParam(required = false) @ApiParam(value = "鍚嶅瓧") String name,
+ @RequestParam(required = false) @ApiParam(value = "閮ㄩ棬id") String deptId,
+ @RequestParam(required = false) @ApiParam(value = "棰勭害鏃堕棿") Date reservationTime,
+ @RequestParam(defaultValue = "1") Integer page,
+ @RequestParam(defaultValue = "10") Integer pageSize) {
+ Page<TjReservation> pages = new Page<>(page, pageSize);
+ LambdaQueryWrapper<TjReservation> wq = new LambdaQueryWrapper<>();
+ if (null != compId) wq.eq(TjReservation::getCompanyId, compId);
+ if (null != name) wq.eq(TjReservation::getName, name);
+ if (null != deptId) wq.eq(TjReservation::getDepartment, deptId);
+ if (null != reservationTime)
+ wq.between(TjReservation::getReservationTime, DateUtil.beginOfDay(reservationTime), DateUtil.endOfDay(reservationTime));
+ List<TjReservation> reservationList = tjReservationService.list(wq);
+ if (null != reservationList && reservationList.size() > 0) {
+ LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
+ wq1.in(TjOrder::getReservationId, reservationList.stream().map(TjReservation::getId).collect(Collectors.toList()));
+ List<TjOrder> orderList = tjOrderService.list(wq1);
+ if (null != orderList && orderList.size() > 0) {
+ LambdaQueryWrapper<TjReservation> wq3 = new LambdaQueryWrapper<>();
+ wq3.in(TjReservation::getId, orderList.stream().map(TjOrder::getReservationId).collect(Collectors.toList()));
+// wq3.eq(TjReservation::getTeamNo,reservationList.get(0).getTeamNo());
+ Page<TjReservation> page1 = tjReservationService.page(pages, wq3);
+ return AjaxResult.success(page1);
+
+ }
+ }
+ return AjaxResult.success("鏆傛棤淇℃伅");
+ }
+
+
+ @PostMapping("/plRevokeTjOrderByTjNum")
+ @ApiOperation(value = "鏍规嵁瀹㈡埛浣撴鍙锋壒閲忔挙閿�浣撴璁板綍")
+ @Transactional
+ public AjaxResult plRevokeTjOrderByTjNum(@RequestBody @ApiParam(value = "棰勭害涓婚敭id闆嗗悎") List<String> reservationIds) {
+ if (null != reservationIds && reservationIds.size() > 0) {
+ LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
+ wq1.in(TjOrder::getReservationId, reservationIds);
+ List<TjOrder> orderList = tjOrderService.list(wq1);
+ if (null != orderList && orderList.size() > 0) {
+ for (TjOrder order : orderList) {
+// TjOrder order = tjOrderService.getOrderByTjNum(tjNum);
+ if (null != order) {
+// String payByTjNum = tjOrderService.isPayByTjNum(String.valueOf(order.getOrderId()));
+// if (null != payByTjNum) {
+// return AjaxResult.success("璇ョ敤鎴峰凡鏀惰垂涓嶅彲鎾ら攢绛惧埌!");
+// }
+ tjOrderService.deleteTjOrderByOrderId(order.getOrderId());
+ tjOrderDetailService.deleteTjOrderDetailByOrderDetailId(String.valueOf(order.getOrderId()));
+ remarkService.deletedOrderRemarkByTjNum(order.getTjNumber());
+ tjFlowingWaterService.deleteTjFlowingWaterByOrderId(String.valueOf(order.getOrderId()));
+ transitionService.deletedTbTransitionByTjNum(order.getTjNumber());
+ transitionService.updateTbTransitionByTjNum(order.getTjNumber());
+ }
+ }
+ for (String id : reservationIds) {
+ TjReservation reservation = tjReservationService.getById(id);
+ if(null !=reservation){
+ reservation.setIsExpire(2);
+ tjReservationService.updateById(reservation);
+ }
+ }
+ }
+ return AjaxResult.success("鎾ら攢鎴愬姛!!!");
+ }
+ return AjaxResult.error("璇烽�夋嫨瑕佹挙閿�鐨勪汉鍛�!");
+ }
+
}
--
Gitblit v1.8.0