From 88ee7561ab60710099182514bf639e37fd6114a9 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 17 五月 2024 18:03:21 +0800
Subject: [PATCH] zjh 2024/05/17-1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 43 +++++++++++++++++++++++++++++++++----------
1 files changed, 33 insertions(+), 10 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..ac27e20 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
@@ -52,6 +52,7 @@
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;
@@ -1468,14 +1469,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 +1494,6 @@
}
map.put("parentName", projectService.getById(entry.getKey()).getProName());
map.put("list", entry.getValue());
-
-
list.add(map);
}
return list;
@@ -1715,7 +1715,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()));
//鍒ゆ柇鏄惁浜ら挶
@@ -1870,5 +1870,28 @@
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("绛惧埌璁板綍涓嶅瓨鍦�!");
+ }
+
}
--
Gitblit v1.8.0