From dbc11598957806965ec0e6b15c91f3d017d5759f Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期五, 03 一月 2025 20:16:53 +0800
Subject: [PATCH] 20250103
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 89 ++++++++++++++++++++++++++++++++++++--------
1 files changed, 72 insertions(+), 17 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 7e7ccbb..dfdfb58 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
@@ -53,6 +53,7 @@
import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.dto.QianDaoDto;
import com.ltkj.hosp.dto.TjProBlDto;
+import com.ltkj.hosp.dto.UpdateTransitionnewPriceDto;
import com.ltkj.hosp.hisDto.OutpinimpapplyDto;
import com.ltkj.hosp.hisDto.OutpinmedicapplyDto;
import com.ltkj.hosp.mapper.TestMapper;
@@ -1132,11 +1133,18 @@
Date date1 = new Date(System.currentTimeMillis());
String s1 = SecurityUtils.getUsername() + new SimpleDateFormat("yyMMddHHmmssSSS").format(date1);
tjFlowingWater.setWaterId(PinyinUtil.getFirstLetter(tjCustomer.getCusName(), "").toUpperCase() + s1);
+ BigDecimal copeWith = tjOrder.getTjFlowingWater().getCopeWith();
+ BigDecimal paidIn = tjOrder.getTjFlowingWater().getPaidIn();
+ tjFlowingWater.setCopeWith(copeWith);
+ tjFlowingWater.setPaidIn(paidIn);
+ tjFlowingWater.setDiscount(discount.toString());
- tjFlowingWater.setCopeWith(tjOrder.getTjFlowingWater().getCopeWith());
- tjFlowingWater.setPaidIn(tjOrder.getTjFlowingWater().getPaidIn());
- tjFlowingWater.setDiscount(tjOrder.getTjFlowingWater().getDiscount());
+ BigDecimal subtract = paidIn.subtract(copeWith.multiply(discount.divide(BigDecimal.valueOf(10))));
+ log.info("绛惧埌鐧昏浣撴浜�: "+tjOrder.getTjNumber()+" 搴斾粯: "+copeWith);
+ log.info("绛惧埌鐧昏浣撴浜�: "+tjOrder.getTjNumber()+" 鎶樻墸: "+discount);
+ log.info("绛惧埌鐧昏浣撴浜�: "+tjOrder.getTjNumber()+" 瀹炰粯: "+paidIn);
+ log.info("绛惧埌鐧昏浣撴浜�: "+tjOrder.getTjNumber()+" 鐩稿樊: "+subtract);
if (isPay.equals("true")) {
if (null != mallOrder) {
@@ -1166,13 +1174,27 @@
// tjFlowingWater.setPayStasus(0L);
}
}
+
+ //淇敼姣忛」鐨勫師浠风幇浠�
+// transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(), discount, tjOrder.getTjNumber());
+ //淇敼涓存椂琛ㄤ綋妫�鍙�
+ transitionService.updateTbTransitionTjNumByCusId(tjCustomer.getCusIdcard(),tjOrder.getTjNumber());
+ //琛ュ樊浠�
+ /* if(subtract.compareTo(BigDecimal.ZERO)>0){
+ tjFlowingWater.setPaidIn(paidIn.add(subtract));
+ TbTransition onwTbTransition = transitionService.getOnwTbTransition(tjCustomer.getCusIdcard(),tjOrder.getTjNumber());
+ if(null !=onwTbTransition){
+ log.info("绛惧埌鐧昏浣撴浜�: "+tjOrder.getTjNumber()+"缁�: "+onwTbTransition.getParentProName()+" "+onwTbTransition.getNowPrice()
+ +" 琛ュ樊浠� "+subtract+" 鏈�缁堝緱 "+onwTbTransition.getNowPrice().add(subtract));
+ onwTbTransition.setNowPrice(onwTbTransition.getNowPrice().add(subtract));
+ transitionService.updateById(onwTbTransition);
+ }
+ }*/
+
if (tjFlowingWaterService.save(tjFlowingWater)) {
tjOrder.setTjSerialNumber(String.valueOf(tjFlowingWater.getTjSerialNumber()));
tjOrderService.updateById(tjOrder);
}
-
- //淇敼姣忛」鐨勫師浠风幇浠� //淇敼涓存椂琛ㄤ綋妫�鍙�
- transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(), discount, tjOrder.getTjNumber());
/*璋冪敤his鎺ュ彛*/
String config = configService.selectConfigByKey("sfkqdyhis");
@@ -1405,6 +1427,7 @@
}
public void addCaiYangDengJi(List<TjOrderDetail> detailList, boolean detailList1, TjOrder order, SysUser sysUser, String jxbz) {
+ String lis_tmh_prefix = configService.selectConfigByKey("make_lis_tmh_prefix");
if (null != detailList && detailList1) {
Date date = new Date();
String format = DateUtil.format(date, "yyMMddHHmmssSSS");
@@ -1415,13 +1438,13 @@
Long proParentId = project.getProParentId();
String dictLabel = sysDictDataService.selectDictLabel("sys_dict_specimen", project.getSpecimenType());
if (null != proParentId && proParentId == 0) {
- sampling.setJyxh(idUtils.generateLisID());
+ sampling.setJyxh(idUtils.generateLisID(lis_tmh_prefix));
sampling.setSpecimenTypeCode(project.getSpecimenType());
sampling.setSpecimenType(dictLabel);
sampling.setJyxmdm(project.getProId().toString());
} else {
TjProject project1 = projectService.getById(proParentId);
- sampling.setJyxh(idUtils.generateLisID());
+ sampling.setJyxh(idUtils.generateLisID(lis_tmh_prefix));
sampling.setSpecimenTypeCode(project1.getSpecimenType());
sampling.setSpecimenType(dictLabel);
@@ -2594,7 +2617,7 @@
QueryWrapper<TbTransition> wrapper = new QueryWrapper<>();
wrapper.select("parent_pro_id", "parent_pro_name", "sum(now_price) as ord_price")
.eq("tj_num", tjNumber)
- .groupBy("parent_pro_name");
+ .groupBy("parent_pro_id");
List<TbTransition> list = transitionService.list(wrapper);
List<Long> parentProIds = list.stream().map(item -> item.getParentProId()).collect(Collectors.toList());
LambdaQueryWrapper<TjProject> projectQueryWrapper = new LambdaQueryWrapper<>();
@@ -3008,7 +3031,8 @@
if (null != order.getFinishTime()) return AjaxResult.error("璇ヤ汉鍛樺凡绛剧,涓嶅彲鎾ら攢!!!");
String s = configService.selectConfigByKey("is_request_common_his_api");
- if (null != s && s.equals("Y") && "2".equals(order.getTjType())) {
+// if (null != s && s.equals("Y") && "2".equals(order.getTjType())) {
+ if (null != s && s.equals("Y")) {
String apiUrl = configService.selectConfigByKey("common_api_url");
String hospbm = configService.selectConfigByKey("common_api_service_hospbm");
@@ -3098,11 +3122,11 @@
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) {
+ if (null != reservationList && !reservationList.isEmpty()) {
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) {
+ if (null != orderList && !orderList.isEmpty()) {
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());
@@ -3119,11 +3143,11 @@
@ApiOperation(value = "鏍规嵁瀹㈡埛浣撴鍙锋壒閲忔挙閿�浣撴璁板綍")
@Transactional
public AjaxResult plRevokeTjOrderByTjNum(@RequestBody @ApiParam(value = "棰勭害涓婚敭id闆嗗悎") List<String> reservationIds) {
- if (null != reservationIds && reservationIds.size() > 0) {
+ if (null != reservationIds && !reservationIds.isEmpty()) {
LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
wq1.in(TjOrder::getReservationId, reservationIds);
List<TjOrder> orderList = tjOrderService.list(wq1);
- if (null != orderList && orderList.size() > 0) {
+ if (null != orderList && !orderList.isEmpty()) {
for (TjOrder order : orderList) {
// TjOrder order = tjOrderService.getOrderByTjNum(tjNum);
if (null != order) {
@@ -3281,12 +3305,12 @@
LambdaQueryWrapper<TjProBl> wq = new LambdaQueryWrapper<>();
wq.eq(TjProBl::getTjh, tjNum);
List<TjProBl> blList = blService.list(wq);
- if (null != blList && blList.size() > 0) {
+ if (null != blList && !blList.isEmpty()) {
for (TjProBl bl : blList) {
LambdaQueryWrapper<TjOrderRemark> wqr = new LambdaQueryWrapper<>();
wqr.eq(TjOrderRemark::getJxbz, bl.getBldh());
List<TjOrderRemark> remarkList = remarkService.list(wqr);
- if (null != remarkList && remarkList.size() > 0) {
+ if (null != remarkList && !remarkList.isEmpty()) {
List<Long> collect = remarkList.stream().map(TjOrderRemark::getProId).collect(Collectors.toList());
LambdaQueryWrapper<TjProject> wqp = new LambdaQueryWrapper<>();
wqp.in(TjProject::getProId, collect);
@@ -3357,7 +3381,8 @@
}
}
String s = configService.selectConfigByKey("is_request_common_his_api");
- if (null != s && s.equals("Y") && "2".equals(order.getTjType())) {
+// if (null != s && s.equals("Y") && "2".equals(order.getTjType())) {
+ if (null != s && s.equals("Y")) {
ArrayList<TjFlowingWater> weizhifu = new ArrayList<>();
ArrayList<TjFlowingWater> yizhifu = new ArrayList<>();
for (String bldh : dto.getBldhs()) {
@@ -3728,6 +3753,36 @@
return AjaxResult.success(list);
}
+ @PostMapping(value = "updateTransitionnewPrice")
+ @ApiOperation(value = "绛惧埌鐧昏椤甸潰鏍规嵁鎶樻墸淇敼椤圭洰鐜颁环")
+ @Transactional
+ public AjaxResult updateTransitionnewPrice(@RequestBody List<UpdateTransitionnewPriceDto> dtos) {
+
+ if(null !=dtos && !dtos.isEmpty()){
+ for (UpdateTransitionnewPriceDto dto : dtos) {
+ LambdaQueryWrapper<TbTransition> wq=new LambdaQueryWrapper<>();
+ wq.eq(TbTransition::getCusId,dto.getCusIdCard());
+ wq.eq(TbTransition::getParentProId,dto.getParentProId());
+ wq.isNull(TbTransition::getTjNum);
+ List<TbTransition> list = transitionService.list(wq);
+ log.info("淇敼鐨勫鎴疯韩浠借瘉鍙蜂负: "+dto.getCusIdCard());
+ log.info("鐖堕」鐩甶d涓�: "+dto.getParentProId());
+ log.info("鎶樻墸涓�: "+new BigDecimal(dto.getDiscount()));
+ if(null !=list && !list.isEmpty()){
+ for (TbTransition transition : list) {
+ BigDecimal ordPrice = transition.getOrdPrice();
+ BigDecimal multiply = ordPrice.multiply((new BigDecimal(dto.getDiscount()).divide(BigDecimal.valueOf(10))));
+ log.info("鍚庣璁＄畻鐨勯噾棰�: "+multiply);
+ transition.setNowPrice(multiply);
+ transition.setDiscount(new BigDecimal(dto.getDiscount()));
+ transitionService.updateById(transition);
+ }
+ }
+ }
+ }
+ return AjaxResult.success();
+ }
+
}
--
Gitblit v1.8.0