From cf5426f9bc46ab1f5737942883c4358dedfd4235 Mon Sep 17 00:00:00 2001 From: zjh <1084500556@qq.com> Date: 星期三, 25 六月 2025 15:06:29 +0800 Subject: [PATCH] zjh20250625 --- ltkj-admin/src/main/java/com/ltkj/web/controller/callback/CallBackController.java | 27 +++++++++++++++++---------- 1 files changed, 17 insertions(+), 10 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 9837d49..1062b9c 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 @@ -24,10 +24,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; /** @@ -90,6 +87,7 @@ TjFlowingWater water = tjFlowingWaterService.getOne(wrapper); if(null !=water){ water.setPayStasus(1L); + water.setSfjs("1"); if (tjFlowingWaterService.updateById(water)) { String jxbz = water.getJxbz(); if(StringUtil.isNotBlank(jxbz)){ @@ -128,16 +126,18 @@ String bldh = water.getJxbz(); // lisRevoke(water.getTjNumber(),bldh); if (bldh != null){ - remarkService.deleteTjOrderDetailByjxbz(bldh); + remarkService.updateTjOrderRemarkSfbzByJxbz(order.getOrderId().toString(),bldh,null); +/* remarkService.deleteTjOrderDetailByjxbz(bldh); tjOrderDetailService.deleteTjOrderDetailByjxbz(bldh); tjFlowingWaterService.deleteTjOrderDetailByjxbz(bldh); transitionService.deleteTjOrderDetailByjxbz(bldh); blService.remove(new LambdaQueryWrapper<TjProBl>().eq(TjProBl::getTjh, order.getTjNumber()).eq(TjProBl::getBldh, bldh)); - tjSamplingMapper.deleteByTjNumAndCusIdAndJxbzo(order.getTjNumber(), order.getUserId(),bldh); + tjSamplingMapper.deleteByTjNumAndCusIdAndJxbzo(order.getTjNumber(), order.getUserId(),bldh);*/ + }else { - TjCustomer customer = tjCustomerService.getById(order.getUserId()); - customer.setCardId("0"); - tjCustomerService.updateById(customer); +// TjCustomer customer = tjCustomerService.getById(order.getUserId()); +// customer.setCardId("0"); +// tjCustomerService.updateById(customer); /* tjOrderService.deleteTjOrderByOrderId(order.getOrderId()); tjOrderDetailService.deleteTjOrderDetailByOrderDetailId(String.valueOf(order.getOrderId())); @@ -146,8 +146,15 @@ transitionService.deletedTbTransitionByTjNum(order.getTjNumber()); ycxmService.delOrderYcXmJyByTjh(order.getTjNumber()); tjSamplingMapper.deleteByTjNumAndCusId(order.getTjNumber(), order.getUserId());*/ - tjOrderService.removeById(order.getOrderId()); +// tjOrderService.removeById(order.getOrderId()); + + remarkService.updateTjOrderRemarkSfbzByJxbzisnull(order.getOrderId().toString(),null); } + water.setPayStasus(2L); + water.setRefundPersonId("his鍥炶皟"); + water.setRefundTime(new Date()); + water.setRefundPrice(water.getPaidIn()); + tjFlowingWaterService.updateById(water); } } } -- Gitblit v1.8.0