From b2cec2e0927601205ec36185475157520e420119 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期五, 14 三月 2025 18:15:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 174 +++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 154 insertions(+), 20 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 acf5fba..0004245 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
@@ -550,7 +550,7 @@
wq.isNull(TjOrder::getPrintLastTime);
}
if (zt == 6) {
- //宸插嚭鎶ュ憡
+ //宸叉墦鍗�
wq.isNotNull(TjOrder::getPrintLastTime);
wq.eq(TjOrder::getHeshouStatus, 1);
wq.isNotNull(TjOrder::getPrintLastTime);
@@ -609,7 +609,7 @@
order.setZt("鎶ュ憡鏍告敹");
}
if (zt == 6) {
- order.setZt("宸插嚭鎶ュ憡");
+ order.setZt("宸叉墦鍗�");
}
} else {
if (czwj == 0) {
@@ -637,8 +637,8 @@
order.setZt("鎶ュ憡鏍告敹");
}
if (null != lastTime) {
- //宸插嚭鎶ュ憡6
- order.setZt("宸插嚭鎶ュ憡");
+ //宸叉墦鍗�6
+ order.setZt("宸叉墦鍗�");
}
}
}
@@ -1098,8 +1098,11 @@
public AjaxResult processOrderWithTransaction(TjOrder tjOrder, TjCustomer tjCustomer, TjReservation tjReservation, TjFlowingWater tjFlowingWater, MallOrder mallOrder, SysUser sysUser) {
//鑾峰彇鎷兼帴鍓嶇紑
-// String makeLisTmhPrefix = configService.selectConfigByKey("make_lis_tmh_prefix");
+ String sfkqtjhqz = configService.selectConfigByKey("sfkqtjhqz");
String makeLisTmhPrefix = "";
+ if(sfkqtjhqz.equalsIgnoreCase("Y")){
+ makeLisTmhPrefix = configService.selectConfigByKey("make_lis_tmh_prefix");
+ }
//鐢熸垚浣撴鍙�
// String tjNumber = (SecurityUtils.getUsername() + new SimpleDateFormat("yyMMddHHmmss").format(new Date()));
@@ -1236,6 +1239,7 @@
}*/
// 鏌ヨ 瀵规帴Lis銆丳acs鐢宠濡傛灉绫诲瀷鍖呭惈鍦ㄩ厤缃唴鍒欎娇鐢ㄥ鎺is銆乸acs
if (lisApiMethod.isUseLisAndPacsRegister(tjOrder)) {
+ log.info("璋冪敤his寮�鍚� 杩涘叆涓嶆敹璐规柟娉� 璇ヤ綋妫�浜哄憳涓嶆敹璐�:"+tjOrder.getTjNumber());
// 杩欐槸涓婇潰涓汉鏂规硶寮曞叆鏁版嵁
tjFlowingWater.setPayStasus(1L);
newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
@@ -1246,14 +1250,18 @@
remarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(), tjFlowingWater.getTjSerialNumber().toString());
List<TjXdPicture> xdPictureList = xdPictureService.saveTjXdPicture(tjOrder.getTjNumber());
xdPictureService.saveBatch(xdPictureList);
-// List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId());
-// addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null);
+ List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId());
+ addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null);
+ log.info("璋冪敤his寮�鍚� 杩涘叆涓嶆敹璐规柟娉� 璇ユ柟娉曟墽琛屽畬姣�");
} else {
+ log.info("璋冪敤his寮�鍚� 杩涘叆鏀惰垂鏂规硶 璇ヤ綋妫�浜哄憳涓嶆敹璐�:"+tjOrder.getTjNumber());
newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId());
addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null);
-
- hisApiMethod.tijianshenqing(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder.getCardId());
+ String isUseMx = configService.selectConfigByKey("jcxhis_is_use_mx");
+ if (isUseMx.equalsIgnoreCase("Y"))
+ hisApiMethod.tijianshenqing(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder.getCardId());
+ else hisApiMethod.tijianshenqingJinchuanNew(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder.getCardId());
}
return AjaxResult.success(tjNumber);
} else {
@@ -1404,6 +1412,7 @@
wrapper.gt(TbTransition::getNowPrice, 0);
List<TbTransition> list = tbTransitionService.list(wrapper);
+ BigDecimal zongjia = new BigDecimal("0.0");
for (TbTransition transition : list) {
LambdaQueryWrapper<TjProject> wrapper1 = new LambdaQueryWrapper<>();
wrapper1.eq(TjProject::getProId, transition.getProId());
@@ -1414,7 +1423,8 @@
SysDept dept = sysDeptService.getOne(wrapper2);
JSONObject obj = JSONUtil.createObj();
- Integer sl = project.getSl();
+// Integer sl = project.getSl();
+ int sl = 1;
BigDecimal danjia = transition.getNowPrice();
BigDecimal allPrice = danjia.multiply(new BigDecimal(sl));
obj.putOpt("danJia", danjia);
@@ -1425,8 +1435,10 @@
obj.putOpt("shouFeiXmId", project.getHisXmbm());
obj.putOpt("shouFeiXmMc", project.getHisXmmc());
array.add(obj);
+ zongjia = zongjia.add(allPrice);
}
map.put("feiYongInfoList", array);
+ log.info("璋冪敤His鎺ュ彛鍓� 鏀惰垂鎬讳环:{}", zongjia.toString());
String post = HttpClientUtils.sendPost(apiUrl + "/api/his/" + hospbm + "/creatCostInfo", map);
JSONObject object = JSONUtil.parseObj(post);
@@ -3756,6 +3768,20 @@
}
+ @GetMapping("/chushenyemianyijianjiekou")
+ @ApiOperation(value = "鍒濆椤甸潰寮冩鎺ュ彛")
+ @Transactional
+ public AjaxResult chushenyemianyijianjiekou(@RequestParam String tjNUm, @RequestParam String proId) {
+ LambdaQueryWrapper<TjOrderRemark> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjOrderRemark::getTjNumber, tjNUm);
+ wq.eq(TjOrderRemark::getProId, proId);
+ TjOrderRemark remark = remarkService.getOne(wq);
+ remark.setType(1);
+ remarkService.updateById(remark);
+ return AjaxResult.success("鎿嶄綔鎴愬姛!");
+ }
+
+
@PostMapping("/zongjanyemianshjianzhou")
@ApiOperation(value = "鎬绘鑾峰彇鏃堕棿杞存帴鍙�")
@Transactional
@@ -3799,7 +3825,7 @@
a = 5;
}
if (null != lastTime) {
- //宸插嚭鎶ュ憡
+ //宸叉墦鍗�
a = 6;
}
map.put("tjNUm", tjNUm);
@@ -3950,7 +3976,10 @@
public AjaxResult updateTransitionnewPrice(@RequestBody List<UpdateTransitionnewPriceDto> dtos) {
if (null != dtos && !dtos.isEmpty()) {
+ int index = 0;
+ boolean flag = false;
for (UpdateTransitionnewPriceDto dto : dtos) {
+ index++;
LambdaQueryWrapper<TbTransition> wq = new LambdaQueryWrapper<>();
wq.eq(TbTransition::getCusId, dto.getCusIdCard());
wq.eq(TbTransition::getParentProId, dto.getParentProId());
@@ -3960,24 +3989,90 @@
log.info("鐖堕」鐩甶d涓�: " + dto.getParentProId());
log.info("鎶樻墸涓�: " + new BigDecimal(dto.getDiscount()));
if (null != list && !list.isEmpty()) {
- BigDecimal dxzj = transitionService.getTbTransitionPriceAndOrdPrice(dto.getCusIdCard(), dto.getParentProId());
+
for (TbTransition transition : list) {
BigDecimal ordPrice = transition.getOrdPrice();
BigDecimal multiply = ordPrice.multiply((new BigDecimal(dto.getDiscount()).divide(BigDecimal.valueOf(10))));
- log.info("鍚庣璁＄畻鐨勯噾棰�: " + multiply);
+ log.info("鍚庣璁＄畻鐨勯噾棰�: " + multiply.toString());
transition.setNowPrice(multiply);
transition.setDiscount(new BigDecimal(dto.getDiscount()));
transitionService.updateById(transition);
}
- if (null != dto.getYhj() && dto.getYhj().compareTo(BigDecimal.ZERO) >= 0) {
- List<TbTransition> transitionList = list.stream().filter(a ->
- transitionService.getTbTransitionPriceAndOrdPrice(dto.getCusIdCard(), dto.getParentProId()).subtract(dto.getYhj()).compareTo(BigDecimal.ZERO) >= 0).collect(Collectors.toList());
- if (!transitionList.isEmpty()) {
- TbTransition tbTransition = transitionList.get(0);
- tbTransition.setNowPrice(dxzj);
- transitionService.updateById(tbTransition);
+
+ BigDecimal dxzj = transitionService.getTbTransitionPriceAndOrdPrice(dto.getCusIdCard(), dto.getParentProId());
+
+ BigDecimal yhj = dto.getYhj();
+ log.info("鍓嶇浼犻�掔殑浠锋牸锛歿}",yhj.toString());
+ BigDecimal cj = yhj.subtract(dxzj);
+ log.info("璁＄畻鐨勫樊浠凤細{}",cj.toString());
+// int index1 = 0;
+ for (TbTransition transition : list) {
+// BigDecimal ordPrice = transition.getOrdPrice();
+// BigDecimal multiply = ordPrice.multiply((new BigDecimal(dto.getDiscount()).divide(BigDecimal.valueOf(10))));
+ BigDecimal result = transition.getNowPrice().add(cj);
+ log.info("琛ヤ笂宸环鍓嶇殑浠锋牸涓猴細{}",transition.getNowPrice().toString());
+ if (result.compareTo(BigDecimal.ZERO)>0 && !flag && cj.compareTo(BigDecimal.ZERO) != 0){
+ transition.setNowPrice(result);
+ transitionService.updateById(transition);
+ log.info("淇敼 琛ヤ笂宸环鍚庣殑浠锋牸涓猴細{}",result.toString());
+ flag = true;
+ break;
}
+// if (index1 == 0 ){
+// log.info("淇敼灏忛」 {}{} 鍘熸湰浠锋牸:{}",transition.getProId(),transition.getProName(),multiply.toString());
+// multiply = multiply.add(cj);
+// log.info("澧炲姞宸环鍚庯細{}",multiply.toString());
+// }
+// index1++;
+// log.info("鍚庣璁＄畻鐨勯噾棰�: " + multiply.toString());
+//// log.info("鍓嶇浼犻�掔殑閲戦: " + dto.getYhj());
+// transition.setNowPrice(multiply);
+// transition.setDiscount(new BigDecimal(dto.getDiscount()));
+// transitionService.updateById(transition);
}
+
+// log.info("dxzj:{}",dxzj.toString());
+// if (index == dtos.size()){
+// BigDecimal yhj = dto.getYhj();
+// log.info("鍓嶇浼犻�掔殑浠锋牸锛歿}",yhj.toString());
+// BigDecimal cj = yhj.subtract(dxzj);
+// log.info("璁＄畻鐨勫樊浠凤細{}",cj.toString());
+// int index1 = 0;
+// for (TbTransition transition : list) {
+// BigDecimal ordPrice = transition.getOrdPrice();
+// BigDecimal multiply = ordPrice.multiply((new BigDecimal(dto.getDiscount()).divide(BigDecimal.valueOf(10))));
+// if (index1 == 0 ){
+// log.info("淇敼灏忛」 {}{} 鍘熸湰浠锋牸:{}",transition.getProId(),transition.getProName(),multiply.toString());
+// multiply = multiply.add(cj);
+// log.info("澧炲姞宸环鍚庯細{}",multiply.toString());
+// }
+// index1++;
+// log.info("鍚庣璁＄畻鐨勯噾棰�: " + multiply.toString());
+//// log.info("鍓嶇浼犻�掔殑閲戦: " + dto.getYhj());
+// transition.setNowPrice(multiply);
+// transition.setDiscount(new BigDecimal(dto.getDiscount()));
+// transitionService.updateById(transition);
+// }
+// }else {
+// for (TbTransition transition : list) {
+// BigDecimal ordPrice = transition.getOrdPrice();
+// BigDecimal multiply = ordPrice.multiply((new BigDecimal(dto.getDiscount()).divide(BigDecimal.valueOf(10))));
+// log.info("鍚庣璁＄畻鐨勯噾棰�: " + multiply.toString());
+//// log.info("鍓嶇浼犻�掔殑閲戦: " + dto.getYhj());
+// transition.setNowPrice(multiply);
+// transition.setDiscount(new BigDecimal(dto.getDiscount()));
+// transitionService.updateById(transition);
+// }
+//// if (null != dto.getYhj() && dto.getYhj().compareTo(BigDecimal.ZERO) >= 0) {
+//// List<TbTransition> transitionList = list.stream().filter(a ->
+//// transitionService.getTbTransitionPriceAndOrdPrice(dto.getCusIdCard(), dto.getParentProId()).subtract(dto.getYhj()).compareTo(BigDecimal.ZERO) >= 0).collect(Collectors.toList());
+//// if (!transitionList.isEmpty()) {
+//// TbTransition tbTransition = transitionList.get(0);
+//// tbTransition.setNowPrice(dxzj);
+//// transitionService.updateById(tbTransition);
+//// }
+//// }
+// }
}
}
}
@@ -4017,5 +4112,44 @@
}
return AjaxResult.error();
}
+
+
+
+ @PostMapping("/addBlTransition")
+ @ApiOperation(value = "琛ュ綍娣诲姞杩囨浮琛ㄦ暟鎹�")
+ @Transactional
+ public AjaxResult addBlTransition(@RequestBody Map<String, Object> map) {
+ Object packId = map.get("pacId");
+ if (null == map.get("cusId")) return AjaxResult.error("璇烽�夋嫨浣撴浜�");
+ String cusId = map.get("cusId").toString();
+ Object proIds1 = map.get("proIds");
+ List<Long> proIds = null;
+ 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.isEmpty()) && (null == packId || packId.equals(""))) {
+ transitionService.deletedTbTransitionByCusId(cusId);
+ }
+
+ //鍗曢」
+ if (null != proIds && !proIds.isEmpty()) {
+ //寮傛淇濆瓨鏁版嵁搴撹〃
+ for (Long proId : proIds) {
+ TjProject project = projectService.selectTjProjectByProId(proId);
+ if (null != project) {
+ List<TbTransition> transitionList = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(proId));
+ if (null == transitionList || transitionList.isEmpty()) {
+ transitionService.saveRedisTransitionByProId(cusId, cardId, proId);
+ }
+ }
+ }
+ }
+ return AjaxResult.success();
+ }
}
--
Gitblit v1.8.0