From 6673c6d9ea7a9b58e0e88c739d7db38d4e9fd130 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 03 一月 2025 00:03:34 +0800
Subject: [PATCH] zjh20250102
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 63 ++++++++++++++++++++++++++++---
1 files changed, 57 insertions(+), 6 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 8bee3cd..93c2b26 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,26 @@
// 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");
@@ -3730,6 +3751,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