From c554eccf65b7c75b47bbd3fc9e6deb4e64262638 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期四, 26 十二月 2024 15:18:41 +0800
Subject: [PATCH] 20241226
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java | 108 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 108 insertions(+), 0 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
index 1d1afe6..4c02c33 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
@@ -593,6 +593,114 @@
return AjaxResult.error("璇疯緭鍏ヨ鏌ヨ鏉′欢");
}
+ /**
+ * 浣撴(鏀惰垂)椤甸潰鏌ヨ鎺ュ彛
+ */
+ @GetMapping("/findTjCollectFeesByNameAndTjNumAndPhoneN")
+ @ApiOperation(value = "浣撴(鏀惰垂)椤甸潰鏌ヨ鎺ュ彛")
+ public AjaxResult findTjCollectFeesByNameAndTjNumAndPhoneNew(@RequestParam(required = false) @ApiParam(value = "浣撴鍙�") String tjNum,
+ @RequestParam(required = false) @ApiParam(value = "浣撴浜哄鍚�") String tjName,
+ @RequestParam(required = false) @ApiParam(value = "浣撴浜烘墜鏈哄彿") String tjPhone) {
+ List<TjCollectFeesVo> tjCollectFeesVoList = new ArrayList<>();
+ if (null != tjName || null != tjPhone) {
+ LambdaQueryWrapper<TjCustomer> wq0 = new LambdaQueryWrapper<>();
+ wq0.like(TjCustomer::getCusName, tjName)
+ .or()
+ .like(TjCustomer::getCusPhone, tjPhone);
+ List<TjCustomer> customerList = customerService.list(wq0);
+ if (null != customerList && !customerList.isEmpty()) {
+ for (TjCustomer customer : customerList) {
+ LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
+ wq1.eq(TjOrder::getUserId, customer.getCusId());
+ wq1.eq(TjOrder::getCheckStatus, 0);
+ wq1.orderByDesc(TjOrder::getCreateTime);
+ List<TjOrder> tjOrders = orderService.list(wq1);
+ if (null != tjOrders && !tjOrders.isEmpty()) {
+ for (TjOrder order : tjOrders) {
+ LambdaQueryWrapper<TjOrderDetail> wq2 = new LambdaQueryWrapper<>();
+ wq2.eq(TjOrderDetail::getOrderId, order.getOrderId());
+ List<TjOrderDetail> detailList = detailService.list(wq2);
+ if (null != detailList && !detailList.isEmpty()) {
+ TjCollectFeesVo tjRefundVo = new TjCollectFeesVo();
+ tjRefundVo.setTjCusId(String.valueOf(customer.getCusId()));
+ tjRefundVo.setTjName(customer.getCusName());
+ tjRefundVo.setTjPhone(customer.getCusPhone());
+ tjRefundVo.setSex(String.valueOf(customer.getCusSex()));
+ if (null != customer.getCusIdcard()) tjRefundVo.setIdCard(customer.getCusIdcard());
+ DictComp dictComp = compService.getById(order.getFirmId());
+ if (null != dictComp) {
+ tjRefundVo.setTjComp(dictComp.getCnName());
+ } else {
+ tjRefundVo.setTjComp("鏃�");
+ }
+ if (null != order.getTjType()) tjRefundVo.setTjType(order.getTjType());
+ LambdaQueryWrapper<TjFlowingWater> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjFlowingWater::getOrderId, order.getOrderId());
+// wq.eq(TjFlowingWater::getIsAddition, "N");
+ wq.ne(TjFlowingWater::getPayStasus, 2);
+
+ List<TjFlowingWater> list = tjFlowingWaterService.list(wq);
+ for (TjFlowingWater water : list) {
+ tjRefundVo.setTjFlowingWater(water);
+ tjRefundVo.setTjNumber(order.getTjNumber());
+ tjRefundVo.setTjOrderId(String.valueOf(order.getOrderId()));
+ tjCollectFeesVoList.add(tjRefundVo);
+ }
+ // tjRefundVo.setPaidIn(String.valueOf(one.getPaidIn()));
+ }
+ }
+ }
+ }
+ return AjaxResult.success(tjCollectFeesVoList);
+ }
+ return AjaxResult.error("璇ョ敤鎴蜂笉瀛樺湪");
+ }
+
+ if (null != tjNum) {
+ LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
+ wq1.likeLeft(TjOrder::getTjNumber, tjNum);
+// wq1.eq(TjOrder::getCheckStatus, 0);
+ List<TjOrder> orderList = orderService.list(wq1);
+ if (null != orderList && !orderList.isEmpty()) {
+ for (TjOrder order : orderList) {
+ LambdaQueryWrapper<TjOrderDetail> wq2 = new LambdaQueryWrapper<>();
+ wq2.eq(TjOrderDetail::getOrderId, order.getOrderId());
+ //wq2.isNull(TjOrderDetail::getFlowingWaterId);
+ List<TjOrderDetail> detailList = detailService.list(wq2);
+ if (null != detailList && !detailList.isEmpty()) {
+ TjCustomer customer = customerService.getById(order.getUserId());
+ if (null != customer) {
+ TjCollectFeesVo tjRefundVo = new TjCollectFeesVo();
+ tjRefundVo.setTjCusId(String.valueOf(customer.getCusId()));
+ tjRefundVo.setTjName(customer.getCusName());
+ tjRefundVo.setTjPhone(customer.getCusPhone());
+ tjRefundVo.setSex(String.valueOf(customer.getCusSex()));
+ tjRefundVo.setIdCard(customer.getCusIdcard());
+ if (null != order.getFirmId()) {
+ DictComp byId = compService.getById(order.getFirmId());
+ if (null != byId) {
+ tjRefundVo.setTjComp(byId.getCnName());
+ }
+ }
+ if (null != order.getTjType()) tjRefundVo.setTjType(order.getTjType());
+ TjFlowingWater one = tjFlowingWaterService.getOne(new LambdaQueryWrapper<TjFlowingWater>()
+ .eq(TjFlowingWater::getOrderId, order.getOrderId())
+ .eq(TjFlowingWater::getIsAddition, "N")
+ .ne(TjFlowingWater::getPayStasus, 2));
+ tjRefundVo.setTjFlowingWater(one);
+ tjRefundVo.setTjNumber(order.getTjNumber());
+ tjRefundVo.setTjOrderId(String.valueOf(order.getOrderId()));
+ tjCollectFeesVoList.add(tjRefundVo);
+ }
+ }
+ }
+ return AjaxResult.success(tjCollectFeesVoList);
+ }
+ return AjaxResult.success("璇ョ敤鎴蜂笉瀛樺湪鎴栧凡浣撴瀹屾垚");
+ }
+ return AjaxResult.error("璇疯緭鍏ヨ鏌ヨ鏉′欢");
+ }
+
/**
* 浣撴宸叉敹璐规湭鏀惰垂淇℃伅鏌ヨ鎺ュ彛
--
Gitblit v1.8.0