From eeab4e5ea39b767d411462197184d505e3303769 Mon Sep 17 00:00:00 2001 From: xuelijun <977662702@qq.com> Date: Wed, 20 Aug 2025 16:39:54 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E6=A0=BC=E5=9B=9E=E6=94=B6=E7=AB=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/product/vo/prod/ProdListVO.java | 3 +- .../product/vo/prod/ProdRestoreListVO.java | 5 ++- .../product/vo/prod/ProdServiceInfoVO.java | 10 +++-- .../ProdEmergencyInfoReqVO.java | 40 +++++++++++++++++++ .../vo/prodpropvalue/ProPageReqVO.java | 25 ++++++++++++ .../vo/prodpropvalue/ProPropRecycleBinVO.java | 32 +++++++++++++++ .../api/product/vo/sku/SkuRecycleBinVO.java | 6 ++- .../controller/admin/ProdController.java | 6 +-- .../controller/admin/SkuController.java | 14 +++++++ .../product/mapper/ProdPropValueMapper.java | 6 +++ .../cloud/product/mapper/SkuMapper.java | 5 +++ .../cloud/product/service/ProdService.java | 2 +- .../cloud/product/service/SkuService.java | 3 ++ .../product/service/impl/ProdServiceImpl.java | 6 ++- .../product/service/impl/SkuServiceImpl.java | 18 +++++++-- .../resources/mapper/product/ProdMapper.xml | 5 ++- .../mapper/product/ProdPropMapper.xml | 3 ++ .../mapper/product/ProdPropValueMapper.xml | 15 ++++++- .../resources/mapper/product/SkuMapper.xml | 19 ++++++++- 19 files changed, 205 insertions(+), 18 deletions(-) create mode 100644 tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodemergencyresponse/ProdEmergencyInfoReqVO.java create mode 100644 tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodpropvalue/ProPageReqVO.java create mode 100644 tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodpropvalue/ProPropRecycleBinVO.java diff --git a/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prod/ProdListVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prod/ProdListVO.java index 50dced3..d4ae332 100644 --- a/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prod/ProdListVO.java +++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prod/ProdListVO.java @@ -63,7 +63,8 @@ public class ProdListVO { /** * 服务时段 */ - private BigDecimal reservationTimeSlots; + @TableField(typeHandler = StringListTypeHandler.class) + private List reservationTimeSlots; /** * 还剩多少天 diff --git a/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prod/ProdRestoreListVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prod/ProdRestoreListVO.java index d39739a..59b556f 100644 --- a/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prod/ProdRestoreListVO.java +++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prod/ProdRestoreListVO.java @@ -1,7 +1,9 @@ package com.tashow.cloud.productapi.api.product.vo.prod; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; +import com.tashow.cloud.productapi.general.StringListTypeHandler; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -49,7 +51,8 @@ public class ProdRestoreListVO { /** * 服务时段 */ - private BigDecimal reservationTimeSlots; + @TableField(typeHandler = StringListTypeHandler.class) + private List reservationTimeSlots; /** * 还剩多少天 diff --git a/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prod/ProdServiceInfoVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prod/ProdServiceInfoVO.java index be0f3cb..ce6a949 100644 --- a/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prod/ProdServiceInfoVO.java +++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prod/ProdServiceInfoVO.java @@ -5,9 +5,12 @@ import com.tashow.cloud.productapi.api.product.dto.ProdAdditionalFeeDatesDO; import com.tashow.cloud.productapi.api.product.dto.ProdAdditionalFeePeriodsDO; import com.tashow.cloud.productapi.api.product.dto.ProdWeightRangePricesDO; import com.tashow.cloud.productapi.api.product.dto.ProductOrderLimitDO; +import com.tashow.cloud.productapi.api.product.vo.prodemergencyresponse.ProdEmergencyInfoReqVO; import com.tashow.cloud.productapi.api.product.vo.prodemergencyresponse.ProdEmergencyInfoVO; +import com.tashow.cloud.productapi.api.product.vo.prodreservationconfig.ProdReservationInfoReqVO; 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.vo.prodweightrangeprices.ProdWeightRangePricesSaveInfoVO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -48,12 +51,12 @@ public class ProdServiceInfoVO { @Schema(description = "是否预约0关1开") private Integer reservationSwitch; @Schema(description = "预约配置") - public ProdReservationInfoVO prodReservationConfig; + public ProdReservationInfoReqVO prodReservationConfig; @Schema(description = "是否紧急响应服务0关1开") private Integer emergencySwitch; @Schema(description = "急响应服务配置") - public ProdEmergencyInfoVO prodEmergencyInfoVO; + public ProdEmergencyInfoReqVO prodEmergencyInfoVO; @Schema(description = "是否接单上线0关1开") private Integer orderLimitSwitch; @@ -75,6 +78,7 @@ public class ProdServiceInfoVO { @Schema(description = "是否开启体重配置0关1开") private Integer weightSwitch; @Schema(description = "体重配置") - public List prodWeightConfig; + public ProdWeightRangePricesSaveInfoVO prodWeightConfig; + } \ 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/ProdEmergencyInfoReqVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodemergencyresponse/ProdEmergencyInfoReqVO.java new file mode 100644 index 0000000..c6103fd --- /dev/null +++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodemergencyresponse/ProdEmergencyInfoReqVO.java @@ -0,0 +1,40 @@ +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; + +import java.util.List; +import java.util.stream.Collectors; + +@Schema(description = "管理后台 - 商品紧急响应服务设置 Response VO") +@Data +@ExcelIgnoreUnannotated +public class ProdEmergencyInfoReqVO { + + + /** + * 紧急响应服务配置的唯一标识符 + */ + private Long id; + /** + * 关联的商品ID + */ + private Long prodId; + /** + * 可响应时间段 + */ + @TableField(typeHandler = StringListTypeHandler.class) + private List responseTimeSlots; + + @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/prodpropvalue/ProPageReqVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodpropvalue/ProPageReqVO.java new file mode 100644 index 0000000..bdf0406 --- /dev/null +++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodpropvalue/ProPageReqVO.java @@ -0,0 +1,25 @@ +package com.tashow.cloud.productapi.api.product.vo.prodpropvalue; + +import com.tashow.cloud.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +@Schema(description = "") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class ProPageReqVO extends PageParam { + + /** + * 属性规格名称 + */ + private String propValue; + + /** + * 商品id + */ + private Long prodId; + +} \ No newline at end of file diff --git a/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodpropvalue/ProPropRecycleBinVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodpropvalue/ProPropRecycleBinVO.java new file mode 100644 index 0000000..8ed8587 --- /dev/null +++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodpropvalue/ProPropRecycleBinVO.java @@ -0,0 +1,32 @@ +package com.tashow.cloud.productapi.api.product.vo.prodpropvalue; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.util.Date; + +@Data +public class ProPropRecycleBinVO { + @Schema(description = "规格值id") + private Long id; + + /** + * 属性规格名称 + */ + private String propValue; + /** + * 关联规格属性id + */ + private Long propId; + + /** + * 还剩多少天 + */ + private Long remainingDays; + /** + * 删除时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date deleteTime; +} diff --git a/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/sku/SkuRecycleBinVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/sku/SkuRecycleBinVO.java index f1c14fb..71f5762 100644 --- a/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/sku/SkuRecycleBinVO.java +++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/sku/SkuRecycleBinVO.java @@ -12,9 +12,13 @@ public class SkuRecycleBinVO { private Long skuId; /** - * 是否显示失效规格值 0否1是 + * 属性规格名称 */ private String properties; + /** + * 是否显示失效规格值 0否1是 + */ + private String skuName; /** * 还剩多少天 diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdController.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdController.java index 0dc1f66..93a7716 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdController.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdController.java @@ -54,8 +54,8 @@ public class ProdController { @PostMapping("/uptateProdService") @Operation(summary = "修改商品服务配置") @PermitAll - public CommonResult uptateProdService(@Valid @RequestBody ProdServiceVO prodServiceVO) { - prodService.uptateProdService(prodServiceVO); + public CommonResult uptateProdService(@Valid @RequestBody ProdServiceInfoVO prodServiceInfoVO) { + prodService.uptateProdService(prodServiceInfoVO); return success(true); } @@ -114,7 +114,7 @@ public class ProdController { ProdDO prod = new ProdDO(); prod.setProdId(id); prod.setStatus(status); - prodMapper.updateBatch(prod); + prodMapper.updateById(prod); } return success(true); } diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/SkuController.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/SkuController.java index 101f470..beb7461 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/SkuController.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/SkuController.java @@ -9,6 +9,8 @@ import com.tashow.cloud.product.service.ProdExtendService; import com.tashow.cloud.product.service.ProdPropService; import com.tashow.cloud.product.service.ProdPropValueService; import com.tashow.cloud.product.service.SkuService; +import com.tashow.cloud.productapi.api.product.vo.prodpropvalue.ProPageReqVO; +import com.tashow.cloud.productapi.api.product.vo.prodpropvalue.ProPropRecycleBinVO; import com.tashow.cloud.productapi.api.product.vo.sku.*; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -76,6 +78,18 @@ public class SkuController { return success(skuService.getSKuPropList(prodId)); } + + @PermitAll + @GetMapping("/getPropRecycleBinList") + @Operation(summary = "获取规格回收站") + public CommonResult> getSKuPropRecycleBinList(ProPageReqVO proPageReqVO) { + PageResult pageResult = skuService.getSKuPropRecycleBinList(proPageReqVO); + return success(pageResult); + } + + + + @PutMapping("/deleteProp") @Operation(summary = "删除规格值") @PermitAll diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdPropValueMapper.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdPropValueMapper.java index 3c06500..461543d 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdPropValueMapper.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdPropValueMapper.java @@ -2,10 +2,14 @@ package com.tashow.cloud.product.mapper; import java.util.*; +import com.baomidou.mybatisplus.core.metadata.IPage; +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.productapi.api.product.dto.ProdPropValueDO; +import com.tashow.cloud.productapi.api.product.vo.prodpropvalue.ProPropRecycleBinVO; +import com.tashow.cloud.productapi.api.product.vo.sku.SkuRecycleBinVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -34,4 +38,6 @@ public interface ProdPropValueMapper extends BaseMapperX { List selectRestoreProp(@Param("prodId") Long prodId); + IPage getSKuPropRecycleBinList(Page page, @Param("prodId") Long prodId,@Param("propValue")String propValue); + } \ No newline at end of file diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/SkuMapper.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/SkuMapper.java index f999bfd..4791ae5 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/SkuMapper.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/SkuMapper.java @@ -31,4 +31,9 @@ public interface SkuMapper extends BaseMapperX { int deleteBySkuId( @Param("skuId")Long skuId); void batchSkuDeleted(@Param("ids") List ids); + + void updateSkuDeleted(@Param("skuId") Long skuId); + + + List getskuListBySkuIds( @Param("ids")List ids); } \ 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 13f3d45..ef875d1 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 @@ -39,7 +39,7 @@ public interface ProdService { * @param prodServiceVO 创建信息 * @return 编号 */ - void uptateProdService(@Valid ProdServiceVO prodServiceVO); + void uptateProdService(@Valid ProdServiceInfoVO prodServiceInfoVO); diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/SkuService.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/SkuService.java index 05ff1bc..24ba4c1 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/SkuService.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/SkuService.java @@ -3,6 +3,8 @@ package com.tashow.cloud.product.service; import java.util.*; import com.tashow.cloud.productapi.api.product.dto.*; +import com.tashow.cloud.productapi.api.product.vo.prodpropvalue.ProPageReqVO; +import com.tashow.cloud.productapi.api.product.vo.prodpropvalue.ProPropRecycleBinVO; import com.tashow.cloud.productapi.api.product.vo.sku.*; import jakarta.validation.*; import com.tashow.cloud.common.pojo.PageResult; @@ -74,6 +76,7 @@ public interface SkuService { SkuPropInfoVO getSKuPropList(Long prodId); + PageResult getSKuPropRecycleBinList(ProPageReqVO proPageReqVO); /** * 删除单品SKU * 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 a49d82e..d9a13f3 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 @@ -13,6 +13,7 @@ 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.ProdReservationInfoReqVO; 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; @@ -178,7 +179,7 @@ public class ProdServiceImpl implements ProdService { @Override @Transactional - public void uptateProdService(ProdServiceVO prodServiceVO) { + public void uptateProdService(ProdServiceInfoVO prodServiceVO) { ProdDO prod = BeanUtils.toBean(prodServiceVO, ProdDO.class); //服务区域设置 @@ -237,7 +238,7 @@ public class ProdServiceImpl implements ProdService { .eq(ProdReservationConfigDO::getProdId, prodServiceVO.getProdId())); if (reservationConfig == null) { prod.setReservationSwitch(BaseEnum.YES_ONE.getKey()); - ProdReservationInfoVO prodReservationInfoVO = prodServiceVO.getProdReservationConfig(); + ProdReservationInfoReqVO prodReservationInfoVO = prodServiceVO.getProdReservationConfig(); ProdReservationConfigDO prodReservationConfigDO = BeanUtils.toBean(prodReservationInfoVO, ProdReservationConfigDO.class); prodReservationConfigDO.setProdId(prod.getProdId()); prodReservationConfigDO.setTimeBook(prodServiceVO.getProdReservationConfig().getTimeBook()); @@ -311,6 +312,7 @@ public class ProdServiceImpl implements ProdService { for (ProdAdditionalFeeBlackVO prodAdditionalFeeBlackVO : prodServiceVO.getProdReservationConfig().getProdReservationBlackList()) { ProdAdditionalFeeDatesDO prodAdditionalFeeDatesDO = BeanUtils.toBean(prodAdditionalFeeBlackVO, ProdAdditionalFeeDatesDO.class); prodAdditionalFeeDatesDO.setProdId(prod.getProdId()); + prodAdditionalFeeDatesDO.setType(3); prodAdditionalFeeDatesMapper.insert(prodAdditionalFeeDatesDO); } } diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/SkuServiceImpl.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/SkuServiceImpl.java index 03af5c2..440bc79 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/SkuServiceImpl.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/SkuServiceImpl.java @@ -12,6 +12,8 @@ import com.tashow.cloud.product.service.ProdExtendService; import com.tashow.cloud.product.service.ProdPropService; import com.tashow.cloud.product.service.ProdPropValueService; import com.tashow.cloud.product.service.SkuService; +import com.tashow.cloud.productapi.api.product.vo.prodpropvalue.ProPageReqVO; +import com.tashow.cloud.productapi.api.product.vo.prodpropvalue.ProPropRecycleBinVO; import com.tashow.cloud.productapi.api.product.vo.sku.*; import com.tashow.cloud.productapi.enums.BaseEnum; import com.tashow.cloud.productapi.enums.ErrorCodeConstants; @@ -483,6 +485,17 @@ public class SkuServiceImpl implements SkuService { return skuPropInfoVO; } + @Override + public PageResult getSKuPropRecycleBinList(ProPageReqVO proPageReqVO) { + IPage prodPageList = prodPropValueMapper.getSKuPropRecycleBinList(MyBatisUtils.buildPage(proPageReqVO),proPageReqVO.getProdId(), proPageReqVO.getPropValue()); + for (ProPropRecycleBinVO prodPage : prodPageList.getRecords()) { + if (prodPage.getDeleteTime() != null) { + prodPage.setRemainingDays(DateUtils.getRemainingDays(prodPage.getDeleteTime())); + } + } + return new PageResult<>(prodPageList.getRecords(), prodPageList.getTotal()); + } + /* @Override public SkuPropInfoVO getSKuPropList(Long prodId, Integer isExpire, Integer state) { if (prodId == null) { @@ -710,14 +723,13 @@ public class SkuServiceImpl implements SkuService { @Override @Transactional(rollbackFor = Exception.class) public void restoreSkuList(List ids) { - List skuList = skuMapper.selectByIds(ids); + List skuList = skuMapper.getskuListBySkuIds(ids); if (skuList.isEmpty()) { return; } Set currentlyUsedValues = new HashSet<>(); for (SkuDO sku : skuList) { - sku.setDeleted(BaseEnum.NO_ZERO.getKey()); - skuMapper.updateById(sku); + skuMapper.updateSkuDeleted(sku.getSkuId()); if (sku.getProperties() != null && !sku.getProperties().trim().isEmpty()) { String[] values = sku.getProperties().split(","); for (String v : values) { 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 8c9603b..9ade8cc 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 @@ -588,7 +588,7 @@ ) min_eri ON tp.prod_id = min_eri.prod_id where tp.deleted = 1 - and tp.prod_ame like concat('%', #{prodName}, '%') + and tp.prod_name like concat('%', #{prodName}, '%') AND tp.delete_time BETWEEN #{deleteTime[0]} AND #{deleteTime[1]} @@ -641,4 +641,7 @@ + + + \ No newline at end of file diff --git a/tashow-module/tashow-module-product/src/main/resources/mapper/product/ProdPropMapper.xml b/tashow-module/tashow-module-product/src/main/resources/mapper/product/ProdPropMapper.xml index 76f5c0d..f2b23af 100644 --- a/tashow-module/tashow-module-product/src/main/resources/mapper/product/ProdPropMapper.xml +++ b/tashow-module/tashow-module-product/src/main/resources/mapper/product/ProdPropMapper.xml @@ -11,4 +11,7 @@ + + + \ No newline at end of file diff --git a/tashow-module/tashow-module-product/src/main/resources/mapper/product/ProdPropValueMapper.xml b/tashow-module/tashow-module-product/src/main/resources/mapper/product/ProdPropValueMapper.xml index 0587e77..23d1a60 100644 --- a/tashow-module/tashow-module-product/src/main/resources/mapper/product/ProdPropValueMapper.xml +++ b/tashow-module/tashow-module-product/src/main/resources/mapper/product/ProdPropValueMapper.xml @@ -78,6 +78,19 @@ - + \ No newline at end of file diff --git a/tashow-module/tashow-module-product/src/main/resources/mapper/product/SkuMapper.xml b/tashow-module/tashow-module-product/src/main/resources/mapper/product/SkuMapper.xml index 4d34704..506e728 100644 --- a/tashow-module/tashow-module-product/src/main/resources/mapper/product/SkuMapper.xml +++ b/tashow-module/tashow-module-product/src/main/resources/mapper/product/SkuMapper.xml @@ -10,7 +10,7 @@ --> + SELECT * + FROM tz_sku + WHERE sku_id IN + + #{id} + + + + + + UPDATE tz_sku + SET deleted = 0 + WHERE sku_id = #{skuId} + \ No newline at end of file