From 1b7ed7edb09aaecf68ddf3396ee007bc6eadf52a Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 30 十二月 2024 17:04:09 +0800
Subject: [PATCH] zjh202412030

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/callback/CallBackController.java |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/callback/CallBackController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/callback/CallBackController.java
index 28422ce..5bbd6c2 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/callback/CallBackController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/callback/CallBackController.java
@@ -6,6 +6,7 @@
 import com.ltkj.hosp.domain.*;
 import com.ltkj.hosp.mapper.TjSamplingMapper;
 import com.ltkj.hosp.service.*;
+import jodd.util.StringUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -64,8 +65,22 @@
                 LambdaQueryWrapper<TjFlowingWater> wrapper = new LambdaQueryWrapper<>();
                 wrapper.eq(TjFlowingWater::getHisWaterId, feiYongId);
                 TjFlowingWater water = tjFlowingWaterService.getOne(wrapper);
-                water.setPayStasus(1L);
-                tjFlowingWaterService.updateById(water);
+                if(null !=water){
+                    water.setPayStasus(1L);
+                    if (tjFlowingWaterService.updateById(water)) {
+                        String jxbz = water.getJxbz();
+                        if(StringUtil.isNotBlank(jxbz)){
+                            tjOrderDetailService.updateTjOrderDetailsFlowingWaterIdByJxbz(water.getOrderId().toString(),jxbz,water.getTjSerialNumber().toString());
+                            remarkService.updateTjOrderRemarkSfbzByJxbz(water.getOrderId().toString(),jxbz,water.getTjSerialNumber().toString());
+                        }else {
+                            tjOrderDetailService.updateTjOrderDetailsFlowingWaterIdByJxbzisnull(water.getOrderId().toString(),water.getTjSerialNumber().toString());
+                            remarkService.updateTjOrderRemarkSfbzByJxbzisnull(water.getOrderId().toString(),water.getTjSerialNumber().toString());
+                        }
+
+                    }
+                }else {
+                    return AjaxResult.error("鏌ヤ笉鍒版祦姘村彿: "+feiYongId);
+                }
             }else {
                 LambdaQueryWrapper<TjFlowingWater> wrapper = new LambdaQueryWrapper<>();
                 wrapper.eq(TjFlowingWater::getHisTfWaterId, feiYongId).or().eq(TjFlowingWater::getHisWaterId, feiYongId);

--
Gitblit v1.8.0