productDev/parkBike.git

			@@ -61,10 +61,10 @@


			@ApiModelProperty(value = "还车站点编码")
			@ExcelColumn(name="归还站点",index = 7,width = 10,align = HorizontalAlignment.CENTER)
			// @ExcelColumn(name="归还站点",index = 7,width = 10,align = HorizontalAlignment.CENTER)
			private String backSiteId;

			@ApiModelProperty(value = "还车锁头编码")
			@ExcelColumn(name="归还锁具",index = 8,width = 10,align = HorizontalAlignment.CENTER)
			// @ExcelColumn(name="归还锁具",index = 8,width = 10,align = HorizontalAlignment.CENTER)
			private String backLockId;
			}

			@@ -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());
			@@ -409,7 +409,7 @@
			Goodsorder update = new Goodsorder();
			update.setId(goodsorder.getId());
			update.setStatus(Constants.GOODSORDER_STATUS.CLOSE.getKey());
			update.setCloseMoney(goodsorder.getMoney());
			update.setCloseMoney(closeMoney);
			update.setCloseDate(new Date());
			update.setCloseInfo(Constants.REFUND_TYPE.get(type).getInfo());
			update.setCloseUserId(goodsorder.getEditor());

	server/services/src/main/java/com/doumee/dao/business/web/response/MemberRidesDTO.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史