java/HongRuiTang.git

			@@ -19,6 +19,7 @@
			import com.ruoyi.system.api.domain.dto.ShopAppointmentTimeDto;
			import com.ruoyi.system.api.domain.poji.member.Member;
			import com.ruoyi.system.api.domain.poji.shop.ShopNonAppointableTime;
			import com.ruoyi.system.api.domain.poji.shop.TShopAppointableTime;
			import com.ruoyi.system.api.service.RemoteMemberService;
			import io.swagger.annotations.Api;
			import io.swagger.annotations.ApiOperation;
			@@ -89,13 +90,13 @@
			@RequestMapping(value = "/appointmentTime", method = RequestMethod.POST)
			@ApiOperation(value = "门店详情预约操作【2.0】")
			public R appointmentTime(@RequestBody AppointmentTimeDto dto) {
			ShopAppointableTime one = shopAppointableTimeService.getOne(new LambdaQueryWrapper<ShopAppointableTime>().eq(ShopAppointableTime::getShopId, dto.getShopId())
			TShopAppointableTime one = shopAppointableTimeService.getOne(new LambdaQueryWrapper<TShopAppointableTime>().eq(TShopAppointableTime::getShopId, dto.getShopId())
			.last(" and DATE_FORMAT(appointable_time, '%Y-%m-%d %H:%i') = '" + dto.getTime() + "'"));
			if (null != one) {
			return R.fail("不能重复预约");
			}
			Long userId = SecurityUtils.getUserId();
			one = new ShopAppointableTime();
			one = new TShopAppointableTime();
			one.setShopId(dto.getShopId());
			one.setAppointableTime(LocalDateTime.parse(dto.getTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm")));
			one.setUserId(userId);
			@@ -120,7 +121,7 @@
			@ApiOperation(value = "取消预约【2.0】")
			public R cancelAppointmentTime(@PathVariable("id") String id) {
			Long userId = SecurityUtils.getUserId();
			ShopAppointableTime one = shopAppointableTimeService.getById(id);
			TShopAppointableTime one = shopAppointableTimeService.getById(id);
			if (null == one) {
			return R.fail("预约不存在");
			}

			@@ -44,6 +44,7 @@
			import com.ruoyi.system.api.domain.poji.config.SysTag;
			import com.ruoyi.system.api.domain.poji.member.Member;
			import com.ruoyi.system.api.domain.poji.shop.Shop;
			import com.ruoyi.system.api.domain.poji.shop.TShopAppointableTime;
			import com.ruoyi.system.api.domain.poji.sys.SysUser;
			import com.ruoyi.system.api.domain.vo.*;
			import com.ruoyi.system.api.service.*;
			@@ -972,7 +973,7 @@
			merHomeShopTotalVo.setExplorationSurp(orderVo.getExplorationSurp());
			merHomeShopTotalVo.setPlatformBirthdayFlag(shop.getPlatformBirthdayFlag());
			merHomeShopTotalVo.setPlatformCouponFlag(shop.getPlatformCouponFlag());
			int unHandleReserve = shopAppointableTimeService.count(new LambdaQueryWrapper<ShopAppointableTime>().eq(ShopAppointableTime::getShopId, shopId).eq(ShopAppointableTime::getStatus, 1));
			int unHandleReserve = shopAppointableTimeService.count(new LambdaQueryWrapper<TShopAppointableTime>().eq(TShopAppointableTime::getShopId, shopId).eq(TShopAppointableTime::getStatus, 1));
			merHomeShopTotalVo.setUnHandleReserve(unHandleReserve);
			return merHomeShopTotalVo;
			}

	ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/miniapp/AppHomeController.java	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史