From d92b69e1f1208086f3782d8374ed8d29273d4bab Mon Sep 17 00:00:00 2001 From: xuelijun <977662702@qq.com> Date: Thu, 31 Jul 2025 16:50:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E6=9C=8D=E5=8A=A1=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../product/controller/ProdController.java | 10 +- .../product/dto/ProdAdditionalFeeDatesDO.java | 2 +- .../product/dto/ProdEmergencyResponseDO.java | 4 +- .../dto/ProdEmergencyResponseIntervalsDO.java | 2 +- .../tashow/cloud/product/dto/ProdPropDO.java | 2 +- .../cloud/product/dto/ProdPropValueDO.java | 2 +- .../dto/ProdServiceOverAreaRulesDO.java | 2 +- .../product/dto/ProductOrderLimitDO.java | 2 +- .../com/tashow/cloud/product/dto/SkuDO.java | 2 +- .../product/dto/SkuServiceDeliverDO.java | 4 +- .../cloud/product/dto/SkuServicesFormDO.java | 2 +- .../cloud/product/mapper/ProdMapper.java | 16 +- .../cloud/product/service/ProdService.java | 2 +- .../product/service/impl/ProdServiceImpl.java | 20 +- .../cloud/product/vo/prod/ProdPageReqVO.java | 14 +- .../cloud/product/vo/prod/ProdRespVO.java | 14 +- .../cloud/product/vo/prod/ProdSaveReqVO.java | 14 +- .../cloud/product/vo/prod/ProdServiceVO.java | 12 +- .../ProdAdditionalFeeDatesPageReqVO.java | 2 +- .../ProdAdditionalFeeDatesRespVO.java | 2 +- .../ProdAdditionalFeeDatesSaveReqVO.java | 2 +- .../ProdEmergencyInfoVO.java | 36 ++- .../ProdEmergencyResponsePageReqVO.java | 4 +- .../ProdEmergencyResponseRespVO.java | 4 +- .../ProdEmergencyResponseSaveReqVO.java | 4 +- ...odEmergencyResponseIntervalsPageReqVO.java | 2 +- .../ProdEmergencyResponseIntervalsRespVO.java | 2 +- ...odEmergencyResponseIntervalsSaveReqVO.java | 2 +- .../vo/prodprop/ProdPropPageReqVO.java | 2 +- .../product/vo/prodprop/ProdPropRespVO.java | 2 +- .../vo/prodprop/ProdPropSaveReqVO.java | 2 +- .../prodpropvalue/ProdPropValuePageReqVO.java | 2 +- .../ProdServiceAreasInfoVO.java | 22 +- .../resources/mapper/product/ProdMapper.xml | 253 ++++++++++++++++++ 34 files changed, 393 insertions(+), 76 deletions(-) diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/ProdController.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/ProdController.java index 0796545..31f232b 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/ProdController.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/ProdController.java @@ -58,8 +58,14 @@ public class ProdController { return success(true); } - - + @GetMapping("/get") + @Operation(summary = "获得商品服务信息") + @Parameter(name = "prodId", description = "商品id", required = true, example = "1024") + @PermitAll + public CommonResult getProd(@RequestParam("prodId") Long prodId) { + ProdServiceVO prodServiceVO = prodService.getProdService(prodId); + return success(prodServiceVO); + } /* @PutMapping("/update") diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProdAdditionalFeeDatesDO.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProdAdditionalFeeDatesDO.java index cba7792..028dc50 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProdAdditionalFeeDatesDO.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProdAdditionalFeeDatesDO.java @@ -39,7 +39,7 @@ public class ProdAdditionalFeeDatesDO extends BaseDO { /** * 日期类型0：'自定义日期范围':1：'指定日期':2：'法定节假日',3：'固定休息日' */ - private Boolean dateType; + private Integer dateType; /** * 自定义日期时间段（JSON格式存储） */ diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProdEmergencyResponseDO.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProdEmergencyResponseDO.java index 73d0cf7..d93fb7d 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProdEmergencyResponseDO.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProdEmergencyResponseDO.java @@ -46,10 +46,10 @@ public class ProdEmergencyResponseDO extends BaseDO { /** * 法定节假日是否开启0:关闭1开启 */ - private Boolean blackHappy; + private Integer blackHappy; /** * 固定休息日周末是否开启0关闭1开启 */ - private Boolean blackWeekend; + private Integer blackWeekend; } \ No newline at end of file diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProdEmergencyResponseIntervalsDO.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProdEmergencyResponseIntervalsDO.java index dd615ae..3c20793 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProdEmergencyResponseIntervalsDO.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProdEmergencyResponseIntervalsDO.java @@ -44,7 +44,7 @@ public class ProdEmergencyResponseIntervalsDO extends BaseDO { /** * 收费模式0：固定收费 1：浮动收费 */ - private Boolean chargeMode; + private Integer chargeMode; /** * 浮动百分比 */ diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProdPropDO.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProdPropDO.java index 4c3f2d9..658fe6f 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProdPropDO.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProdPropDO.java @@ -43,7 +43,7 @@ public class ProdPropDO{ /** * 是否删除0否1是 */ - private Boolean isDelete; + private Integer isDelete; /** * 属性值 */ diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProdPropValueDO.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProdPropValueDO.java index 4dfe445..37e363e 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProdPropValueDO.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProdPropValueDO.java @@ -35,6 +35,6 @@ public class ProdPropValueDO { /** * 是否删除0否1是 */ - private Boolean isDelete; + private Integer isDelete; } \ No newline at end of file diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProdServiceOverAreaRulesDO.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProdServiceOverAreaRulesDO.java index 9fdc063..f1c782a 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProdServiceOverAreaRulesDO.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProdServiceOverAreaRulesDO.java @@ -35,7 +35,7 @@ public class ProdServiceOverAreaRulesDO extends BaseDO { /** * 超区规则类型（0:拒单、2:接单并收取超区费、3:接单并免超区费） */ - private Boolean ruleType; + private Integer ruleType; /** * 超区费用（仅在rule_type为accept_with_fee时有效） */ diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProductOrderLimitDO.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProductOrderLimitDO.java index 9f5c60a..0aef51c 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProductOrderLimitDO.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProductOrderLimitDO.java @@ -34,7 +34,7 @@ public class ProductOrderLimitDO extends BaseDO { /** * 限制单位'0:按自然天',1:'按自然周',2:'按自然月' */ - private Boolean limitUnit; + private Integer limitUnit; /** * 上限阈值 */ diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/SkuDO.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/SkuDO.java index 43c25cc..ede98ea 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/SkuDO.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/SkuDO.java @@ -87,7 +87,7 @@ public class SkuDO extends BaseDO { /** * 库存扣款时机0:付款扣1：下单扣 */ - private Boolean stocksType; + private Integer stocksType; /** * sku编码 */ diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/SkuServiceDeliverDO.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/SkuServiceDeliverDO.java index 297fc2f..11152c2 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/SkuServiceDeliverDO.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/SkuServiceDeliverDO.java @@ -35,7 +35,7 @@ public class SkuServiceDeliverDO extends BaseDO { /** * 交互方式0：快递物流 1：到店自提 2：商家自送 */ - private Boolean type; + private Integer type; /** * 价格 */ @@ -43,7 +43,7 @@ public class SkuServiceDeliverDO extends BaseDO { /** * 是否收费0:免费1收费 */ - private Boolean isCharge; + private Integer isCharge; /** * 详细地址 */ diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/SkuServicesFormDO.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/SkuServicesFormDO.java index df30fcd..17457eb 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/SkuServicesFormDO.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/SkuServicesFormDO.java @@ -42,7 +42,7 @@ public class SkuServicesFormDO extends BaseDO { /** * 是否启用该服务 */ - private Boolean isEnabled; + private Integer isEnabled; /** * 创建时间 */ diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdMapper.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdMapper.java index b428c5d..4748f03 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdMapper.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdMapper.java @@ -7,9 +7,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.tashow.cloud.common.pojo.PageResult; import com.tashow.cloud.mybatis.mybatis.core.query.LambdaQueryWrapperX; import com.tashow.cloud.mybatis.mybatis.core.mapper.BaseMapperX; -import com.tashow.cloud.product.dto.ProdDO; +import com.tashow.cloud.product.dto.*; import com.tashow.cloud.product.vo.prod.ProdPageReqVO; +import com.tashow.cloud.product.vo.prod.ProdServiceVO; +import com.tashow.cloud.product.vo.prodemergencyresponse.ProdEmergencyInfoVO; +import com.tashow.cloud.product.vo.prodserviceareas.ProdServiceAreasInfoVO; +import io.swagger.v3.oas.annotations.media.Schema; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * 商品 Mapper @@ -21,4 +26,13 @@ public interface ProdMapper extends BaseMapperX { IPage getProdPageList(Page page, ProdPageReqVO reqVO); + ProdServiceVO selectProdService(@Param("prodId") Long prodId + ,@Param("regionSwitch") Integer regionSwitch + ,@Param("reservationSwitch") Integer reservationSwitch + ,@Param("emergencySwitch") Integer emergencySwitch + ,@Param("orderLimitSwitch") Integer orderLimitSwitch + ,@Param("additionalSwitch") Integer additionalSwitch + ,@Param("additionalFeeSwitch") Integer additionalFeeSwitch + ,@Param("weightSwitch") Integer weightSwitch + ); } \ No newline at end of file diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdService.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdService.java index b2fb358..28f9aed 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdService.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdService.java @@ -50,7 +50,7 @@ public interface ProdService { * @param prodId 商品id * @return 编号 */ - ProdServiceVO getProdService(@Valid Integer prodId); + ProdServiceVO getProdService(@Valid Long prodId); /** * 更新商品 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 827ab02..4a9ba7f 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 @@ -92,7 +92,7 @@ public class ProdServiceImpl implements ProdService { if(Objects.equals(prodServiceVO.getRegionSwitch(),BaseEnum.YES_ONE.getKey())){ prodDO.setRegionSwitch(BaseEnum.YES_ONE.getKey()); //保存区域设置信息 - ProdServiceOverAreaRulesDO prodServiceOverAreaRules =prodServiceVO.getProdServiceAreasInfo().getOverAreaRules(); + ProdServiceOverAreaRulesDO prodServiceOverAreaRules = BeanUtils.toBean(prodServiceVO.getProdServiceAreasInfo(), ProdServiceOverAreaRulesDO.class); prodServiceOverAreaRules.setProdId(prodDO.getProdId()); prodServiceOverAreaRulesMapper.insert(prodServiceOverAreaRules); //保存区域 @@ -121,7 +121,8 @@ public class ProdServiceImpl implements ProdService { //紧急响应设置 if(Objects.equals(prodServiceVO.getEmergencySwitch(),BaseEnum.YES_ONE.getKey())){ prodDO.setEmergencySwitch(BaseEnum.YES_ONE.getKey()); - ProdEmergencyResponseDO prodEmergencyResponse = prodServiceVO.prodEmergencyInfoVO.getProdEmergencyResponse(); + // 插入 + ProdEmergencyResponseDO prodEmergencyResponse = BeanUtils.toBean(prodServiceVO.prodEmergencyInfoVO, ProdEmergencyResponseDO.class); prodEmergencyResponse.setProdId(prodDO.getProdId()); prodEmergencyResponseMapper.insert(prodEmergencyResponse); for (ProdEmergencyResponseIntervalsDO prodEmergencyResponseIntervals : prodServiceVO.prodEmergencyInfoVO.getProdEmergencyResponseIntervalsList()){ @@ -132,7 +133,7 @@ public class ProdServiceImpl implements ProdService { //接单上线设置 if(Objects.equals(prodServiceVO.getOrderLimitSwitch(),BaseEnum.YES_ONE.getKey())){ prodDO.setOrderLimitSwitch(BaseEnum.YES_ONE.getKey()); - ProductOrderLimitDO productOrderLimit = prodServiceVO.ProductOrderLimitVO; + ProductOrderLimitDO productOrderLimit = prodServiceVO.productOrderLimitVO; productOrderLimit.setProdId(prodDO.getProdId()); productOrderLimitMapper.insert(productOrderLimit); } @@ -171,7 +172,7 @@ public class ProdServiceImpl implements ProdService { if(Objects.equals(prodServiceVO.getRegionSwitch(),BaseEnum.YES_ONE.getKey())){ //保存区域设置信息 - ProdServiceOverAreaRulesDO prodServiceOverAreaRules =prodServiceVO.getProdServiceAreasInfo().getOverAreaRules(); + ProdServiceOverAreaRulesDO prodServiceOverAreaRules = BeanUtils.toBean(prodServiceVO.getProdServiceAreasInfo(), ProdServiceOverAreaRulesDO.class); prodServiceOverAreaRules.setProdId(prodServiceVO.getProdId()); prodServiceOverAreaRulesMapper.updateById(prodServiceOverAreaRules); //先批量删除区域关联表 @@ -198,7 +199,7 @@ public class ProdServiceImpl implements ProdService { } //紧急响应设置 if(Objects.equals(prodServiceVO.getEmergencySwitch(),BaseEnum.YES_ONE.getKey())){ - ProdEmergencyResponseDO prodEmergencyResponse = prodServiceVO.prodEmergencyInfoVO.getProdEmergencyResponse(); + ProdEmergencyResponseDO prodEmergencyResponse = BeanUtils.toBean(prodServiceVO.prodEmergencyInfoVO, ProdEmergencyResponseDO.class); if(prodEmergencyResponse!=null){ prodEmergencyResponseMapper.updateById(prodEmergencyResponse); prodEmergencyResponseIntervalsMapper.deleteIntervals(prodEmergencyResponse.getId()); @@ -211,7 +212,7 @@ public class ProdServiceImpl implements ProdService { } //接单上线设置 if(Objects.equals(prodServiceVO.getOrderLimitSwitch(),BaseEnum.YES_ONE.getKey())){ - productOrderLimitMapper.updateById(prodServiceVO.ProductOrderLimitVO); + productOrderLimitMapper.updateById(prodServiceVO.productOrderLimitVO); } //特殊时段设置 if(Objects.equals(prodServiceVO.getAdditionalSwitch(),BaseEnum.YES_ONE.getKey())){ @@ -233,8 +234,11 @@ public class ProdServiceImpl implements ProdService { } @Override - public ProdServiceVO getProdService(Integer prodId) { - return null; + public ProdServiceVO getProdService(Long prodId) { + ProdDO prodDO = prodMapper.selectById(prodId); + return prodMapper.selectProdService(prodDO.getProdId(),prodDO.getRegionSwitch(), + prodDO.getReservationSwitch(),prodDO.getEmergencySwitch(),prodDO.getOrderLimitSwitch(), + prodDO.getAdditionalSwitch(),prodDO.getAdditionalFeeSwitch(),prodDO.getWeightSwitch()); } @Override diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prod/ProdPageReqVO.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prod/ProdPageReqVO.java index b7bbd9b..1576ccd 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prod/ProdPageReqVO.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prod/ProdPageReqVO.java @@ -80,25 +80,25 @@ public class ProdPageReqVO extends PageParam { private String shareContent; @Schema(description = "是否开启区域0关1开") - private Boolean regionSwitch; + private Integer regionSwitch; @Schema(description = "是否特殊时段0关1开") - private Boolean additionalSwitch; + private Integer additionalSwitch; @Schema(description = "是否特殊日期（节假日周末什么的）0关1开") - private Boolean additionalFeeSwitch; + private Integer additionalFeeSwitch; @Schema(description = "是否紧急响应服务0关1开") - private Boolean emergencySwitch; + private Integer emergencySwitch; @Schema(description = "是否预约0关1开") - private Boolean reservationSwitch; + private Integer reservationSwitch; @Schema(description = "是否接单上线0关1开") - private Boolean orderLimitSwitch; + private Integer orderLimitSwitch; @Schema(description = "是否开启体重配置0关1开") - private Boolean weightSwitch; + private Integer weightSwitch; @Schema(description = "创建时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prod/ProdRespVO.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prod/ProdRespVO.java index b0b6bd7..c319247 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prod/ProdRespVO.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prod/ProdRespVO.java @@ -96,31 +96,31 @@ public class ProdRespVO { @Schema(description = "是否开启区域0关1开") @ExcelProperty("是否开启区域0关1开") - private Boolean regionSwitch; + private Integer regionSwitch; @Schema(description = "是否特殊时段0关1开") @ExcelProperty("是否特殊时段0关1开") - private Boolean additionalSwitch; + private Integer additionalSwitch; @Schema(description = "是否特殊日期（节假日周末什么的）0关1开") @ExcelProperty("是否特殊日期（节假日周末什么的）0关1开") - private Boolean additionalFeeSwitch; + private Integer additionalFeeSwitch; @Schema(description = "是否紧急响应服务0关1开") @ExcelProperty("是否紧急响应服务0关1开") - private Boolean emergencySwitch; + private Integer emergencySwitch; @Schema(description = "是否预约0关1开") @ExcelProperty("是否预约0关1开") - private Boolean reservationSwitch; + private Integer reservationSwitch; @Schema(description = "是否接单上线0关1开") @ExcelProperty("是否接单上线0关1开") - private Boolean orderLimitSwitch; + private Integer orderLimitSwitch; @Schema(description = "是否开启体重配置0关1开") @ExcelProperty("是否开启体重配置0关1开") - private Boolean weightSwitch; + private Integer weightSwitch; @Schema(description = "创建时间") @ExcelProperty("创建时间") diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prod/ProdSaveReqVO.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prod/ProdSaveReqVO.java index 74ee58c..6a4458c 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prod/ProdSaveReqVO.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prod/ProdSaveReqVO.java @@ -80,25 +80,25 @@ public class ProdSaveReqVO { private String shareContent; @Schema(description = "是否开启区域0关1开") - private Boolean regionSwitch; + private Integer regionSwitch; @Schema(description = "是否特殊时段0关1开") - private Boolean additionalSwitch; + private Integer additionalSwitch; @Schema(description = "是否特殊日期（节假日周末什么的）0关1开") - private Boolean additionalFeeSwitch; + private Integer additionalFeeSwitch; @Schema(description = "是否紧急响应服务0关1开") - private Boolean emergencySwitch; + private Integer emergencySwitch; @Schema(description = "是否预约0关1开") - private Boolean reservationSwitch; + private Integer reservationSwitch; @Schema(description = "是否接单上线0关1开") - private Boolean orderLimitSwitch; + private Integer orderLimitSwitch; @Schema(description = "是否开启体重配置0关1开") - private Boolean weightSwitch; + private Integer weightSwitch; @Schema(description = "创建人") private String createBy; diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prod/ProdServiceVO.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prod/ProdServiceVO.java index 9301544..25db6a4 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prod/ProdServiceVO.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prod/ProdServiceVO.java @@ -13,7 +13,6 @@ import java.util.List; @Schema(description = "商品服务配置 VO") @Data -@ExcelIgnoreUnannotated public class ProdServiceVO { @Schema(description = "产品ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "6943") @@ -21,46 +20,39 @@ public class ProdServiceVO { @Schema(description = "是否开启服务区域配置0关1开") - @ExcelProperty("是否开启区域0关1开") private Integer regionSwitch; @Schema(description = "服务区域配置") public ProdServiceAreasInfoVO prodServiceAreasInfo; @Schema(description = "是否预约0关1开") - @ExcelProperty("是否预约0关1开") private Integer reservationSwitch; @Schema(description = "预约配置") public ProdReservationConfigDO prodReservationConfig; @Schema(description = "是否紧急响应服务0关1开") - @ExcelProperty("是否紧急响应服务0关1开") private Integer emergencySwitch; @Schema(description = "急响应服务配置") public ProdEmergencyInfoVO prodEmergencyInfoVO; @Schema(description = "是否接单上线0关1开") - @ExcelProperty("是否接单上线0关1开") private Integer orderLimitSwitch; @Schema(description = "接单上线配置") - public ProductOrderLimitDO ProductOrderLimitVO; + public ProductOrderLimitDO productOrderLimitVO; @Schema(description = "是否特殊时段0关1开") - @ExcelProperty("是否特殊时段0关1开") private Integer additionalSwitch; @Schema(description = "特殊时段规则配置") - public List ProdAdditionalFeeDatesList; + public List prodAdditionalFeeDatesList; @Schema(description = "是否特殊日期（节假日周末什么的）0关1开") - @ExcelProperty("是否特殊日期（节假日周末什么的）0关1开") private Integer additionalFeeSwitch; @Schema(description = "特殊日期规则配置") public List prodAdditionalFeePeriodsList; @Schema(description = "是否开启体重配置0关1开") - @ExcelProperty("是否开启体重配置0关1开") private Integer weightSwitch; @Schema(description = "体重配置") public ProdWeightRangePricesDO prodWeightConfig; diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodadditionalfeedates/ProdAdditionalFeeDatesPageReqVO.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodadditionalfeedates/ProdAdditionalFeeDatesPageReqVO.java index 36347f0..1d183f1 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodadditionalfeedates/ProdAdditionalFeeDatesPageReqVO.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodadditionalfeedates/ProdAdditionalFeeDatesPageReqVO.java @@ -23,7 +23,7 @@ public class ProdAdditionalFeeDatesPageReqVO extends PageParam { private String name; @Schema(description = "日期类型0：'自定义日期范围':1：'指定日期':2：'法定节假日',3：'固定休息日'", example = "2") - private Boolean dateType; + private Integer dateType; @Schema(description = "自定义日期时间段（JSON格式存储）") private String customTimeSlots; diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodadditionalfeedates/ProdAdditionalFeeDatesRespVO.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodadditionalfeedates/ProdAdditionalFeeDatesRespVO.java index 9acf589..9317208 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodadditionalfeedates/ProdAdditionalFeeDatesRespVO.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodadditionalfeedates/ProdAdditionalFeeDatesRespVO.java @@ -27,7 +27,7 @@ public class ProdAdditionalFeeDatesRespVO { @Schema(description = "日期类型0：'自定义日期范围':1：'指定日期':2：'法定节假日',3：'固定休息日'", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") @ExcelProperty("日期类型0：'自定义日期范围':1：'指定日期':2：'法定节假日',3：'固定休息日'") - private Boolean dateType; + private Integer dateType; @Schema(description = "自定义日期时间段（JSON格式存储）") @ExcelProperty("自定义日期时间段（JSON格式存储）") diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodadditionalfeedates/ProdAdditionalFeeDatesSaveReqVO.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodadditionalfeedates/ProdAdditionalFeeDatesSaveReqVO.java index 68c132a..1032ad2 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodadditionalfeedates/ProdAdditionalFeeDatesSaveReqVO.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodadditionalfeedates/ProdAdditionalFeeDatesSaveReqVO.java @@ -25,7 +25,7 @@ public class ProdAdditionalFeeDatesSaveReqVO { @Schema(description = "日期类型0：'自定义日期范围':1：'指定日期':2：'法定节假日',3：'固定休息日'", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") @NotNull(message = "日期类型0：'自定义日期范围':1：'指定日期':2：'法定节假日',3：'固定休息日'不能为空") - private Boolean dateType; + private Integer dateType; @Schema(description = "自定义日期时间段（JSON格式存储）") private String customTimeSlots; diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodemergencyresponse/ProdEmergencyInfoVO.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodemergencyresponse/ProdEmergencyInfoVO.java index 3a35799..e31cbe1 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodemergencyresponse/ProdEmergencyInfoVO.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodemergencyresponse/ProdEmergencyInfoVO.java @@ -2,6 +2,7 @@ package com.tashow.cloud.product.vo.prodemergencyresponse; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; +import com.baomidou.mybatisplus.annotation.TableId; import com.tashow.cloud.product.dto.ProdEmergencyResponseDO; import com.tashow.cloud.product.dto.ProdEmergencyResponseIntervalsDO; import io.swagger.v3.oas.annotations.media.Schema; @@ -15,10 +16,39 @@ import java.util.List; @ExcelIgnoreUnannotated public class ProdEmergencyInfoVO { - @Schema(description = "紧急响应服务配置") - private ProdEmergencyResponseDO prodEmergencyResponse; + + /** + * 紧急响应服务配置的唯一标识符 + */ + private Long id; + /** + * 关联的商品ID + */ + private Long prodId; + /** + * 可响应时间段（JSON格式存储） + */ + private String responseTimeSlots; + /** + * 黑名自定义日期（JSON格式存储） + */ + private String blacklistedDates; + /** + * 黑名单指定日期（JSON格式存储） + */ + private String blackAppointDates; + /** + * 法定节假日是否开启0:关闭1开启 + */ + private Integer blackHappy; + /** + * 固定休息日周末是否开启0关闭1开启 + */ + private Integer blackWeekend; + + @Schema(description = "紧急响应时间区间设置") - private List prodEmergencyResponseIntervalsList; + public List prodEmergencyResponseIntervalsList; } \ No newline at end of file diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodemergencyresponse/ProdEmergencyResponsePageReqVO.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodemergencyresponse/ProdEmergencyResponsePageReqVO.java index 7b9f759..1f8c1c1 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodemergencyresponse/ProdEmergencyResponsePageReqVO.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodemergencyresponse/ProdEmergencyResponsePageReqVO.java @@ -28,10 +28,10 @@ public class ProdEmergencyResponsePageReqVO extends PageParam { private String blackAppointDates; @Schema(description = "法定节假日是否开启0:关闭1开启") - private Boolean blackHappy; + private Integer blackHappy; @Schema(description = "固定休息日周末是否开启0关闭1开启") - private Boolean blackWeekend; + private Integer blackWeekend; @Schema(description = "创建时间") private LocalDateTime createdAt; diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodemergencyresponse/ProdEmergencyResponseRespVO.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodemergencyresponse/ProdEmergencyResponseRespVO.java index 1c1c3c3..dbeb629 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodemergencyresponse/ProdEmergencyResponseRespVO.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodemergencyresponse/ProdEmergencyResponseRespVO.java @@ -34,11 +34,11 @@ public class ProdEmergencyResponseRespVO { @Schema(description = "法定节假日是否开启0:关闭1开启") @ExcelProperty("法定节假日是否开启0:关闭1开启") - private Boolean blackHappy; + private Integer blackHappy; @Schema(description = "固定休息日周末是否开启0关闭1开启") @ExcelProperty("固定休息日周末是否开启0关闭1开启") - private Boolean blackWeekend; + private Integer blackWeekend; @Schema(description = "创建时间") @ExcelProperty("创建时间") diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodemergencyresponse/ProdEmergencyResponseSaveReqVO.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodemergencyresponse/ProdEmergencyResponseSaveReqVO.java index fbca04f..998c9ed 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodemergencyresponse/ProdEmergencyResponseSaveReqVO.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodemergencyresponse/ProdEmergencyResponseSaveReqVO.java @@ -28,10 +28,10 @@ public class ProdEmergencyResponseSaveReqVO { private String blackAppointDates; @Schema(description = "法定节假日是否开启0:关闭1开启") - private Boolean blackHappy; + private Integer blackHappy; @Schema(description = "固定休息日周末是否开启0关闭1开启") - private Boolean blackWeekend; + private Integer blackWeekend; @Schema(description = "创建时间") private LocalDateTime createdAt; diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodemergencyresponseintervals/ProdEmergencyResponseIntervalsPageReqVO.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodemergencyresponseintervals/ProdEmergencyResponseIntervalsPageReqVO.java index 0fe313c..9136648 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodemergencyresponseintervals/ProdEmergencyResponseIntervalsPageReqVO.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodemergencyresponseintervals/ProdEmergencyResponseIntervalsPageReqVO.java @@ -26,7 +26,7 @@ public class ProdEmergencyResponseIntervalsPageReqVO extends PageParam { private Integer responseHours; @Schema(description = "收费模式0：固定收费 1：浮动收费") - private Boolean chargeMode; + private Integer chargeMode; @Schema(description = "浮动百分比") private BigDecimal floatingPercentage; diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodemergencyresponseintervals/ProdEmergencyResponseIntervalsRespVO.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodemergencyresponseintervals/ProdEmergencyResponseIntervalsRespVO.java index 6d9975a..dd9492e 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodemergencyresponseintervals/ProdEmergencyResponseIntervalsRespVO.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodemergencyresponseintervals/ProdEmergencyResponseIntervalsRespVO.java @@ -31,7 +31,7 @@ public class ProdEmergencyResponseIntervalsRespVO { @Schema(description = "收费模式0：固定收费 1：浮动收费", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("收费模式0：固定收费 1：浮动收费") - private Boolean chargeMode; + private Integer chargeMode; @Schema(description = "浮动百分比") @ExcelProperty("浮动百分比") diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodemergencyresponseintervals/ProdEmergencyResponseIntervalsSaveReqVO.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodemergencyresponseintervals/ProdEmergencyResponseIntervalsSaveReqVO.java index a77d042..daabe0f 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodemergencyresponseintervals/ProdEmergencyResponseIntervalsSaveReqVO.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodemergencyresponseintervals/ProdEmergencyResponseIntervalsSaveReqVO.java @@ -29,7 +29,7 @@ public class ProdEmergencyResponseIntervalsSaveReqVO { @Schema(description = "收费模式0：固定收费 1：浮动收费", requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "收费模式0：固定收费 1：浮动收费不能为空") - private Boolean chargeMode; + private Integer chargeMode; @Schema(description = "浮动百分比") private BigDecimal floatingPercentage; diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodprop/ProdPropPageReqVO.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodprop/ProdPropPageReqVO.java index 997846b..080d40f 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodprop/ProdPropPageReqVO.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodprop/ProdPropPageReqVO.java @@ -24,6 +24,6 @@ public class ProdPropPageReqVO extends PageParam { private Integer prodId; @Schema(description = "是否删除0否1是") - private Boolean isDelete; + private Integer isDelete; } \ No newline at end of file diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodprop/ProdPropRespVO.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodprop/ProdPropRespVO.java index 57f0bde..d6004a7 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodprop/ProdPropRespVO.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodprop/ProdPropRespVO.java @@ -32,6 +32,6 @@ public class ProdPropRespVO { @Schema(description = "是否删除0否1是") @ExcelProperty("是否删除0否1是") - private Boolean isDelete; + private Integer isDelete; } \ No newline at end of file diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodprop/ProdPropSaveReqVO.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodprop/ProdPropSaveReqVO.java index de51bb0..cc5173e 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodprop/ProdPropSaveReqVO.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodprop/ProdPropSaveReqVO.java @@ -27,7 +27,7 @@ public class ProdPropSaveReqVO { private Integer prodId; @Schema(description = "是否删除0否1是") - private Boolean isDelete; + private Integer isDelete; /** * 属性值 diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodpropvalue/ProdPropValuePageReqVO.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodpropvalue/ProdPropValuePageReqVO.java index e70a613..31d84bc 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodpropvalue/ProdPropValuePageReqVO.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodpropvalue/ProdPropValuePageReqVO.java @@ -18,6 +18,6 @@ public class ProdPropValuePageReqVO extends PageParam { private Long propId; @Schema(description = "是否删除0否1是") - private Boolean isDelete; + private Integer isDelete; } \ No newline at end of file diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodserviceareas/ProdServiceAreasInfoVO.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodserviceareas/ProdServiceAreasInfoVO.java index ba0187a..3ec8a86 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodserviceareas/ProdServiceAreasInfoVO.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodserviceareas/ProdServiceAreasInfoVO.java @@ -2,11 +2,13 @@ package com.tashow.cloud.product.vo.prodserviceareas; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; +import com.baomidou.mybatisplus.annotation.TableId; import com.tashow.cloud.product.dto.ProdServiceOverAreaRulesDO; import com.tashow.cloud.product.vo.prodserviceoverarearules.ProdServiceOverAreaRulesRespVO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List; @@ -15,9 +17,25 @@ import java.util.List; @ExcelIgnoreUnannotated public class ProdServiceAreasInfoVO { + /** + * 超区规则的唯一标识符 + */ + private Long id; + /** + * 关联的商品ID + */ + private Long prodId; + /** + * 超区规则类型（0:拒单、2:接单并收取超区费、3:接单并免超区费） + */ + private Integer ruleType; + /** + * 超区费用（仅在rule_type为accept_with_fee时有效） + */ + private BigDecimal fee; + + @Schema(description = "服务区域地址名称") private List areaNameList; - public ProdServiceOverAreaRulesDO overAreaRules; - } \ 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 e6e0eb6..f2c8975 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 @@ -8,7 +8,260 @@ 代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。 文档可见：https://www.iocoder.cn/MyBatis/x-plugins/ --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file