From cc97e7b40cc53a78b07d460c956b962ea56339ce Mon Sep 17 00:00:00 2001 From: zjh <zjh@888> Date: 星期一, 17 六月 2024 19:59:49 +0800 Subject: [PATCH] zjh 本地 2024/06/17 --1 --- ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 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 756bb53..a44347b 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 @@ -1036,10 +1036,13 @@ String config = configService.selectConfigByKey("sfkqdyhis"); if(null !=config && config.equals("Y")){ hisApiMethod.HisApiMethods(tjCustomer,tjOrder.getOrderId()); + }else { + tjCustomer.setCardId("0"); + tjCustomerService.updateById(tjCustomer); + transitionService.updateCardIdByTjNumAndIdCard(tjCustomer.getCusIdcard(),tjOrder.getTjNumber(),tjOrder.getTjNumber()); + tjOrder.setCardId(tjOrder.getTjNumber()); + tjOrderService.updateById(tjOrder); } -// tjCustomer.setCardId("0"); -// tjCustomerService.updateById(tjCustomer); - return AjaxResult.success(tjNumber); } return AjaxResult.error(); @@ -2336,6 +2339,11 @@ tjFlowingWaterService.deleteTjFlowingWaterByOrderId(String.valueOf(order.getOrderId())); transitionService.deletedTbTransitionByTjNum(tjNum); transitionService.updateTbTransitionByTjNum(tjNum); + TjCustomer customer = tjCustomerService.getById(order.getUserId()); + if(null !=customer){ + customer.setCardId("0"); + tjCustomerService.updateById(customer); + } String configByKey = configService.selectConfigByKey("sfkqdyhis"); if (configByKey.equals("Y")){ HashMap<String, Object> map = new HashMap<>(); -- Gitblit v1.8.0