ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/shop/TShopAppointableTime.java
File was renamed from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/shop/ShopAppointableTime.java @@ -14,7 +14,7 @@ */ @Data @TableName public class ShopAppointableTime { public class TShopAppointableTime { /** * 主键 */ ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java
@@ -13,8 +13,8 @@ import com.ruoyi.system.api.domain.dto.MerEditUserDto; import com.ruoyi.system.api.domain.dto.MerPageDto; import com.ruoyi.system.api.domain.poji.shop.Shop; import com.ruoyi.system.api.domain.poji.shop.ShopAppointableTime; import com.ruoyi.system.api.domain.poji.shop.ShopNonAppointableTime; import com.ruoyi.system.api.domain.poji.shop.TShopAppointableTime; import com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo; import com.ruoyi.system.api.domain.vo.MerStaffInfoVo; import com.ruoyi.system.api.domain.vo.MgtSimpleShopVo; @@ -258,7 +258,7 @@ @RequestMapping(value = "/confirmReservation/{id}", method = RequestMethod.POST) @ApiOperation(value = "商户确认预约【2.0】") public R confirmReservation(@PathVariable("id") String id) { ShopAppointableTime shopAppointableTime = shopAppointableTimeService.getById(id); TShopAppointableTime shopAppointableTime = shopAppointableTimeService.getById(id); if (null == shopAppointableTime) { return R.fail("预约不存在"); } @@ -274,7 +274,7 @@ @RequestMapping(value = "/cancelReservation", method = RequestMethod.POST) @ApiOperation(value = "商户取消预约【2.0】") public R cancelReservation(@RequestBody CancelReservationDto dto) { ShopAppointableTime shopAppointableTime = shopAppointableTimeService.getById(dto.getId()); TShopAppointableTime shopAppointableTime = shopAppointableTimeService.getById(dto.getId()); if (null == shopAppointableTime) { return R.fail("预约不存在"); } ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/miniapp/AppHomeController.java
@@ -18,7 +18,6 @@ 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.ShopAppointableTime; import com.ruoyi.system.api.domain.poji.shop.ShopNonAppointableTime; import com.ruoyi.system.api.service.RemoteMemberService; import io.swagger.annotations.Api; ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/shop/ShopAppointableTimeMapper.java
@@ -5,7 +5,7 @@ import com.ruoyi.shop.domain.dto.ShopAppointableTimeListDto; import com.ruoyi.shop.domain.vo.MyAppointmentListVo; import com.ruoyi.shop.domain.vo.ShopAppointableTimeListVo; import com.ruoyi.system.api.domain.poji.shop.ShopAppointableTime; import com.ruoyi.system.api.domain.poji.shop.TShopAppointableTime; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -14,7 +14,7 @@ * @author zhibing.pu * @Date 2025/5/26 15:13 */ public interface ShopAppointableTimeMapper extends BaseMapper<ShopAppointableTime> { public interface ShopAppointableTimeMapper extends BaseMapper<TShopAppointableTime> { /** @@ -35,7 +35,7 @@ * @param dto * @return */ List<ShopAppointableTime> getShopAppointableTimeList(Page<ShopAppointableTimeListVo> page, @Param("item") ShopAppointableTimeListDto dto); List<TShopAppointableTime> getShopAppointableTimeList(Page<ShopAppointableTimeListVo> page, @Param("item") ShopAppointableTimeListDto dto); /** ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopAppointableTimeServiceImpl.java
@@ -10,7 +10,7 @@ import com.ruoyi.shop.mapper.shop.ShopAppointableTimeMapper; import com.ruoyi.shop.service.shop.ShopAppointableTimeService; import com.ruoyi.system.api.domain.poji.member.Member; import com.ruoyi.system.api.domain.poji.shop.ShopAppointableTime; import com.ruoyi.system.api.domain.poji.shop.TShopAppointableTime; import com.ruoyi.system.api.service.RemoteMemberService; import org.springframework.stereotype.Service; @@ -23,7 +23,7 @@ * @Date 2025/5/26 15:15 */ @Service public class ShopAppointableTimeServiceImpl extends ServiceImpl<ShopAppointableTimeMapper, ShopAppointableTime> implements ShopAppointableTimeService { public class ShopAppointableTimeServiceImpl extends ServiceImpl<ShopAppointableTimeMapper, TShopAppointableTime> implements ShopAppointableTimeService { @Resource private RemoteMemberService remoteMemberService; @@ -52,7 +52,7 @@ */ @Override public List<ShopAppointableTimeListVo> getShopAppointableTimeList(Page<ShopAppointableTimeListVo> page, ShopAppointableTimeListDto dto) { List<ShopAppointableTime> shopAppointableTimeList = this.baseMapper.getShopAppointableTimeList(page, dto); List<TShopAppointableTime> shopAppointableTimeList = this.baseMapper.getShopAppointableTimeList(page, dto); List<ShopAppointableTimeListVo> list = new ArrayList<>(); shopAppointableTimeList.forEach(shopAppointableTime -> { ShopAppointableTimeListVo shopAppointableTimeListVo = new ShopAppointableTimeListVo(); ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
@@ -26,7 +26,6 @@ import com.ruoyi.shop.domain.pojo.task.ShopFile; import com.ruoyi.shop.domain.pojo.task.ShopTask; import com.ruoyi.shop.domain.vo.*; import com.ruoyi.shop.domain.vo.MgtShopPageVo; import com.ruoyi.shop.enums.WxApplyMentStateEnum; import com.ruoyi.shop.mapper.shop.ShopMapper; import com.ruoyi.shop.service.shop.*; @@ -45,7 +44,6 @@ 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.ShopAppointableTime; import com.ruoyi.system.api.domain.poji.sys.SysUser; import com.ruoyi.system.api.domain.vo.*; import com.ruoyi.system.api.service.*; ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopAppointableTimeService.java
@@ -6,7 +6,7 @@ import com.ruoyi.shop.domain.dto.ShopAppointableTimeListDto; import com.ruoyi.shop.domain.vo.MyAppointmentListVo; import com.ruoyi.shop.domain.vo.ShopAppointableTimeListVo; import com.ruoyi.system.api.domain.poji.shop.ShopAppointableTime; import com.ruoyi.system.api.domain.poji.shop.TShopAppointableTime; import java.util.List; @@ -14,7 +14,7 @@ * @author zhibing.pu * @Date 2025/5/26 15:14 */ public interface ShopAppointableTimeService extends IService<ShopAppointableTime> { public interface ShopAppointableTimeService extends IService<TShopAppointableTime> { /**
