From 7c101a72d19b6ffcfed337b46112689bb469c44a Mon Sep 17 00:00:00 2001 From: zjh <1084500556@qq.com> Date: 星期二, 26 三月 2024 17:27:18 +0800 Subject: [PATCH] zjh 2024/03/26--2 --- ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 12 +++++++----- 1 files changed, 7 insertions(+), 5 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 8d66d30..6307b6f 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 @@ -1184,6 +1184,8 @@ } } } + + if (null != tbTransitionList && tbTransitionList.size() > 0) { if (redisCache.hasKey(cardId + cusId)) { redisCache.deleteObject(cardId + cusId); @@ -1450,11 +1452,11 @@ private List<Map<String, Object>> getMaps(String cusId, String cardId) { List<TbTransition> transitionList = null; - if (redisCache.hasKey(cardId + cusId)) { - transitionList = redisCache.getCacheList(cardId + cusId); - } else { +// if (redisCache.hasKey(cardId + cusId)) { +// transitionList = redisCache.getCacheList(cardId + cusId); +// } else { transitionList = transitionService.getTbTransitionListByCusId(cusId, cardId); - } +// } if (null == transitionList) return null; Map<Long, List<TbTransition>> collect = transitionList.stream().collect(Collectors.groupingBy(TbTransition::getParentProId)); List<Map<String, Object>> list = new ArrayList<>(); @@ -1712,7 +1714,7 @@ tjOrderDetailService.saveTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId())); tjOrderDetailService.saveTjPureToneTesByCusId(tjCustomer.getCusIdcard(), tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId())); //淇敼姣忛」鐨勫師浠风幇浠� //淇敼涓存椂琛ㄤ綋妫�鍙� - transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(), discount, tjOrder.getTjNumber()); +// transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(), discount, tjOrder.getTjNumber()); //娣诲姞remark琛ㄦ暟鎹� remarkService.saveTjOrderRemarkByOrderId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjOrder.getOrderId())); //鍒ゆ柇鏄惁浜ら挶 -- Gitblit v1.8.0