ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
@@ -608,6 +608,7 @@ one.setType(1); remarkService.updateById(one); } asyncService.updateCheckType(orderRemark.getTjNumber()); return AjaxResult.success("操作成功"); } asyncService.updateCheckType(orderRemark.getTjNumber()); ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
@@ -539,18 +539,23 @@ if (null != tjProjectList && tjProjectList.size() > 0) { for (TjProject project : tjProjectList) { if (project.getProParentId() == 0) { LambdaQueryWrapper<TbTransition> wqq1 = new LambdaQueryWrapper<>(); wqq1.eq(TbTransition::getCusId, customerService.getById(order.getUserId()).getCusIdcard()); wqq1.eq(TbTransition::getParentProId, project.getProId()); List<TbTransition> tbTransitionList = transitionService.list(wqq1); BigDecimal bigDecimal = new BigDecimal("0.00"); BigDecimal bigDecimal1 = new BigDecimal("0.00"); for (TbTransition transition : tbTransitionList) { bigDecimal = bigDecimal.add(transition.getNowPrice()); bigDecimal1=bigDecimal1.add(transition.getOrdPrice()); } project.setProPrice(bigDecimal.setScale(0,BigDecimal.ROUND_UP)); project.setProOrdPrice(bigDecimal1); // LambdaQueryWrapper<TbTransition> wqq1 = new LambdaQueryWrapper<>(); // wqq1.eq(TbTransition::getCusId, customerService.getById(order.getUserId()).getCusIdcard()); // wqq1.eq(TbTransition::getParentProId, project.getProId()); // List<TbTransition> tbTransitionList = transitionService.list(wqq1); // BigDecimal bigDecimal = new BigDecimal("0.00"); // BigDecimal bigDecimal1 = new BigDecimal("0.00"); // for (TbTransition transition : tbTransitionList) { // bigDecimal = bigDecimal.add(transition.getNowPrice()); // bigDecimal1=bigDecimal1.add(transition.getOrdPrice()); // } // project.setProPrice(bigDecimal.setScale(0,BigDecimal.ROUND_UP)); // project.setProOrdPrice(bigDecimal1); BigDecimal decimal = transitionService.getTbTransitionPriceAndOrdPrice(customerService.getById(order.getUserId()).getCusIdcard(), project.getProId()); String s = tjFlowingWaterService.getDiscount(OrderId); project.setProPrice(decimal.setScale(2)); project.setProOrdPrice(decimal.multiply(BigDecimal.valueOf(Long.parseLong(s))).setScale(2)); } } } ltkj-admin/src/test/java/zjhTest.java
@@ -48,26 +48,8 @@ @Test public void test() { // util.setDataBase(1); // stringRedisTemplate.opsForValue().set("1","1"); // ExecutorService pool = Executors.newFixedThreadPool(5); // // for (int i = 1; i < 6; i++) { // int finalI = i; // pool.execute(new Runnable() { // @Override // public void run() { // try { // redisCache.setDataBase(finalI); // redisCache.setCacheObject("测试",finalI+"111111111111111111"); // } catch (Exception e) { // e.printStackTrace(); // } // pool.shutdown(); // } // }); // } log.info("嘿嘿!!!"); // redisCache.setCacheObject("赵佳豪","hahahahaha"); // log.info("嘿嘿!!!"); }
@@ -196,4 +196,14 @@ "\tLEFT JOIN tj_project c ON c.pro_parent_id=b.pro_id\n" + "WHERE 1=1 AND a.grouping_id =#{groupingId} ") boolean saveTemoTransitionByGroupingId(@Param("cusId")String cusId,@Param("groupingId")String groupingId); @Select("SELECT b.price_now FROM \n" + "(SELECT a.pac_id FROM tb_transition a WHERE\n" + "\ta.cus_id = #{cusId} \n" + "GROUP BY\n" + "\ta.pac_id) aa \n" + "LEFT JOIN tj_package_project b\n" + "\tON aa.pac_id=b.pac_id WHERE b.pro_id=#{proId} ") BigDecimal getTbTransitionPriceAndOrdPrice(@Param("cusId")String cusId,@Param("proId")Long proId); } ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjFlowingWaterMapper.java
@@ -69,4 +69,7 @@ "\n" + " tj_flowing_water b ON a.order_id = b.order_id WHERE a.tj_number =#{tjNum} AND a.deleted='0' AND b.deleted='0'") List<String> getFlowingWaterIds(String tjNum); @Select("\tSELECT a.discount/10 FROM tj_flowing_water a WHERE 1=1 AND a.deleted =0 AND a.order_id=#{orderId} AND a.discount !='/'") String getDiscount(String orderId); } ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITbTransitionService.java
@@ -99,4 +99,6 @@ void saveRedisTransitionByProId(String cusId, Long proId); boolean saveTemoTransitionByGroupingId(String cusId,String groupingId); BigDecimal getTbTransitionPriceAndOrdPrice(String cusId,Long proId); } ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjFlowingWaterService.java
@@ -62,4 +62,6 @@ public int deleteTjFlowingWaterById(String id); List<String> getFlowingWaterIds(String tjNum); String getDiscount(String orderId); } ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TbTransitionServiceImpl.java
@@ -150,4 +150,9 @@ public boolean saveTemoTransitionByGroupingId(String cusId,String groupingId) { return tbTransitionMapper.saveTemoTransitionByGroupingId(cusId,groupingId); } @Override public BigDecimal getTbTransitionPriceAndOrdPrice(String cusId, Long proId) { return tbTransitionMapper.getTbTransitionPriceAndOrdPrice(cusId,proId); } } ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjFlowingWaterServiceImpl.java
@@ -97,4 +97,9 @@ public List<String> getFlowingWaterIds(String tjNum) { return tjFlowingWaterMapper.getFlowingWaterIds(tjNum); } @Override public String getDiscount(String orderId) { return tjFlowingWaterMapper.getDiscount(orderId); } }
