ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -2153,9 +2153,11 @@ transitionService.saveRedisTransitionByPacId(cusId, cardId, pacId); //补差价 List<Map<String, Object>> cjMaps = groupingProService.huoquxiangmuchajia(pacId.toString(), cusId); List<Map<String, Object>> cjMaps = transitionService.addTbhuoquxiangmuchajia(pacId.toString(), cusId); if (null != cjMaps && !cjMaps.isEmpty()) { log.info("该套餐"+pacId+"中有差价:"+cjMaps.size()+"个"); for (Map<String, Object> cjMap : cjMaps) { log.info("添加临时表套餐数据时所选的差价为:"+ cjMap.get("cj").toString()); transitionService.buxiangmuchajia(cusId, pacId.toString(), cjMap.get("xmid").toString(), new BigDecimal(cjMap.get("cj").toString())); } } @@ -4005,10 +4007,7 @@ log.info("前端传递的价格：{}",yhj.toString()); BigDecimal cj = yhj.subtract(dxzj); log.info("计算的差价：{}",cj.toString()); // int index1 = 0; for (TbTransition transition : list) { // BigDecimal ordPrice = transition.getOrdPrice(); // BigDecimal multiply = ordPrice.multiply((new BigDecimal(dto.getDiscount()).divide(BigDecimal.valueOf(10)))); BigDecimal result = transition.getNowPrice().add(cj); log.info("补上差价前的价格为：{}",transition.getNowPrice().toString()); if (result.compareTo(BigDecimal.ZERO)>0 && !flag && cj.compareTo(BigDecimal.ZERO) != 0){ @@ -4018,61 +4017,7 @@ flag = true; break; } // if (index1 == 0 ){ // log.info("修改小项 {}{} 原本价格:{}",transition.getProId(),transition.getProName(),multiply.toString()); // multiply = multiply.add(cj); // log.info("增加差价后：{}",multiply.toString()); // } // index1++; // log.info("后端计算的金额: " + multiply.toString()); //// log.info("前端传递的金额: " + dto.getYhj()); // transition.setNowPrice(multiply); // transition.setDiscount(new BigDecimal(dto.getDiscount())); // transitionService.updateById(transition); } // log.info("dxzj:{}",dxzj.toString()); // if (index == dtos.size()){ // BigDecimal yhj = dto.getYhj(); // log.info("前端传递的价格：{}",yhj.toString()); // BigDecimal cj = yhj.subtract(dxzj); // log.info("计算的差价：{}",cj.toString()); // int index1 = 0; // for (TbTransition transition : list) { // BigDecimal ordPrice = transition.getOrdPrice(); // BigDecimal multiply = ordPrice.multiply((new BigDecimal(dto.getDiscount()).divide(BigDecimal.valueOf(10)))); // if (index1 == 0 ){ // log.info("修改小项 {}{} 原本价格:{}",transition.getProId(),transition.getProName(),multiply.toString()); // multiply = multiply.add(cj); // log.info("增加差价后：{}",multiply.toString()); // } // index1++; // log.info("后端计算的金额: " + multiply.toString()); //// log.info("前端传递的金额: " + dto.getYhj()); // transition.setNowPrice(multiply); // transition.setDiscount(new BigDecimal(dto.getDiscount())); // transitionService.updateById(transition); // } // }else { // for (TbTransition transition : list) { // BigDecimal ordPrice = transition.getOrdPrice(); // BigDecimal multiply = ordPrice.multiply((new BigDecimal(dto.getDiscount()).divide(BigDecimal.valueOf(10)))); // log.info("后端计算的金额: " + multiply.toString()); //// log.info("前端传递的金额: " + dto.getYhj()); // transition.setNowPrice(multiply); // transition.setDiscount(new BigDecimal(dto.getDiscount())); // transitionService.updateById(transition); // } //// if (null != dto.getYhj() && dto.getYhj().compareTo(BigDecimal.ZERO) >= 0) { //// List<TbTransition> transitionList = list.stream().filter(a -> //// transitionService.getTbTransitionPriceAndOrdPrice(dto.getCusIdCard(), dto.getParentProId()).subtract(dto.getYhj()).compareTo(BigDecimal.ZERO) >= 0).collect(Collectors.toList()); //// if (!transitionList.isEmpty()) { //// TbTransition tbTransition = transitionList.get(0); //// tbTransition.setNowPrice(dxzj); //// transitionService.updateById(tbTransition); //// } //// } // } } } } ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjPackageController.java
@@ -276,7 +276,7 @@ } private void getTjPackageList(List<TjPackage> tjPackageList) { if (null != tjPackageList && tjPackageList.size() > 0) { if (null != tjPackageList && !tjPackageList.isEmpty()) { for (TjPackage aPackage : tjPackageList) { List<TjProject> tjProjectList = new ArrayList<>(); List<TjPackageProject> pplist = ppservice.getTjPackageProjectListByPacId(String.valueOf(aPackage.getPacId())); ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java
@@ -8,6 +8,7 @@ import java.math.BigDecimal; import java.util.Date; import java.util.List; import java.util.Map; /** * 过渡Mapper接口 @@ -389,4 +390,12 @@ @Select("SELECT SUM(a.now_price) FROM tb_transition a WHERE a.cus_id=#{tjNum} and isnull(a.tj_num)") BigDecimal sumTbTransitionNowPriceByTjNumIsNull(@Param("tjNum")String tjNum); @Select("SELECT aa.parent_pro_id xmid,(g.price_now-aa.ys)cj FROM tj_package_project g JOIN (\n" + " SELECT a.parent_pro_id,SUM(a.now_price)ys FROM tb_transition a WHERE a.cus_id=#{cusIdCard} " + " AND pac_id=#{pacId} AND ISNULL(a.tj_num) GROUP BY a.parent_pro_id)aa\n" + "ON\n" + "trim(g.pro_id)=trim(aa.parent_pro_id ) where g.pac_id=#{pacId} AND (g.price_now-aa.ys)>0;") List<Map<String,Object>> addTbhuoquxiangmuchajia(@Param("pacId") String pacId, @Param("cusIdCard") String cusIdCard); } ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjPackageMapper.java
@@ -86,7 +86,7 @@ @Select("SELECT GROUP_CONCAT(b.pro_name ) AS names FROM tj_package_project a LEFT JOIN tj_project b ON a.pro_id=b.pro_id WHERE a.pac_id=#{pacId}") String getTjPacProNames(String pacId); @Select("SELECT a.pac_id,a.pac_name,a.price,GROUP_CONCAT(distinct c.pro_name SEPARATOR ',') AS allProName\n" + @Select("SELECT a.pac_id,a.pac_name,a.new_price price,GROUP_CONCAT(distinct c.pro_name SEPARATOR ',') AS allProName\n" + "FROM tj_package a\n" + "left JOIN tj_package_project b\n" + "ON a.pac_id=b.pac_id\n" + @@ -97,7 +97,7 @@ "ORDER BY a.sort;\n") List<TjPackage> getPacListBySqlAndMan(String pacName); @Select("SELECT a.pac_id,a.pac_name,a.price,GROUP_CONCAT(distinct c.pro_name SEPARATOR ',') AS allProName\n" + @Select("SELECT a.pac_id,a.pac_name,a.new_price price,GROUP_CONCAT(distinct c.pro_name SEPARATOR ',') AS allProName\n" + "FROM tj_package a\n" + "left JOIN tj_package_project b\n" + "ON a.pac_id=b.pac_id\n" + @@ -110,7 +110,7 @@ @Select(" SELECT a.pac_id,a.pac_name,a.price,GROUP_CONCAT(distinct c.pro_name SEPARATOR ',') AS allProName\n" + @Select(" SELECT a.pac_id,a.pac_name,a.new_price price,GROUP_CONCAT(distinct c.pro_name SEPARATOR ',') AS allProName\n" + " FROM tj_package a\n" + " left JOIN tj_package_project b\n" + " ON a.pac_id=b.pac_id\n" + ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITbTransitionService.java
@@ -8,6 +8,7 @@ import java.math.BigDecimal; import java.util.Date; import java.util.List; import java.util.Map; /** * 过渡Service接口 @@ -144,6 +145,8 @@ TbTransition getOnwTbTransition(String idCard,String tjNumber); List<Map<String,Object>> addTbhuoquxiangmuchajia(String groupingId, String cusIdCard); void buxiangmuchajia(String idCard,String pacId,String proId,BigDecimal cj);
@@ -12,6 +12,7 @@ import java.util.Collections; import java.util.Date; import java.util.List; import java.util.Map; /** @@ -244,6 +245,12 @@ } @Override public List<Map<String,Object>> addTbhuoquxiangmuchajia(String groupingId, String cusIdCard) { return tbTransitionMapper.addTbhuoquxiangmuchajia(groupingId,cusIdCard); } @Override public void buxiangmuchajia(String idCard, String pacId,String proId, BigDecimal cj) { tbTransitionMapper.buxiangmuchajia( idCard, pacId,proId, cj); }
