From 8c4968ea3bd61c154c71d40f43a2cc22760fef49 Mon Sep 17 00:00:00 2001 From: zjh <1084500556@qq.com> Date: 星期三, 25 十月 2023 18:29:54 +0800 Subject: [PATCH] zjh 2023/10/25--1 --- ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 302 ++++++++++++++++++++++++++++--------------------- 1 files changed, 172 insertions(+), 130 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 1cd9cdd..a6cf3b9 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 @@ -15,6 +15,7 @@ import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import cn.hutool.crypto.symmetric.DES; +import cn.hutool.extra.pinyin.PinyinUtil; import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -499,7 +500,9 @@ order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday())); order.setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName())); order.setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone())); - order.setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard())); + if (tjCustomer.getCusIdcard() != null) { + order.setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard())); + } } String firmId = order.getFirmId(); if (firmId != null && null != iDictCompService.getById(String.valueOf(order.getFirmId()))) { @@ -561,8 +564,10 @@ order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday())); order.setGrMoBanId(reportService.getGrMoBanIds()); order.setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName())); - order.setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone())); - order.setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard())); + if (null != tjCustomer.getCusPhone()) + order.setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone())); + if (null != tjCustomer.getCusIdcard()) + order.setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard())); } String firmId = order.getFirmId(); if (firmId != null && null != iDictCompService.getById(String.valueOf(order.getFirmId()))) { @@ -612,8 +617,10 @@ order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday())); order.setGrMoBanId(reportService.getGrMoBanIds()); order.setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName())); - order.setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone())); - order.setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard())); + if (null != tjCustomer.getCusPhone()) + order.setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone())); + if (null != tjCustomer.getCusIdcard()) + order.setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard())); } String firmId = order.getFirmId(); if (firmId != null && null != iDictCompService.getById(String.valueOf(order.getFirmId()))) { @@ -655,43 +662,21 @@ List<TjOrder> list = Optional.ofNullable(tjOrderService.list(wq)).get(); if (list.size() > 0) { - List<TjOrder> list1 = new ArrayList<>(); - for (TjOrder order : list) { - TjCustomer tjCustomer = tjCustomerService.selectTjCustomerByCusId(order.getUserId()); - if (null != tjCustomer) { - order.setTjCustomerSex(tjCustomer.getCusSex()); - order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday())); - order.setGrMoBanId(reportService.getGrMoBanIds()); - order.setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName())); - order.setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone())); - order.setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard())); + asyncService.getPrintOrderList(list); + if (redisCache.hasKey("getPrintOrderList")) { + if (null != type && type == 0) { + List<TjOrder> list1 = redisCache.getCacheMapValue("getPrintOrderList", "0"); + collect = list1.stream().skip((long) (pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList()); } - String firmId = order.getFirmId(); - if (firmId != null && null != iDictCompService.selectDictCompByDrugManufacturerId(String.valueOf(order.getFirmId()))) { - order.setDictCompName(iDictCompService.selectDictCompByDrugManufacturerId(String.valueOf(order.getFirmId())).getCnName()); + if (null != type && type == 1) { + List<TjOrder> list1 = redisCache.getCacheMapValue("getPrintOrderList", "1"); + collect = list1.stream().skip((long) (pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList()); } - if (null != order.getPacId()) { - if (null != tjPackageService.getById(order.getPacId())) { - order.setPacName(tjPackageService.getById(order.getPacId()).getPacName()); - } - if (null != dwDeptService.getById(order.getPacId())) { - order.setPacName(dwDeptService.getById(order.getPacId()).getDwDeptName()); - } - } - //浠庢墦鍗拌褰曟煡鍑烘渶鏂版墦鍗版椂闂� - TjPrintOrder one = printOrderService.getTjPrintOrderByTjNum(order.getTjNumber()); - if (null != type && type == 1 && one != null) { - order.setPrintTime(one.getCreateTime()); - order.setPrintName(one.getCreateBy()); - order.setType(1); - list1.add(order); - } - if (null != type && type == 0 && one == null) { - order.setType(0); - list1.add(order); - } + } else { + List<TjOrder> list1 = new ArrayList<>(); + extracted(type, list, list1); + collect = list1.stream().skip((long) (pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList()); } - collect = list1.stream().skip((long) (pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList()); } if (null != collect) { map.put("total", collect.size()); @@ -700,6 +685,46 @@ } map.put("list", collect); return AjaxResult.success(map); + } + + private void extracted(Integer type, List<TjOrder> list, List<TjOrder> list1) { + for (TjOrder order : list) { + TjCustomer tjCustomer = tjCustomerService.selectTjCustomerByCusId(order.getUserId()); + if (null != tjCustomer) { + order.setTjCustomerSex(tjCustomer.getCusSex()); + order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday())); + order.setGrMoBanId(reportService.getGrMoBanIds()); + order.setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName())); + if (null != tjCustomer.getCusPhone()) + order.setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone())); + if (null != tjCustomer.getCusIdcard()) + order.setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard())); + } + String firmId = order.getFirmId(); + if (firmId != null && null != iDictCompService.selectDictCompByDrugManufacturerId(String.valueOf(order.getFirmId()))) { + order.setDictCompName(iDictCompService.selectDictCompByDrugManufacturerId(String.valueOf(order.getFirmId())).getCnName()); + } + if (null != order.getPacId()) { + if (null != tjPackageService.getById(order.getPacId())) { + order.setPacName(tjPackageService.getById(order.getPacId()).getPacName()); + } + if (null != dwDeptService.getById(order.getPacId())) { + order.setPacName(dwDeptService.getById(order.getPacId()).getDwDeptName()); + } + } + //浠庢墦鍗拌褰曟煡鍑烘渶鏂版墦鍗版椂闂� + TjPrintOrder one = printOrderService.getTjPrintOrderByTjNum(order.getTjNumber()); + if (null != type && type == 1 && one != null) { + order.setPrintTime(one.getCreateTime()); + order.setPrintName(one.getCreateBy()); + order.setType(1); + list1.add(order); + } + if (null != type && type == 0 && one == null) { + order.setType(0); + list1.add(order); + } + } } @@ -726,6 +751,20 @@ public AjaxResult getInfo(@PathVariable("orderId") Long orderId) { return success(tjOrderService.selectTjOrderByOrderId(orderId)); } + + + @GetMapping("/getIsRequired") + @ApiOperation(value = "鏍规嵁鍙傛暟閰嶇疆鑾峰彇鏄惁蹇呭~椤癸紙韬唤璇併�佹�у埆銆佺數璇濄�佺収鐗囥�佹槸鍚︾洿鎺ヤ笅鍗曪級") + public AjaxResult getIsRequired() { + Map<String, String> res = new HashMap<>(); + res.put("has_idcard", configService.selectConfigByKey("has_idcard")); + res.put("has_sex", configService.selectConfigByKey("has_sex")); + res.put("is_phone", configService.selectConfigByKey("is_phone")); + res.put("mall_hasPhoto", configService.selectConfigByKey("mall_hasPhoto")); + res.put("has_charge", configService.selectConfigByKey("has_charge")); + return AjaxResult.success(res); + } + /** * 浣撴绛惧埌鐧昏鎺ュ彛 @@ -817,10 +856,8 @@ } tjFlowingWater.setOrderId(tjOrder.getOrderId()); Date date1 = new Date(System.currentTimeMillis()); - SimpleDateFormat sdf = new SimpleDateFormat("yyMMddHHmmssSSS"); - String userId1 = SecurityUtils.getUsername(); - String s1 = userId1 + sdf.format(date1); - tjFlowingWater.setWaterId(s1); + String s1 = SecurityUtils.getUsername() + new SimpleDateFormat("yyMMddHHmmssSSS").format(date1); + tjFlowingWater.setWaterId(PinyinUtil.getFirstLetter(tjCustomer.getCusName(), "") + s1); if (null != mallOrder) { if (mallOrder.getOrderStatus().equals(201L)) { tjFlowingWater.setCopeWith(mallOrder.getActualPrice()); @@ -954,7 +991,7 @@ if (null != ppList && ppList.size() > 0) { //寮傛淇濆瓨鏁版嵁搴� // asyncService.addRedisTransitionPac(cusId, pacId, ppList); - asyncService.saveRedisTransitionByPacId(cusId, pacId,proIds); + asyncService.saveRedisTransitionByPacId(cusId, pacId, null); for (TjPackageProject tjPackageProject : ppList) { TjProject project = projectService.getTjProjectById(String.valueOf(tjPackageProject.getProId())); if (null != project) { @@ -993,42 +1030,47 @@ //鍗曢」 if (null != proIds && proIds.size() > 0) { //寮傛淇濆瓨鏁版嵁搴撹〃 -// asyncService.addRedisTransitionPro(cusId, proIds); - asyncService.saveRedisTransitionByPacId(cusId,null,proIds); - + asyncService.saveRedisTransitionByPacId(cusId, null, proIds); for (Long proId : proIds) { List<TbTransition> transitions = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(proId)); if (null != transitions && transitions.size() > 0) { continue; } - TjProject project = projectService.getTjProjectById(String.valueOf(proId)); - if (null != project) { - List<TjProject> tjProSonList = projectService.getTjProjectListBySoneId(String.valueOf(project.getProId())); - if (null != tjProSonList && tjProSonList.size() > 0) { - for (TjProject tjProject : tjProSonList) { - List<TbTransition> transitionss = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(tjProject.getProId())); - if (null != transitionss && transitionss.size() > 0) { - continue; - } - TbTransition tbTransition = new TbTransition(); - tbTransition.setCusId(cusId); - tbTransition.setPacId(null); - if (null != tjProject.getProPrice()) { - tbTransition.setOrdPrice(tjProject.getProPrice()); - tbTransition.setNowPrice(tjProject.getProPrice()); - } else { - tbTransition.setOrdPrice(BigDecimal.valueOf(0.00)); - tbTransition.setNowPrice(BigDecimal.valueOf(0.00)); - } - tbTransition.setParentProId(proId); - tbTransition.setParentProName(project.getProName()); - tbTransition.setProId(tjProject.getProId()); - tbTransition.setProName(tjProject.getProName()); - tbTransition.setProType(tjProject.getProType()); - tbTransition.setProCheckMethod(tjProject.getProCheckMethod()); - tbTransitionList.add(tbTransition); + TjProject tjProject = projectService.getTjProjectById(String.valueOf(proId)); + if (null != tjProject) { +// List<TjProject> tjProSonList = projectService.getTjProjectListBySoneId(String.valueOf(project.getProId())); +// if (null != tjProSonList && tjProSonList.size() > 0) { +// for (TjProject tjProject : tjProSonList) { +// List<TbTransition> transitionss = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(tjProject.getProId())); +// if (null != transitionss && transitionss.size() > 0) { +// continue; +// } + TbTransition tbTransition = new TbTransition(); + tbTransition.setCusId(cusId); + tbTransition.setPacId(null); + if (null != tjProject.getProPrice()) { + tbTransition.setOrdPrice(tjProject.getProPrice()); + tbTransition.setNowPrice(tjProject.getProPrice()); + } else { + tbTransition.setOrdPrice(BigDecimal.valueOf(0.00)); + tbTransition.setNowPrice(BigDecimal.valueOf(0.00)); + } + tbTransition.setParentProId(tjProject.getProParentId()); + if (tjProject.getProParentId() != null) { + TjProject byId = projectService.getById(tjProject.getProParentId()); + if(null !=byId){ + tbTransition.setParentProName(byId.getProName()); } } + tbTransition.setParentProName(""); + + tbTransition.setProId(tjProject.getProId()); + tbTransition.setProName(tjProject.getProName()); + tbTransition.setProType(tjProject.getProType()); + tbTransition.setProCheckMethod(tjProject.getProCheckMethod()); + tbTransitionList.add(tbTransition); +// } +// } } } } @@ -1394,19 +1436,19 @@ for (TjReservation tjReservation : list) { final TjDwGrouping byId = dwGroupingService.getById(tjReservation.getGroupingId()); - if (byId!=null){ + if (byId != null) { tjReservation.setGroupingName(byId.getGroupingName()); } - if (tjReservation.getIsExpire()==1){ - LambdaQueryWrapper<TjCustomer> wq1=new LambdaQueryWrapper<>(); - wq1.eq(TjCustomer::getCusIdcard,tjReservation.getIdCard()); + if (tjReservation.getIsExpire() == 1) { + LambdaQueryWrapper<TjCustomer> wq1 = new LambdaQueryWrapper<>(); + wq1.eq(TjCustomer::getCusIdcard, tjReservation.getIdCard()); final TjCustomer one1 = tjCustomerService.getOne(wq1); - LambdaQueryWrapper<TjOrder> wq2=new LambdaQueryWrapper<>(); - wq2.eq(TjOrder::getUserId,one1.getCusId()); - wq2.eq(TjOrder::getTeamNo,tjReservation.getTeamNo()); + LambdaQueryWrapper<TjOrder> wq2 = new LambdaQueryWrapper<>(); + wq2.eq(TjOrder::getUserId, one1.getCusId()); + wq2.eq(TjOrder::getTeamNo, tjReservation.getTeamNo()); final TjOrder one = tjOrderService.getOne(wq2); - if (one!=null){ + if (one != null) { tjReservation.setTjNumber(one.getTjNumber()); tjReservation.setTjStatus(one.getStatus()); if (one.getStatus() == 201) { @@ -1415,17 +1457,17 @@ c += 1; } } - }else if (tjReservation.getIsExpire()==2){ + } else if (tjReservation.getIsExpire() == 2) { tjReservation.setTjStatus(0); tjReservation.setTjNumber("鏃�"); - a+=1; + a += 1; } } - map.put("list",list); - map.put("all",list.size()); - map.put("weijian",a); - map.put("jianzhong",b); - map.put("yijian",c); + map.put("list", list); + map.put("all", list.size()); + map.put("weijian", a); + map.put("jianzhong", b); + map.put("yijian", c); return AjaxResult.success(map); } @@ -1442,24 +1484,24 @@ public AjaxResult tuanTiBingById(@ApiParam(value = "鍗曚綅") @RequestParam String firmId, @ApiParam(value = "閮ㄩ棬") @RequestParam String firmDeptId, @ApiParam(value = "鐥呯") @RequestParam(required = false) String bingZhong) { - List<TjOrderDetailRules> res1=new ArrayList<>(); - List<BingZhongVO> res=new ArrayList<>(); + List<TjOrderDetailRules> res1 = new ArrayList<>(); + List<BingZhongVO> res = new ArrayList<>(); - LambdaQueryWrapper<TjDwGrouping> wqqq=new LambdaQueryWrapper<>(); - wqqq.eq(TjDwGrouping::getDwDeptId,firmDeptId); + LambdaQueryWrapper<TjDwGrouping> wqqq = new LambdaQueryWrapper<>(); + wqqq.eq(TjDwGrouping::getDwDeptId, firmDeptId); final List<TjDwGrouping> list2 = dwGroupingService.list(wqqq); for (TjDwGrouping tjDwGrouping : list2) { - LambdaQueryWrapper<TjOrder> wq2=new LambdaQueryWrapper<>(); - wq2.eq(TjOrder::getFirmId,firmId); - wq2.eq(TjOrder::getGroupId,tjDwGrouping.getId()); + LambdaQueryWrapper<TjOrder> wq2 = new LambdaQueryWrapper<>(); + wq2.eq(TjOrder::getFirmId, firmId); + wq2.eq(TjOrder::getGroupId, tjDwGrouping.getId()); final List<TjOrder> list = tjOrderService.list(wq2); for (TjOrder tjOrder : list) { - LambdaQueryWrapper<TjOrderDetailRules> wq1=new LambdaQueryWrapper<>(); - wq1.eq(TjOrderDetailRules::getTjNumber,tjOrder.getTjNumber()); - if (bingZhong!=null){ - wq1.like(TjOrderDetailRules::getBingzhong,bingZhong); + LambdaQueryWrapper<TjOrderDetailRules> wq1 = new LambdaQueryWrapper<>(); + wq1.eq(TjOrderDetailRules::getTjNumber, tjOrder.getTjNumber()); + if (bingZhong != null) { + wq1.like(TjOrderDetailRules::getBingzhong, bingZhong); } final List<TjOrderDetailRules> list1 = orderDetailRulesService.list(wq1); //鏀捐繘闆嗗悎 @@ -1472,21 +1514,21 @@ // List<String> distinctIds = idStream.collect(Collectors.toList()); Map<String, Long> columnCountMap = res1.stream().collect(Collectors.groupingBy(TjOrderDetailRules::getAid, Collectors.counting())); - for(Map.Entry<String, Long> entry:columnCountMap.entrySet()){ + for (Map.Entry<String, Long> entry : columnCountMap.entrySet()) { - BingZhongVO bingZhongVO=new BingZhongVO(); + BingZhongVO bingZhongVO = new BingZhongVO(); bingZhongVO.setRules(rulesService.getById(entry.getKey())); bingZhongVO.setNum(entry.getValue()); - List<TjOrderDetailRules> aa=new ArrayList<>(); + List<TjOrderDetailRules> aa = new ArrayList<>(); for (TjOrderDetailRules orderDetailRules : res1) { - if (orderDetailRules.getAid().equals(entry.getKey())){ + if (orderDetailRules.getAid().equals(entry.getKey())) { orderDetailRules.setDwName(dwDeptService.getById(firmDeptId).getDwName()); orderDetailRules.setDwDeptName(dwDeptService.getById(firmDeptId).getDwDeptName()); - LambdaQueryWrapper<TjOrder> wq22=new LambdaQueryWrapper<>(); - wq22.eq(TjOrder::getFirmId,firmId); - wq22.eq(TjOrder::getTjNumber,orderDetailRules.getTjNumber()); + LambdaQueryWrapper<TjOrder> wq22 = new LambdaQueryWrapper<>(); + wq22.eq(TjOrder::getFirmId, firmId); + wq22.eq(TjOrder::getTjNumber, orderDetailRules.getTjNumber()); final TjOrder one = tjOrderService.getOne(wq22); orderDetailRules.setGroupName(dwGroupingService.getById(one.getGroupId()).getGroupingName()); aa.add(orderDetailRules); @@ -1503,33 +1545,33 @@ @PostMapping("/tuanTiBingChart") @ApiOperation(value = "鏌ヨ鍥綋浣撴鐥呯缁熻鍥�") public AjaxResult tuanTiBingChart(@RequestBody BingZhongVO bingZhongVO) { - List<TjOrderDetailRules> res1=new ArrayList<>(); + List<TjOrderDetailRules> res1 = new ArrayList<>(); - LambdaQueryWrapper<TjDwGrouping> wqqq=new LambdaQueryWrapper<>(); - wqqq.eq(TjDwGrouping::getDwDeptId,bingZhongVO.getFirmDeptId()); + LambdaQueryWrapper<TjDwGrouping> wqqq = new LambdaQueryWrapper<>(); + wqqq.eq(TjDwGrouping::getDwDeptId, bingZhongVO.getFirmDeptId()); final List<TjDwGrouping> list2 = dwGroupingService.list(wqqq); for (TjDwGrouping tjDwGrouping : list2) { - LambdaQueryWrapper<TjOrder> wq2=new LambdaQueryWrapper<>(); - wq2.eq(TjOrder::getFirmId,bingZhongVO.getFirmId()); - wq2.eq(TjOrder::getGroupId,tjDwGrouping.getId()); + LambdaQueryWrapper<TjOrder> wq2 = new LambdaQueryWrapper<>(); + wq2.eq(TjOrder::getFirmId, bingZhongVO.getFirmId()); + wq2.eq(TjOrder::getGroupId, tjDwGrouping.getId()); final List<TjOrder> list = tjOrderService.list(wq2); for (TjOrder tjOrder : list) { - LambdaQueryWrapper<TjOrderDetailRules> wq1=new LambdaQueryWrapper<>(); - wq1.eq(TjOrderDetailRules::getTjNumber,tjOrder.getTjNumber()); - wq1.in(TjOrderDetailRules::getAid,bingZhongVO.getAidList()); + LambdaQueryWrapper<TjOrderDetailRules> wq1 = new LambdaQueryWrapper<>(); + wq1.eq(TjOrderDetailRules::getTjNumber, tjOrder.getTjNumber()); + wq1.in(TjOrderDetailRules::getAid, bingZhongVO.getAidList()); final List<TjOrderDetailRules> list1 = orderDetailRulesService.list(wq1); //鏀捐繘闆嗗悎 res1.addAll(list1); } } Map<String, Long> columnCountMap = res1.stream().collect(Collectors.groupingBy(TjOrderDetailRules::getAid, Collectors.counting())); - List<Map<String, String>> aaa=new ArrayList<>(); - if (columnCountMap!=null){ - for(Map.Entry<String, Long> entry:columnCountMap.entrySet()){ - Map<String, String> resMap=new HashMap<>(); + List<Map<String, String>> aaa = new ArrayList<>(); + if (columnCountMap != null) { + for (Map.Entry<String, Long> entry : columnCountMap.entrySet()) { + Map<String, String> resMap = new HashMap<>(); final TjRules byId = rulesService.getById(entry.getKey()); - if (byId!=null){ + if (byId != null) { resMap.put("name", byId.getBingzhong()); resMap.put("value", String.valueOf(entry.getValue())); aaa.add(resMap); @@ -1543,32 +1585,32 @@ @PostMapping("/deletedTbTransitionByCusId") @ApiOperation(value = "鏍规嵁韬唤璇佸彿鍒犻櫎涓存椂琛ㄦ暟鎹�") public AjaxResult deletedTbTransitionByCusId(@RequestParam @ApiParam(value = "韬唤璇佸彿") String cusId) { - LambdaQueryWrapper<TbTransition> wq=new LambdaQueryWrapper<>(); - wq.between(TbTransition::getCreateTime,transitionService.getTbTransitionCreateTimeByCusId(cusId),new Date()); - wq.eq(TbTransition::getCusId,cusId); + LambdaQueryWrapper<TbTransition> wq = new LambdaQueryWrapper<>(); + wq.between(TbTransition::getCreateTime, transitionService.getTbTransitionCreateTimeByCusId(cusId), new Date()); + wq.eq(TbTransition::getCusId, cusId); return AjaxResult.success(transitionService.remove(wq)); } public void newSaveextracted(TjOrder tjOrder, TjCustomer tjCustomer, BigDecimal discount, SysUser sysUser, TjReservation tjReservation, TjFlowingWater tjFlowingWater) { long l = System.currentTimeMillis(); - tjAskMedicalHistoryService.updateTjAskMedicalHistoryByCusId(tjOrder.getTjNumber(),sysUser.getNickName(),String.valueOf(sysUser.getUserId()), String.valueOf(tjCustomer.getCusId())); - tjOrderDetailService.saveTjOrderDetailsByCusId(tjCustomer.getCusIdcard(),String.valueOf(tjOrder.getOrderId()),sysUser.getNickName(),String.valueOf(sysUser.getUserId())); + tjAskMedicalHistoryService.updateTjAskMedicalHistoryByCusId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjCustomer.getCusId())); + tjOrderDetailService.saveTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId())); //淇敼姣忛」鐨勫師浠风幇浠� - transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(),discount); + transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(), discount); //娣诲姞remark琛ㄦ暟鎹� - remarkService.saveTjOrderRemarkByOrderId(tjOrder.getTjNumber(),sysUser.getNickName(),String.valueOf(sysUser.getUserId()), String.valueOf(tjOrder.getOrderId())); + remarkService.saveTjOrderRemarkByOrderId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjOrder.getOrderId())); //鍒ゆ柇鏄惁浜ら挶 if ("1".equals(tjOrder.getTjType())) { if (null != tjReservation && tjReservation.getPayType() == 1) { tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()), - sysUser.getNickName(), String.valueOf(sysUser.getUserId()),String.valueOf(tjFlowingWater.getTjSerialNumber())); + sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber())); } } if (tjFlowingWater.getPayStasus() == 1) { tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()), - sysUser.getNickName(), String.valueOf(sysUser.getUserId()),String.valueOf(tjFlowingWater.getTjSerialNumber())); + sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber())); } - System.out.println("杩欐浠g爜鏃堕棿"+(System.currentTimeMillis()-l)); + System.out.println("杩欐浠g爜鏃堕棿" + (System.currentTimeMillis() - l)); } } -- Gitblit v1.8.0