From 42f852823e744a81525558b7523edde601c0b057 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 15 七月 2025 16:03:27 +0800
Subject: [PATCH] zjh20250715
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 36 ++++++++++++++++++++++++++++++++----
1 files changed, 32 insertions(+), 4 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 c11c004..288687b 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
@@ -3299,9 +3299,9 @@
for (TjFlowingWater water : list) {
- if (water.getPayStasus() == 0L || water.getPayStasus() == 2L) {
+ if (water.getPayStasus() == 0L) {
weizhifu.add(water);
- } else {
+ } else if (water.getPayStasus() == 1L){
yizhifu.add(water);
}
}
@@ -3660,9 +3660,9 @@
LambdaQueryWrapper<TjFlowingWater> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(TjFlowingWater::getJxbz, bldh);
TjFlowingWater water = tjFlowingWaterService.getOne(wrapper);
- if (water.getPayStasus() == 0L || water.getPayStasus() == 2L) {
+ if (water.getPayStasus() == 0L) {
weizhifu.add(water);
- } else {
+ } else if (water.getPayStasus() == 1L){
yizhifu.add(water);
}
}
@@ -3877,6 +3877,34 @@
}
+ @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("鎿嶄綔鎴愬姛!");
+ }
+
+
+ @GetMapping("/chushenyemianchexiaojiekou")
+ @ApiOperation(value = "鍒濆椤甸潰鎾ら攢鎺ュ彛")
+ @Transactional
+ public AjaxResult chushenyemianchexiaojiekou(@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(0);
+ remarkService.updateById(remark);
+ return AjaxResult.success("鎿嶄綔鎴愬姛!");
+ }
+
+
@PostMapping("/zongjanyemianshjianzhou")
@ApiOperation(value = "鎬绘鑾峰彇鏃堕棿杞存帴鍙�")
@Transactional
--
Gitblit v1.8.0