productDev/parkBike.git

			@@ -254,7 +254,7 @@
			systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.PROJECTS).getCode() ;
			homeResponse.setParkName(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.PROJECT_NAME).getCode());
			homeResponse.setServerPhone(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.SERVER_PHONE).getCode());
			homeResponse.setLeaseNoticeUrl(fullPath + systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.LEASE_NOTICE_URL).getCode());
			homeResponse.setLeaseNoticeUrl(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.LEASE_NOTICE_URL).getCode());
			homeResponse.setLeaseNotice(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.LEASE_NOTICE).getCode());
			homeResponse.setDeposit(new BigDecimal(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.RENT_DEPOSIT).getCode()).multiply(BigDecimal.valueOf(100)));
			homeResponse.setTips(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.TIPS).getCode());
			@@ -343,12 +343,13 @@
			if (!CollectionUtils.isEmpty(refunds)){
			refunds.forEach(s->{
			PayOrderDTO refundOrderDTO = new PayOrderDTO();
			refundOrderDTO.setOrderCode(s.getCode());
			refundOrderDTO.setOrderCode(s.getObjId());
			refundOrderDTO.setId(s.getId());
			refundOrderDTO.setPayWay(s.getPayWay());
			refundOrderDTO.setRefundType(s.getType());
			refundOrderDTO.setMoney(Constants.translateMoney(s.getMoney()));
			refundOrderDTO.setPayDate(s.getDoneDate());
			refundOrderDTO.setOnlineorderId(s.getOnlineOrderid());
			payOrderDTOList.add(refundOrderDTO);
			});
			}
			@@ -408,8 +409,8 @@
			Goodsorder update = new Goodsorder();
			update.setId(goodsorder.getId());
			update.setStatus(Constants.GOODSORDER_STATUS.CLOSE.getKey());
			update.setCloseMoney(goodsorder.getMoney());
			update.setCloseDate(goodsorder.getEndDate());
			update.setCloseMoney(closeMoney);
			update.setCloseDate(new Date());
			update.setCloseInfo(Constants.REFUND_TYPE.get(type).getInfo());
			update.setCloseUserId(goodsorder.getEditor());
			if(Constants.REFUND_TYPE.PLAT_FORCE.getKey() == type){
			@@ -549,11 +550,11 @@
			wrapper.select("sum(money) as money").last(" limit 1");
			Refund total = refundMapper.selectOne(wrapper);
			GoodsorderCanBanlanceDTO goodsorderCanBanlanceDTO = new GoodsorderCanBanlanceDTO();
			goodsorderCanBanlanceDTO.setGoodsorderMoney(goodsorder.getMoney());
			goodsorderCanBanlanceDTO.setCloseMoney(goodsorder.getCloseMoney());
			goodsorderCanBanlanceDTO.setGoodsorderMoney( Constants.translateMoney(goodsorder.getMoney()));
			goodsorderCanBanlanceDTO.setCloseMoney(Constants.translateMoney(goodsorder.getCloseMoney()));
			BigDecimal reduce = total!=null?Constants.formatDecimalNum(total.getMoney()):new BigDecimal(0);
			goodsorderCanBanlanceDTO.setHasRefundMoney(reduce);
			goodsorderCanBanlanceDTO.setCanBanlanceMoney(Constants.formatDecimalNum(goodsorder.getMoney()).subtract(goodsorderCanBanlanceDTO.getHasRefundMoney()));
			goodsorderCanBanlanceDTO.setHasRefundMoney(Constants.translateMoney(reduce));
			goodsorderCanBanlanceDTO.setCanBanlanceMoney(Constants.translateMoney(goodsorder.getMoney()).subtract(goodsorderCanBanlanceDTO.getHasRefundMoney()));
			return goodsorderCanBanlanceDTO;
			}