java/HongRuiTang.git

			@@ -115,8 +115,10 @@
			vo.setDiscountMoney(coupon.getDiscountMoney());
			vo.setValidType(coupon.getValidTimeType());
			vo.setValidDays(coupon.getValidDay());
			vo.setValidStartTime(sdf.format(coupon.getValidStartTime()));
			vo.setValidEndTime(sdf.format(coupon.getValidEndTime()));
			if (2 != coupon.getValidTimeType()) {
			vo.setValidStartTime(sdf.format(coupon.getValidStartTime()));
			vo.setValidEndTime(sdf.format(coupon.getValidEndTime()));
			}
			vo.setPropagandaPoster(coupon.getPropagandaPoster());
			vo.setUseGoods("");
			//构建特定商品数据

			@@ -91,14 +91,14 @@
			@ApiOperation(value = "门店详情预约操作【2.0】")
			public R appointmentTime(@RequestBody AppointmentTimeDto dto) {
			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() + "'"));
			.last(" and DATE_FORMAT(appointable_time, '%Y-%m-%d %H:%i:%s') = '" + dto.getTime() + "'"));
			if (null != one) {
			return R.fail("不能重复预约");
			}
			Long userId = SecurityUtils.getUserId();
			one = new TShopAppointableTime();
			one.setShopId(dto.getShopId());
			one.setAppointmentTime(LocalDateTime.parse(dto.getTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm")));
			one.setAppointmentTime(LocalDateTime.parse(dto.getTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
			one.setUserId(userId);
			one.setStatus(1);
			one.setCreateTime(LocalDateTime.now());

	ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppCouponController.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/miniapp/AppHomeController.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史