java/HongRuiTang.git

			@@ -19,6 +19,9 @@

			@ApiModelProperty(value = "用户优惠券id")
			private Long memberCouponId;

			@ApiModelProperty(value = "优惠券id")
			private Long couponId;

			@ApiModelProperty(value = "优惠券名称")
			private String couponName;

			@@ -170,6 +170,7 @@
			<select id="pageAppUserGetCoupon" resultType="com.ruoyi.member.domain.vo.AppMemberCouponPageVo">
			SELECT
			tuc.id memberCouponId,
			tuc.coupon_id couponId,
			tuc.coupon_type couponType,
			tuc.coupon_name couponName,
			tuc.money_threshold moneyThreshold,

			@@ -19,6 +19,7 @@
			import com.ruoyi.system.api.domain.dto.AppointmentTimeDto;
			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.Shop;
			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;
			@@ -96,6 +97,11 @@
			if (null != one) {
			return R.fail("不能重复预约");
			}
			Shop shop = shopService.getById(dto.getShopId());
			if(0 == shop.getSubscribe()){
			return R.fail("该门店暂未开放预约");
			}

			Long userId = SecurityUtils.getUserId();
			one = new TShopAppointableTime();
			one.setId(IdUtils.fastSimpleUUID());

	ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppMemberCouponPageVo.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/MemberCouponMapper.xml	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/miniapp/AppHomeController.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史