productDev/parkBike.git

			@@ -87,10 +87,14 @@
			@ApiModelProperty(value = "最近租借时间")
			@ExcelColumn(name="最近租借时间")
			//@JsonFormat(pattern = "yyyy-MM-dd")
			private Date lastRentData;
			private Date lastRentDate;
			@ApiModelProperty(value = "最近还车时间")
			@ExcelColumn(name="最近还车时间")
			//@JsonFormat(pattern = "yyyy-MM-dd")
			private Date lastBackDate;

			@ApiModelProperty(value = "出售时间")
			@ExcelColumn(name="出售时间")
			@ExcelColumn(name="")
			//@JsonFormat(pattern = "yyyy-MM-dd")
			private Date soldoutDate;

			@@ -156,9 +156,9 @@
			if (pageWrap.getModel().getLockId() != null) {
			queryWrapper.lambda().eq(Bikes::getLockId, pageWrap.getModel().getLockId());
			}
			if (pageWrap.getModel().getLastRentData() != null) {
			queryWrapper.lambda().ge(Bikes::getLastRentData, Utils.Date.getStart(pageWrap.getModel().getLastRentData()));
			queryWrapper.lambda().le(Bikes::getLastRentData, Utils.Date.getEnd(pageWrap.getModel().getLastRentData()));
			if (pageWrap.getModel().getLastRentDate() != null) {
			queryWrapper.lambda().ge(Bikes::getLastRentDate, Utils.Date.getStart(pageWrap.getModel().getLastRentDate()));
			queryWrapper.lambda().le(Bikes::getLastRentDate, Utils.Date.getEnd(pageWrap.getModel().getLastRentDate()));
			}
			if (pageWrap.getModel().getSoldoutDate() != null) {
			queryWrapper.lambda().ge(Bikes::getSoldoutDate, Utils.Date.getStart(pageWrap.getModel().getSoldoutDate()));

			@@ -352,6 +352,21 @@
			//修改后
			String after = JSONObject.toJSONString(update);

			//插入虚拟锁头和站点上-------
			Bikes bike = new Bikes();
			bike.setIsdeleted(Constants.ZERO);
			bike.setCode(model.getBikeCode());
			bike.setSiteId(update.getBackSiteId());
			bike.setLockId(update.getBackLockId());
			if(bikesMapper.selectCount(new QueryWrapper<>(bike)) == 0){
			bike.setId(Constants.getUUID());
			bike.setParamId(model.getParamId());
			bike.setLastBackDate(model.getRentDate());
			bike.setStatus(Constants.ZERO);
			bike.setInfo("强制还车绑定");
			bikesMapper.insert(bike);
			}

			ActionLog log = new ActionLog();
			log.setId(Constants.getUUID());
			log.setIsdeleted(Constants.ZERO);
			@@ -651,13 +666,10 @@
			//进行
			dealMemberRidesBack(memberRides,bikes);
			}

			return 0;

			}

			private void dealMemberRidesBack(MemberRides memberRides,MemberRides param) {

			int freeTime = 0;
			try {
			freeTime = Integer.parseInt(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME, Constants.FREE_RENT_TIME).getCode());
			@@ -675,6 +687,20 @@
			update.setDuration(duration>0?duration:0);
			update.setBackType(Constants.ONE);
			update.setBackInfo("用户正常还车");

			Bikes bikes = new Bikes();
			bikes.setSiteId(memberRides.getBackSiteId());
			bikes.setLockId(memberRides.getBackLockId());
			// bikes.setCode(memberRides.getBikeCode());
			bikes = bikesMapper.selectById(new QueryWrapper<>(bikes).last("limit 1"));
			if(bikes != null ) {
			UpdateWrapper<Bikes> updateWrapper = new UpdateWrapper<>();
			updateWrapper.lambda().set(Bikes::getId, bikes.getId());
			updateWrapper.lambda().set(Bikes::getEditDate,new Date());
			updateWrapper.lambda().set(Bikes::getLastBackDate,new Date());
			//更新自行车最后还车时间
			bikesMapper.updateById(bikes);
			}
			//更新还车记录为已还车
			memberRidesMapper.updateById(update);
			}

	server/services/src/main/java/com/doumee/dao/business/model/Bikes.java	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java	32 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史