diff --git a/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdAdditionalFeeDatesDO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdAdditionalFeeDatesDO.java index ae0b33a..6b3ab70 100644 --- a/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdAdditionalFeeDatesDO.java +++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdAdditionalFeeDatesDO.java @@ -43,16 +43,22 @@ public class ProdAdditionalFeeDatesDO extends BaseDO { * 日期类型0：'自定义日期范围':1：'指定日期':2：'法定节假日',3：'固定休息日' */ private Integer dateType; + /** - * 自定义日期时间段 + * 类型：1：特殊日期 2：可预约时段黑名单日期 3：紧急相应服务黑名单日期 + */ + private Integer type; + + /** + * 日期 */ @TableField(typeHandler = StringListTypeHandler.class) private List customTimeSlots; - /** +/* *//** * 指定日期 - */ + *//* @TableField(typeHandler = StringListTypeHandler.class) - private List specificDates; + private List specificDates;*/ /** * 收费方式0：''固定金额'':1：''基准价上浮 */ diff --git a/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdEmergencyResponseDO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdEmergencyResponseDO.java index 3259231..36916f4 100644 --- a/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdEmergencyResponseDO.java +++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdEmergencyResponseDO.java @@ -39,23 +39,5 @@ public class ProdEmergencyResponseDO extends BaseDO { */ @TableField(typeHandler = StringListTypeHandler.class) private List responseTimeSlots; - /** - * 黑名自定义日期 - */ - @TableField(typeHandler = StringListTypeHandler.class) - private List blacklistedDates; - /** - * 黑名单指定日期 - */ - @TableField(typeHandler = StringListTypeHandler.class) - private List blackAppointDates; - /** - * 法定节假日是否开启0:关闭1开启 - */ - private Integer blackHappy; - /** - * 固定休息日周末是否开启0关闭1开启 - */ - private Integer blackWeekend; } \ No newline at end of file diff --git a/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdReservationConfigDO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdReservationConfigDO.java index 43236ab..84c82eb 100644 --- a/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdReservationConfigDO.java +++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdReservationConfigDO.java @@ -66,37 +66,6 @@ public class ProdReservationConfigDO extends BaseDO { * 允许更改预约时间的最大次数 */ private Integer maxChangeTimes; - /** - * 黑名自定义日期 - */ - @TableField(typeHandler = StringListTypeHandler.class) - private List blacklistedDates; - - /** - * '是否开启黑名单自定义0关1开' - */ - private Integer isBlacklisted; - - /** - * '是否开启黑名单指定日期0关1开' - */ - private Integer isBlackAppoint; - - /** - * 黑名单指定日期 - */ - //private String blackAppointDates; - @TableField(typeHandler = StringListTypeHandler.class) - private List blackAppointDates; - /** - * 法定节假日是否开启0:关闭1开启 - */ - private Integer blackHappy; - /** - * 固定休息日周末是否开启0关闭1开启 - */ - private Integer blackWeekend; - /** * 预约时间区间设置 */ diff --git a/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prod/ProdServiceVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prod/ProdServiceVO.java index 06a1454..1694f0c 100644 --- a/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prod/ProdServiceVO.java +++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prod/ProdServiceVO.java @@ -2,6 +2,7 @@ package com.tashow.cloud.productapi.api.product.vo.prod; import com.fasterxml.jackson.annotation.JsonFormat; import com.tashow.cloud.productapi.api.product.vo.prodemergencyresponse.ProdEmergencyInfoVO; +import com.tashow.cloud.productapi.api.product.vo.prodreservationconfig.ProdReservationInfoVO; import com.tashow.cloud.productapi.api.product.vo.prodserviceareas.ProdServiceAreasInfoVO; import com.tashow.cloud.productapi.api.product.dto.*; import io.swagger.v3.oas.annotations.media.Schema; @@ -43,7 +44,7 @@ public class ProdServiceVO { @Schema(description = "是否预约0关1开") private Integer reservationSwitch; @Schema(description = "预约配置") - public ProdReservationConfigDO prodReservationConfig; + public ProdReservationInfoVO prodReservationConfig; @Schema(description = "是否紧急响应服务0关1开") private Integer emergencySwitch; diff --git a/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodadditionalfeedates/ProdAdditionalFeeBlackVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodadditionalfeedates/ProdAdditionalFeeBlackVO.java new file mode 100644 index 0000000..895e455 --- /dev/null +++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodadditionalfeedates/ProdAdditionalFeeBlackVO.java @@ -0,0 +1,41 @@ +package com.tashow.cloud.productapi.api.product.vo.prodadditionalfeedates; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.baomidou.mybatisplus.annotation.TableField; +import com.tashow.cloud.productapi.general.StringListTypeHandler; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.List; + +@Schema(description = "管理后台 - 特殊日期附加费用规则 Response VO") +@Data +@ExcelIgnoreUnannotated +public class ProdAdditionalFeeBlackVO { + + @Schema(description = "特殊日期规则的唯一标识符") + @ExcelProperty("特殊日期规则的唯一标识符") + private Long id; + + @Schema(description = "日期类型0：'自定义日期范围':1：'指定日期':2：'法定节假日',3：'固定休息日'") + @ExcelProperty("日期类型0：'自定义日期范围':1：'指定日期':2：'法定节假日',3：'固定休息日'") + private Integer dateType; + + @Schema(description = "黑名单日期设置") + @ExcelProperty("黑名单日期设置") + @TableField(typeHandler = StringListTypeHandler.class) + private List customTimeSlots; + + + @Schema(description = "类型：1：特殊日期 2：可预约时段黑名单日期 3：紧急相应服务黑名单日期") + @ExcelProperty("类型：1：特殊日期 2：可预约时段黑名单日期 3：紧急相应服务黑名单日期") + private Integer type; + + @Schema(description = "是否启用该规则是否启用该规则0关1开", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("是否启用该规则是否启用该规则0关1开") + private Integer isEnabled; + + +} \ No newline at end of file diff --git a/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodemergencyresponse/ProdEmergencyInfoVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodemergencyresponse/ProdEmergencyInfoVO.java index 91f0c0c..4e8a520 100644 --- a/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodemergencyresponse/ProdEmergencyInfoVO.java +++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodemergencyresponse/ProdEmergencyInfoVO.java @@ -1,7 +1,10 @@ package com.tashow.cloud.productapi.api.product.vo.prodemergencyresponse; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.baomidou.mybatisplus.annotation.TableField; import com.tashow.cloud.productapi.api.product.dto.ProdEmergencyResponseIntervalsDO; +import com.tashow.cloud.productapi.api.product.vo.prodadditionalfeedates.ProdAdditionalFeeBlackVO; +import com.tashow.cloud.productapi.general.StringListTypeHandler; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -24,27 +27,12 @@ public class ProdEmergencyInfoVO { /** * 可响应时间段 */ + @TableField(typeHandler = StringListTypeHandler.class) private List responseTimeSlots; - /** - * 黑名自定义日期 - */ - private List blacklistedDates; - /** - * 黑名单指定日期 - */ - private List blackAppointDates; - /** - * 法定节假日是否开启0:关闭1开启 - */ - private Integer blackHappy; - /** - * 固定休息日周末是否开启0关闭1开启 - */ - private Integer blackWeekend; - - @Schema(description = "紧急响应时间区间设置") public List prodEmergencyResponseIntervalsList; + @Schema(description = "紧急响应黑名单日期设置") + public List prodEmergencyResponseBlackList; } \ No newline at end of file diff --git a/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodreservationconfig/ProdReservationInfoVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodreservationconfig/ProdReservationInfoVO.java new file mode 100644 index 0000000..60caeb9 --- /dev/null +++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodreservationconfig/ProdReservationInfoVO.java @@ -0,0 +1,81 @@ +package com.tashow.cloud.productapi.api.product.vo.prodreservationconfig; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.tashow.cloud.productapi.api.product.dto.ProdEmergencyResponseIntervalsDO; +import com.tashow.cloud.productapi.api.product.vo.prodadditionalfeedates.ProdAdditionalFeeBlackVO; +import com.tashow.cloud.productapi.general.StringListTypeHandler; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.util.List; + +@Schema(description = "管理后台 - 商品紧急响应服务设置 Response VO") +@Data +@ExcelIgnoreUnannotated +public class ProdReservationInfoVO { + + /** + * 预约配置的唯一标识符 + */ + @TableId + private Long id; + /** + * 关联的商品ID + */ + private Long prodId; + /** + * 预约时段设置 + */ + @TableField(typeHandler = StringListTypeHandler.class) + private List reservationTimeSlots; + /** + * 需提前多少小时预约 + */ + private Integer advanceHours; + /** + * 预约日期范围 7天 10天 15天 30天 + */ + private Integer reservationDateRange; + /** + * 是否允许更改预约时间 1可以 0不可以 + */ + private Integer allowChange; + + /** + * 时间段 + */ + private Integer timeSlot; + + /** + * 更改预约时间的时间规则（如服务开始前1小时可更改） + */ + private Integer changeTimeRule; + /** + * 允许更改预约时间的最大次数 + */ + private Integer maxChangeTimes; + + /** + * 预约时间区间设置 + */ + @TableField(exist=false) + private TimeBookVO timeBook; + + public TimeBookVO getTimeBook() { + if (this.timeBook == null) { + this.timeBook = new TimeBookVO(); + this.timeBook.setTimeSlot(this.timeSlot); + this.timeBook.setReservationTimeSlots(this.reservationTimeSlots); + } + return this.timeBook; + } + + public void setTimeBook(TimeBookVO timeBook) { + this.timeBook = timeBook; + } + + @Schema(description = "预约黑名单日期设置") + public List prodReservationBlackList; +} \ No newline at end of file diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdAdditionalFeeDatesMapper.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdAdditionalFeeDatesMapper.java index 64af0b7..f039577 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdAdditionalFeeDatesMapper.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdAdditionalFeeDatesMapper.java @@ -7,6 +7,7 @@ import com.tashow.cloud.mybatis.mybatis.core.query.LambdaQueryWrapperX; import com.tashow.cloud.mybatis.mybatis.core.mapper.BaseMapperX; import com.tashow.cloud.productapi.api.product.dto.ProdAdditionalFeeDatesDO; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * 特殊日期附加费用规则 Mapper @@ -16,5 +17,9 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface ProdAdditionalFeeDatesMapper extends BaseMapperX { + /** + * 删除关联 + */ + public int deleteAdditionalFeeDates(@Param("prodId")Long prodId,@Param("type")Integer type); } \ No newline at end of file diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdReservationConfigMapper.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdReservationConfigMapper.java index a7bbe67..a5647e1 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdReservationConfigMapper.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdReservationConfigMapper.java @@ -7,6 +7,7 @@ import com.tashow.cloud.mybatis.mybatis.core.query.LambdaQueryWrapperX; import com.tashow.cloud.mybatis.mybatis.core.mapper.BaseMapperX; import com.tashow.cloud.productapi.api.product.dto.ProdReservationConfigDO; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * 商品预约配置 Mapper @@ -17,4 +18,8 @@ import org.apache.ibatis.annotations.Mapper; public interface ProdReservationConfigMapper extends BaseMapperX { + /** + * 删除关联 + */ + public int deleteReservationConfig(@Param("prodId")Long prodId); } \ No newline at end of file diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdServiceImpl.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdServiceImpl.java index c064ebf..571a87a 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdServiceImpl.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdServiceImpl.java @@ -12,6 +12,8 @@ import com.tashow.cloud.product.service.ProdPropService; import com.tashow.cloud.product.service.ProdService; import com.tashow.cloud.productapi.api.product.vo.prod.*; +import com.tashow.cloud.productapi.api.product.vo.prodadditionalfeedates.ProdAdditionalFeeBlackVO; +import com.tashow.cloud.productapi.api.product.vo.prodreservationconfig.ProdReservationInfoVO; import com.tashow.cloud.productapi.api.product.vo.sku.SkuPageReqVO; import com.tashow.cloud.productapi.api.product.vo.sku.SkuRecycleBinVO; import com.tashow.cloud.productapi.enums.BaseEnum; @@ -123,12 +125,12 @@ public class ProdServiceImpl implements ProdService { } } //预约设置设置 - if (Objects.equals(prodServiceVO.getReservationSwitch(), BaseEnum.YES_ONE.getKey())) { + /*if (Objects.equals(prodServiceVO.getReservationSwitch(), BaseEnum.YES_ONE.getKey())) { prodDO.setReservationSwitch(BaseEnum.YES_ONE.getKey()); - ProdReservationConfigDO prodReservationConfigDO = prodServiceVO.prodReservationConfig; + ProdReservationInfoVO prodReservationConfigDO = prodServiceVO.getProdReservationConfig(); prodReservationConfigDO.setProdId(prodDO.getProdId()); prodReservationConfigMapper.insert(prodReservationConfigDO); - } + }*/ //紧急响应设置 if (Objects.equals(prodServiceVO.getEmergencySwitch(), BaseEnum.YES_ONE.getKey())) { prodDO.setEmergencySwitch(BaseEnum.YES_ONE.getKey()); @@ -235,15 +237,35 @@ public class ProdServiceImpl implements ProdService { .eq(ProdReservationConfigDO::getProdId, prodServiceVO.getProdId())); if (reservationConfig == null) { prod.setReservationSwitch(BaseEnum.YES_ONE.getKey()); - ProdReservationConfigDO prodReservationConfigDO = prodServiceVO.getProdReservationConfig(); + ProdReservationInfoVO prodReservationInfoVO = prodServiceVO.getProdReservationConfig(); + ProdReservationConfigDO prodReservationConfigDO = BeanUtils.toBean(prodReservationInfoVO, ProdReservationConfigDO.class); prodReservationConfigDO.setProdId(prod.getProdId()); prodReservationConfigDO.setTimeBook(prodServiceVO.getProdReservationConfig().getTimeBook()); prodReservationConfigDO.setReservationTimeSlots(prodServiceVO.getProdReservationConfig().getReservationTimeSlots()); prodReservationConfigMapper.insert(prodReservationConfigDO); + if(prodServiceVO.getProdReservationConfig().getProdReservationBlackList()!=null){ + for (ProdAdditionalFeeBlackVO prodAdditionalFeeBlackVO : prodServiceVO.getProdReservationConfig().getProdReservationBlackList()) { + ProdAdditionalFeeDatesDO prodAdditionalFeeDatesDO = BeanUtils.toBean(prodAdditionalFeeBlackVO, ProdAdditionalFeeDatesDO.class); + prodAdditionalFeeDatesDO.setProdId(prod.getProdId()); + prodAdditionalFeeDatesDO.setType(2); + prodAdditionalFeeDatesMapper.insert(prodAdditionalFeeDatesDO); + } + } } else { - prodServiceVO.getProdReservationConfig().setTimeBook(prodServiceVO.getProdReservationConfig().getTimeBook()); - prodServiceVO.getProdReservationConfig().setReservationTimeSlots(prodServiceVO.getProdReservationConfig().getReservationTimeSlots()); - prodReservationConfigMapper.updateById(prodServiceVO.getProdReservationConfig()); + ProdReservationConfigDO prodReservationConfigDO = BeanUtils.toBean(prodServiceVO.getProdReservationConfig(), ProdReservationConfigDO.class); + prodReservationConfigDO.setTimeBook(prodServiceVO.getProdReservationConfig().getTimeBook()); + prodReservationConfigDO.setReservationTimeSlots(prodServiceVO.getProdReservationConfig().getReservationTimeSlots()); + prodReservationConfigMapper.updateById(prodReservationConfigDO); + //先删除在新增 + prodAdditionalFeeDatesMapper.deleteAdditionalFeeDates(prod.getProdId(),2); + if(prodServiceVO.getProdReservationConfig().getProdReservationBlackList()!=null){ + for (ProdAdditionalFeeBlackVO prodAdditionalFeeBlackVO : prodServiceVO.getProdReservationConfig().getProdReservationBlackList()) { + ProdAdditionalFeeDatesDO prodAdditionalFeeDatesDO = BeanUtils.toBean(prodAdditionalFeeBlackVO, ProdAdditionalFeeDatesDO.class); + prodAdditionalFeeDatesDO.setProdId(prod.getProdId()); + prodAdditionalFeeDatesDO.setType(2); + prodAdditionalFeeDatesMapper.insert(prodAdditionalFeeDatesDO); + } + } } } //紧急响应设置 @@ -263,7 +285,14 @@ public class ProdServiceImpl implements ProdService { prodEmergencyResponseIntervalsMapper.insert(prodEmergencyResponseIntervals); } } - + if(prodServiceVO.getProdEmergencyInfoVO().getProdEmergencyResponseBlackList()!=null){ + for (ProdAdditionalFeeBlackVO prodAdditionalFeeBlackVO : prodServiceVO.getProdEmergencyInfoVO().getProdEmergencyResponseBlackList()) { + ProdAdditionalFeeDatesDO prodAdditionalFeeDatesDO = BeanUtils.toBean(prodAdditionalFeeBlackVO, ProdAdditionalFeeDatesDO.class); + prodAdditionalFeeDatesDO.setProdId(prod.getProdId()); + prodAdditionalFeeDatesDO.setType(3); + prodAdditionalFeeDatesMapper.insert(prodAdditionalFeeDatesDO); + } + } } else { ProdEmergencyResponseDO prodEmergencyResponse = BeanUtils.toBean(prodServiceVO.getProdEmergencyInfoVO(), ProdEmergencyResponseDO.class); if (prodEmergencyResponse != null) { @@ -276,6 +305,15 @@ public class ProdServiceImpl implements ProdService { prodEmergencyResponseIntervalsMapper.insert(prodEmergencyResponseIntervals); } } + //先删除在新增 + prodAdditionalFeeDatesMapper.deleteAdditionalFeeDates(prod.getProdId(),3); + if(prodServiceVO.getProdReservationConfig().getProdReservationBlackList()!=null){ + for (ProdAdditionalFeeBlackVO prodAdditionalFeeBlackVO : prodServiceVO.getProdReservationConfig().getProdReservationBlackList()) { + ProdAdditionalFeeDatesDO prodAdditionalFeeDatesDO = BeanUtils.toBean(prodAdditionalFeeBlackVO, ProdAdditionalFeeDatesDO.class); + prodAdditionalFeeDatesDO.setProdId(prod.getProdId()); + prodAdditionalFeeDatesMapper.insert(prodAdditionalFeeDatesDO); + } + } } } } @@ -298,6 +336,7 @@ public class ProdServiceImpl implements ProdService { for (ProdAdditionalFeeDatesDO prodAdditionalFeeDates : prodServiceVO.getProdAdditionalFeeDatesList()) { if (prodAdditionalFeeDates.getId() == null) { prodAdditionalFeeDates.setProdId(prodServiceVO.getProdId()); + prodAdditionalFeeDates.setType(1); prodAdditionalFeeDatesMapper.insert(prodAdditionalFeeDates); } else { prodAdditionalFeeDatesMapper.updateById(prodAdditionalFeeDates); diff --git a/tashow-module/tashow-module-product/src/main/resources/mapper/product/ProdAdditionalFeeDatesMapper.xml b/tashow-module/tashow-module-product/src/main/resources/mapper/product/ProdAdditionalFeeDatesMapper.xml index 49e31a2..55464e2 100644 --- a/tashow-module/tashow-module-product/src/main/resources/mapper/product/ProdAdditionalFeeDatesMapper.xml +++ b/tashow-module/tashow-module-product/src/main/resources/mapper/product/ProdAdditionalFeeDatesMapper.xml @@ -9,4 +9,7 @@ 文档可见：https://www.iocoder.cn/MyBatis/x-plugins/ --> + + delete from tz_prod_additional_fee_dates where prod_id = #{configId} AND type = #{type} + \ No newline at end of file diff --git a/tashow-module/tashow-module-product/src/main/resources/mapper/product/ProdMapper.xml b/tashow-module/tashow-module-product/src/main/resources/mapper/product/ProdMapper.xml index 3134a78..388433f 100644 --- a/tashow-module/tashow-module-product/src/main/resources/mapper/product/ProdMapper.xml +++ b/tashow-module/tashow-module-product/src/main/resources/mapper/product/ProdMapper.xml @@ -25,11 +25,15 @@ - - - - - + + + + + + + + + @@ -42,7 +46,7 @@ - + @@ -52,12 +56,14 @@ - - - - - - + + + + + + + + @@ -113,7 +119,7 @@ - + @@ -149,11 +155,15 @@ - - - - - + + + + + + + + + @@ -166,7 +176,7 @@ - + @@ -176,12 +186,14 @@ - - - - - - + + + + + + + + @@ -224,7 +236,7 @@ - + @@ -256,18 +268,12 @@ p.category_name, - erc.id AS erc_record_id, - erc.prod_id AS erc_prod_id, - erc.response_time_slots, - erc.blacklisted_dates, - erc.black_appoint_dates, - erc.black_happy, - erc.black_weekend, - erc.create_time AS erc_create_time, - erc.update_time AS erc_update_time, - erc.creator AS erc_creator, - erc.updater AS erc_updater, - erc.deleted AS erc_deleted, + erc.response_time_slots as erc_response_time_slots, + epafd.id AS erc_record_id, + epafd.date_type as erc_date_type, + epafd.custom_time_slots as erc_custom_time_slots, + epafd.type as erc_type, + epafd.is_enabled as erc_is_enabled, eri.id AS eri_record_id, eri.config_id AS eri_config_id, eri.mode_name, @@ -319,12 +325,11 @@ rc.change_time_rule AS rc_change_time_rule, rc.time_slot AS rc_time_slot, rc.max_change_times AS rc_max_change_times, - rc.blacklisted_dates AS rc_blacklisted_dates, - rc.is_blacklisted AS rc_is_blacklisted, - rc.black_appoint_dates AS rc_black_appoint_dates, - rc.is_black_appoint AS rc_is_black_appoint, - rc.black_happy AS rc_black_happy, - rc.black_weekend AS rc_black_weekend, + rpafd.id AS rcp_record_id, + rpafd.date_type as rcp_date_type, + rpafd.custom_time_slots as rcp_custom_time_slots, + rpafd.type as rcp_type, + rpafd.is_enabled as rcp_is_enabled, @@ -355,16 +360,18 @@ LEFT JOIN tz_prod_emergency_response erc ON p.prod_id = erc.prod_id AND erc.deleted = 0 + LEFT JOIN tz_prod_additional_fee_dates epafd ON erc.prod_id = epafd.prod_id AND epafd.deleted = 0 AND epafd.type = 3 LEFT JOIN tz_prod_emergency_response_intervals eri ON erc.id = eri.config_id AND eri.deleted = 0 LEFT JOIN tz_prod_additional_fee_periods afp ON p.prod_id = afp.prod_id AND afp.deleted = 0 - LEFT JOIN tz_prod_additional_fee_dates afd ON p.prod_id = afd.prod_id AND afd.deleted = 0 + LEFT JOIN tz_prod_additional_fee_dates afd ON p.prod_id = afd.prod_id AND afd.deleted = 0 and afd.type = 1 LEFT JOIN tz_prod_reservation_config rc ON p.prod_id = rc.prod_id AND rc.deleted = 0 + LEFT JOIN tz_prod_additional_fee_dates rpafd ON rc.id = rpafd.prod_id AND rpafd.deleted = 0 AND rpafd.type = 2 LEFT JOIN tz_product_order_limit ol ON p.prod_id = ol.prod_id AND ol.deleted = 0 @@ -398,18 +405,12 @@ p.region_switch, - erc.id AS erc_record_id, - erc.prod_id AS erc_prod_id, - erc.response_time_slots, - erc.blacklisted_dates, - erc.black_appoint_dates, - erc.black_happy, - erc.black_weekend, - erc.create_time AS erc_create_time, - erc.update_time AS erc_update_time, - erc.creator AS erc_creator, - erc.updater AS erc_updater, - erc.deleted AS erc_deleted, + erc.response_time_slots as erc_response_time_slots, + epafd.id AS erc_record_id, + epafd.date_type as erc_date_type, + epafd.custom_time_slots as erc_custom_time_slots, + epafd.type as erc_type, + epafd.is_enabled as erc_is_enabled, eri.id AS eri_record_id, eri.config_id AS eri_config_id, eri.mode_name, @@ -461,12 +462,11 @@ rc.change_time_rule AS rc_change_time_rule, rc.time_slot AS rc_time_slot, rc.max_change_times AS rc_max_change_times, - rc.blacklisted_dates AS rc_blacklisted_dates, - rc.is_blacklisted AS rc_is_blacklisted, - rc.black_appoint_dates AS rc_black_appoint_dates, - rc.is_black_appoint AS rc_is_black_appoint, - rc.black_happy AS rc_black_happy, - rc.black_weekend AS rc_black_weekend, + rpafd.id AS rcp_record_id, + rpafd.date_type as rcp_date_type, + rpafd.custom_time_slots as rcp_custom_time_slots, + rpafd.type as rcp_type, + rpafd.is_enabled as rcp_is_enabled, @@ -489,16 +489,18 @@ LEFT JOIN tz_prod_emergency_response erc ON p.prod_id = erc.prod_id AND erc.deleted = 0 + LEFT JOIN tz_prod_additional_fee_dates epafd ON erc.prod_id = epafd.prod_id AND epafd.deleted = 0 AND epafd.type = 3 LEFT JOIN tz_prod_emergency_response_intervals eri ON erc.id = eri.config_id AND eri.deleted = 0 LEFT JOIN tz_prod_additional_fee_periods afp ON p.prod_id = afp.prod_id AND afp.deleted = 0 - LEFT JOIN tz_prod_additional_fee_dates afd ON p.prod_id = afd.prod_id AND afd.deleted = 0 + LEFT JOIN tz_prod_additional_fee_dates afd ON p.prod_id = afd.prod_id AND afd.deleted = 0 afd.type = 1 LEFT JOIN tz_prod_reservation_config rc ON p.prod_id = rc.prod_id AND rc.deleted = 0 + LEFT JOIN tz_prod_additional_fee_dates rpafd ON rc.id = rpafd.prod_id AND rpafd.deleted = 0 AND rpafd.type = 2 LEFT JOIN tz_product_order_limit ol ON p.prod_id = ol.prod_id AND ol.deleted = 0 diff --git a/tashow-module/tashow-module-product/src/main/resources/mapper/product/ProdReservationConfigMapper.xml b/tashow-module/tashow-module-product/src/main/resources/mapper/product/ProdReservationConfigMapper.xml index e63b0dd..6d7bd01 100644 --- a/tashow-module/tashow-module-product/src/main/resources/mapper/product/ProdReservationConfigMapper.xml +++ b/tashow-module/tashow-module-product/src/main/resources/mapper/product/ProdReservationConfigMapper.xml @@ -8,5 +8,7 @@ 代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。 文档可见：https://www.iocoder.cn/MyBatis/x-plugins/ --> - + + delete from tz_prod_reservation_config where prod_id = #{configId} + \ No newline at end of file