From 7e31516ad9ea863cba1d592e2a7b5c37e74e55a0 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 31 七月 2024 18:07:55 +0800
Subject: [PATCH] zjh 2024/07/31-1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 39 +++++++++++++++++++++++++--------------
1 files changed, 25 insertions(+), 14 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
index ccf8bed..ab97ccf 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
@@ -34,6 +34,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.ibatis.jdbc.Null;
import org.springframework.beans.factory.annotation.Autowired;
@@ -64,6 +65,7 @@
@RestController
@RequestMapping("/system/dept")
@Api(tags = "绉戝閮ㄩ棬淇℃伅")
+@Slf4j
public class SysDeptController extends BaseController implements Serializable {
@Resource
private ISysDeptService deptService;
@@ -1400,7 +1402,7 @@
* @param tjNumber
* @return
*/
- @Transactional
+// @Transactional
@GetMapping("/getParentList")
@ApiOperation(value = "鍖荤敓鐐瑰嚮浣撴淇℃伅璇︽儏(鍙樉绀虹埗椤圭洰鍒楄〃)")
public AjaxResult getParentList(@ApiParam(value = "瀹㈡埛浣撴鍙�") @RequestParam String tjNumber) {
@@ -1441,25 +1443,17 @@
// if (cateFeeAll.compareTo(fyhj) != 0){
// return AjaxResult.error("瀛樺湪鏈即璐归」鐩�");
// }
+
int sfsf = ltkjJianchajianyanTreeService.getSfsfByCardId(tjOrder.getCardId());
if (sfsf > 0){
+ log.error("璺嘲绉戞妧--- "+DateUtil.date()+" 瀛樺湪鏈即璐归」鐩殑 灏卞崟鏁� "+sfsf);
+ log.error("璺嘲绉戞妧--- "+DateUtil.date()+" 瀛樺湪鏈即璐归」鐩殑 灏辫瘖鍙� "+tjOrder.getCardId()+" 浣撴鍙� "+tjOrder.getTjNumber());
return AjaxResult.error("瀛樺湪鏈即璐归」鐩�");
}
- tjFlowingWater.setPayStasus(1L);
- tjFlowingWater.setPayType(0L);
- tjFlowingWater.setTollCollectorId("148");
- tjFlowingWaterService.updateById(tjFlowingWater);
- Long tjSerialNumber = tjFlowingWater.getTjSerialNumber();
- LambdaQueryWrapper<TjOrderDetail> tjOrderDetailLambdaQueryWrapper = new LambdaQueryWrapper<>();
- tjOrderDetailLambdaQueryWrapper.eq(TjOrderDetail::getOrderId,tjOrder.getOrderId());
- List<TjOrderDetail> tjOrderDetails = detailService.list(tjOrderDetailLambdaQueryWrapper);
- List<Long> detailIds = tjOrderDetails.stream().map(TjOrderDetail::getOrderDetailId).collect(Collectors.toList());
- LambdaUpdateWrapper<TjOrderDetail> tjOrderDetailLambdaUpdateWrapper = new LambdaUpdateWrapper<>();
- tjOrderDetailLambdaUpdateWrapper.set(TjOrderDetail::getFlowingWaterId,tjSerialNumber);
- tjOrderDetailLambdaUpdateWrapper.in(TjOrderDetail::getOrderDetailId,detailIds);
- detailService.update(tjOrderDetailLambdaUpdateWrapper);
+ extracted(tjOrder, tjFlowingWater);
}else {
+ log.error("璺嘲绉戞妧--- "+DateUtil.date()+" 鏈煡璇㈠埌缂磋垂璁板綍鐨� 灏辫瘖鍙� "+tjOrder.getCardId()+" 浣撴鍙� "+tjOrder.getTjNumber());
return AjaxResult.error("鏈煡璇㈠埌缂磋垂璁板綍");
}
// }
@@ -1554,6 +1548,23 @@
return AjaxResult.error();
}
+ @Transactional
+ private void extracted(TjOrder tjOrder, TjFlowingWater tjFlowingWater) {
+ tjFlowingWater.setPayStasus(1L);
+ tjFlowingWater.setPayType(0L);
+ tjFlowingWater.setTollCollectorId("148");
+ tjFlowingWaterService.updateById(tjFlowingWater);
+ Long tjSerialNumber = tjFlowingWater.getTjSerialNumber();
+ LambdaQueryWrapper<TjOrderDetail> tjOrderDetailLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ tjOrderDetailLambdaQueryWrapper.eq(TjOrderDetail::getOrderId, tjOrder.getOrderId());
+ List<TjOrderDetail> tjOrderDetails = detailService.list(tjOrderDetailLambdaQueryWrapper);
+ List<Long> detailIds = tjOrderDetails.stream().map(TjOrderDetail::getOrderDetailId).collect(Collectors.toList());
+ LambdaUpdateWrapper<TjOrderDetail> tjOrderDetailLambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+ tjOrderDetailLambdaUpdateWrapper.set(TjOrderDetail::getFlowingWaterId,tjSerialNumber);
+ tjOrderDetailLambdaUpdateWrapper.in(TjOrderDetail::getOrderDetailId,detailIds);
+ detailService.update(tjOrderDetailLambdaUpdateWrapper);
+ }
+
/**
* 鐐瑰嚮鐖堕」鐩樉绀哄瓙椤圭洰璇︽儏
*
--
Gitblit v1.8.0