ltkj_peis.git - gitblit

			@@ -7,6 +7,7 @@
			import javax.servlet.http.HttpServletResponse;

			import cn.hutool.core.date.DateUtil;
			import cn.hutool.extra.pinyin.PinyinUtil;
			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.ltkj.common.core.domain.entity.SysUser;
			import com.ltkj.common.utils.SecurityUtils;
			@@ -205,7 +206,7 @@
			TjOrder order = orderService.getById(tjFlowingWater.getOrderId());
			TjCustomer customer = customerService.getById(order.getUserId());
			if (null != tjFlowingWater.getTjProIds() && tjFlowingWater.getTjProIds().length > 0) {
			tjFlowingWater.setWaterId(SecurityUtils.getUsername() + DateUtil.format(new Date(), "yyMMddHHmmssSSS"));
			tjFlowingWater.setWaterId(PinyinUtil.getFirstLetter(customer.getCusName(), "").toUpperCase() + DateUtil.format(new Date(), "yyMMddHHmmssSSS"));
			tjFlowingWater.setIsAddition("Y");
			if (tjFlowingWaterService.save(tjFlowingWater)) {
			//异步单项收费明细
			@@ -498,8 +499,12 @@
			tjRefundVo.setTjPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
			tjRefundVo.setSex(String.valueOf(customer.getCusSex()));
			tjRefundVo.setIdCard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
			if (null != order.getDictCompName())
			tjRefundVo.setTjComp(compService.getById(order.getFirmId()) != null ? compService.getById(order.getFirmId()).getCnName() : null);
			if (null != order.getFirmId()){
			DictComp byId = compService.getById(order.getFirmId());
			if(null != byId){
			tjRefundVo.setTjComp(byId.getCnName());
			}
			}
			if (null != order.getTjType()) tjRefundVo.setTjType(order.getTjType());
			TjFlowingWater one = tjFlowingWaterService.getOne(new LambdaQueryWrapper<TjFlowingWater>()
			.eq(TjFlowingWater::getOrderId, order.getOrderId())
			@@ -555,8 +560,10 @@
			project.getProId());
			String s = tjFlowingWaterService.getDiscount(OrderId);
			if(null !=decimal){
			project.setProPrice(decimal.setScale(2));
			project.setProOrdPrice(decimal.multiply(new BigDecimal(s)).setScale(2));
			// project.setProPrice(decimal.setScale(2));
			project.setProPrice(decimal);
			// project.setProOrdPrice(decimal.multiply(new BigDecimal(s)).setScale(2));
			project.setProOrdPrice(decimal);
			}else {
			BigDecimal decimal1 = transitionService.getTbTransitionDxPriceAndOrdPrice(String.valueOf(order.getUserId()),project.getProId());
			if(null !=decimal1){