diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/CategoryController.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/CategoryController.java similarity index 84% rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/CategoryController.java rename to tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/CategoryController.java index 932b9bd..691d628 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/CategoryController.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/CategoryController.java @@ -1,37 +1,22 @@ -package com.tashow.cloud.product.controller; +package com.tashow.cloud.product.controller.admin; -import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.tashow.cloud.product.dto.CategoryDO; -import com.tashow.cloud.product.dto.ProdPropDO; -import com.tashow.cloud.product.service.CategoryService; -import com.tashow.cloud.product.vo.category.*; -import com.tashow.cloud.productapi.enums.ProdPropRule; -import jakarta.annotation.security.PermitAll; -import org.springframework.web.bind.annotation.*; -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; - -import jakarta.validation.constraints.*; -import jakarta.validation.*; -import jakarta.servlet.http.*; -import java.util.*; -import java.io.IOException; - -import com.tashow.cloud.common.pojo.PageParam; -import com.tashow.cloud.common.pojo.PageResult; import com.tashow.cloud.common.pojo.CommonResult; -import com.tashow.cloud.common.util.object.BeanUtils; +import com.tashow.cloud.product.dto.CategoryDO; +import com.tashow.cloud.product.service.CategoryService; +import com.tashow.cloud.product.vo.category.CategorySaveReqVO; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import jakarta.annotation.security.PermitAll; +import jakarta.validation.Valid; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + import static com.tashow.cloud.common.pojo.CommonResult.success; - -import com.tashow.cloud.web.apilog.core.annotation.ApiAccessLog; -import static com.tashow.cloud.web.apilog.core.enums.OperateTypeEnum.*; - @Tag(name = "管理后台 - 产品类目") @RestController @RequestMapping("/category") diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/ProdAdditionalFeeDatesController.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdAdditionalFeeDatesController.java similarity index 96% rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/ProdAdditionalFeeDatesController.java rename to tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdAdditionalFeeDatesController.java index 4776e21..9e859a6 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/ProdAdditionalFeeDatesController.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdAdditionalFeeDatesController.java @@ -1,34 +1,31 @@ -package com.tashow.cloud.product.controller; +package com.tashow.cloud.product.controller.admin; +import com.tashow.cloud.common.pojo.CommonResult; +import com.tashow.cloud.common.pojo.PageParam; +import com.tashow.cloud.common.pojo.PageResult; +import com.tashow.cloud.common.util.object.BeanUtils; +import com.tashow.cloud.excel.excel.core.util.ExcelUtils; import com.tashow.cloud.product.dto.ProdAdditionalFeeDatesDO; import com.tashow.cloud.product.service.ProdAdditionalFeeDatesService; import com.tashow.cloud.product.vo.prodadditionalfeedates.ProdAdditionalFeeDatesPageReqVO; import com.tashow.cloud.product.vo.prodadditionalfeedates.ProdAdditionalFeeDatesRespVO; import com.tashow.cloud.product.vo.prodadditionalfeedates.ProdAdditionalFeeDatesSaveReqVO; -import org.springframework.web.bind.annotation.*; -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; - -import jakarta.validation.constraints.*; -import jakarta.validation.*; -import jakarta.servlet.http.*; -import java.util.*; -import java.io.IOException; - -import com.tashow.cloud.common.pojo.PageParam; -import com.tashow.cloud.common.pojo.PageResult; -import com.tashow.cloud.common.pojo.CommonResult; -import com.tashow.cloud.common.util.object.BeanUtils; -import static com.tashow.cloud.common.pojo.CommonResult.success; - -import com.tashow.cloud.excel.excel.core.util.ExcelUtils; - import com.tashow.cloud.web.apilog.core.annotation.ApiAccessLog; -import static com.tashow.cloud.web.apilog.core.enums.OperateTypeEnum.*; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.io.IOException; +import java.util.List; + +import static com.tashow.cloud.common.pojo.CommonResult.success; +import static com.tashow.cloud.web.apilog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 特殊日期附加费用规则") diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/ProdAdditionalFeePeriodsController.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdAdditionalFeePeriodsController.java similarity index 96% rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/ProdAdditionalFeePeriodsController.java rename to tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdAdditionalFeePeriodsController.java index d36789f..d2dc03e 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/ProdAdditionalFeePeriodsController.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdAdditionalFeePeriodsController.java @@ -1,34 +1,31 @@ -package com.tashow.cloud.product.controller; +package com.tashow.cloud.product.controller.admin; +import com.tashow.cloud.common.pojo.CommonResult; +import com.tashow.cloud.common.pojo.PageParam; +import com.tashow.cloud.common.pojo.PageResult; +import com.tashow.cloud.common.util.object.BeanUtils; +import com.tashow.cloud.excel.excel.core.util.ExcelUtils; import com.tashow.cloud.product.dto.ProdAdditionalFeePeriodsDO; import com.tashow.cloud.product.service.ProdAdditionalFeePeriodsService; import com.tashow.cloud.product.vo.prodadditionalfeeperiods.ProdAdditionalFeePeriodsPageReqVO; import com.tashow.cloud.product.vo.prodadditionalfeeperiods.ProdAdditionalFeePeriodsRespVO; import com.tashow.cloud.product.vo.prodadditionalfeeperiods.ProdAdditionalFeePeriodsSaveReqVO; -import org.springframework.web.bind.annotation.*; -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; - -import jakarta.validation.constraints.*; -import jakarta.validation.*; -import jakarta.servlet.http.*; -import java.util.*; -import java.io.IOException; - -import com.tashow.cloud.common.pojo.PageParam; -import com.tashow.cloud.common.pojo.PageResult; -import com.tashow.cloud.common.pojo.CommonResult; -import com.tashow.cloud.common.util.object.BeanUtils; -import static com.tashow.cloud.common.pojo.CommonResult.success; - -import com.tashow.cloud.excel.excel.core.util.ExcelUtils; - import com.tashow.cloud.web.apilog.core.annotation.ApiAccessLog; -import static com.tashow.cloud.web.apilog.core.enums.OperateTypeEnum.*; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.io.IOException; +import java.util.List; + +import static com.tashow.cloud.common.pojo.CommonResult.success; +import static com.tashow.cloud.web.apilog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 特殊时段附加费用规则") @RestController 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/admin/ProdController.java similarity index 86% rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/ProdController.java rename to tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdController.java index 31f232b..3b3afe5 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/admin/ProdController.java @@ -1,28 +1,22 @@ -package com.tashow.cloud.product.controller; +package com.tashow.cloud.product.controller.admin; -import com.tashow.cloud.product.dto.ProdDO; -import com.tashow.cloud.product.vo.prod.*; -import jakarta.annotation.security.PermitAll; -import org.springframework.web.bind.annotation.*; -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; -import jakarta.validation.constraints.*; -import jakarta.validation.*; -import jakarta.servlet.http.*; -import java.util.*; -import java.io.IOException; -import com.tashow.cloud.common.pojo.PageParam; -import com.tashow.cloud.common.pojo.PageResult; import com.tashow.cloud.common.pojo.CommonResult; -import com.tashow.cloud.common.util.object.BeanUtils; -import static com.tashow.cloud.common.pojo.CommonResult.success; -import com.tashow.cloud.web.apilog.core.annotation.ApiAccessLog; -import static com.tashow.cloud.web.apilog.core.enums.OperateTypeEnum.*; +import com.tashow.cloud.common.pojo.PageResult; +import com.tashow.cloud.product.dto.ProdDO; import com.tashow.cloud.product.service.ProdService; +import com.tashow.cloud.product.vo.prod.ProdPageReqVO; +import com.tashow.cloud.product.vo.prod.ProdSaveReqVO; +import com.tashow.cloud.product.vo.prod.ProdServiceVO; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import jakarta.annotation.security.PermitAll; +import jakarta.validation.Valid; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import static com.tashow.cloud.common.pojo.CommonResult.success; @Tag(name = "管理后台 - 商品") @RestController diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/ProdEmergencyResponseController.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdEmergencyResponseController.java similarity index 96% rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/ProdEmergencyResponseController.java rename to tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdEmergencyResponseController.java index 0909dc0..3c1e133 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/ProdEmergencyResponseController.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdEmergencyResponseController.java @@ -1,34 +1,31 @@ -package com.tashow.cloud.product.controller; +package com.tashow.cloud.product.controller.admin; +import com.tashow.cloud.common.pojo.CommonResult; +import com.tashow.cloud.common.pojo.PageParam; +import com.tashow.cloud.common.pojo.PageResult; +import com.tashow.cloud.common.util.object.BeanUtils; +import com.tashow.cloud.excel.excel.core.util.ExcelUtils; import com.tashow.cloud.product.dto.ProdEmergencyResponseDO; import com.tashow.cloud.product.service.ProdEmergencyResponseService; import com.tashow.cloud.product.vo.prodemergencyresponse.ProdEmergencyResponsePageReqVO; import com.tashow.cloud.product.vo.prodemergencyresponse.ProdEmergencyResponseRespVO; import com.tashow.cloud.product.vo.prodemergencyresponse.ProdEmergencyResponseSaveReqVO; -import org.springframework.web.bind.annotation.*; -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; - -import jakarta.validation.constraints.*; -import jakarta.validation.*; -import jakarta.servlet.http.*; -import java.util.*; -import java.io.IOException; - -import com.tashow.cloud.common.pojo.PageParam; -import com.tashow.cloud.common.pojo.PageResult; -import com.tashow.cloud.common.pojo.CommonResult; -import com.tashow.cloud.common.util.object.BeanUtils; -import static com.tashow.cloud.common.pojo.CommonResult.success; - -import com.tashow.cloud.excel.excel.core.util.ExcelUtils; - import com.tashow.cloud.web.apilog.core.annotation.ApiAccessLog; -import static com.tashow.cloud.web.apilog.core.enums.OperateTypeEnum.*; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.io.IOException; +import java.util.List; + +import static com.tashow.cloud.common.pojo.CommonResult.success; +import static com.tashow.cloud.web.apilog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 商品紧急响应服务设置") diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/ProdEmergencyResponseIntervalsController.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdEmergencyResponseIntervalsController.java similarity index 96% rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/ProdEmergencyResponseIntervalsController.java rename to tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdEmergencyResponseIntervalsController.java index 8bfe543..38391ab 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/ProdEmergencyResponseIntervalsController.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdEmergencyResponseIntervalsController.java @@ -1,34 +1,31 @@ -package com.tashow.cloud.product.controller; +package com.tashow.cloud.product.controller.admin; +import com.tashow.cloud.common.pojo.CommonResult; +import com.tashow.cloud.common.pojo.PageParam; +import com.tashow.cloud.common.pojo.PageResult; +import com.tashow.cloud.common.util.object.BeanUtils; +import com.tashow.cloud.excel.excel.core.util.ExcelUtils; import com.tashow.cloud.product.dto.ProdEmergencyResponseIntervalsDO; import com.tashow.cloud.product.service.ProdEmergencyResponseIntervalsService; import com.tashow.cloud.product.vo.prodemergencyresponseintervals.ProdEmergencyResponseIntervalsPageReqVO; import com.tashow.cloud.product.vo.prodemergencyresponseintervals.ProdEmergencyResponseIntervalsRespVO; import com.tashow.cloud.product.vo.prodemergencyresponseintervals.ProdEmergencyResponseIntervalsSaveReqVO; -import org.springframework.web.bind.annotation.*; -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; - -import jakarta.validation.constraints.*; -import jakarta.validation.*; -import jakarta.servlet.http.*; -import java.util.*; -import java.io.IOException; - -import com.tashow.cloud.common.pojo.PageParam; -import com.tashow.cloud.common.pojo.PageResult; -import com.tashow.cloud.common.pojo.CommonResult; -import com.tashow.cloud.common.util.object.BeanUtils; -import static com.tashow.cloud.common.pojo.CommonResult.success; - -import com.tashow.cloud.excel.excel.core.util.ExcelUtils; - import com.tashow.cloud.web.apilog.core.annotation.ApiAccessLog; -import static com.tashow.cloud.web.apilog.core.enums.OperateTypeEnum.*; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.io.IOException; +import java.util.List; + +import static com.tashow.cloud.common.pojo.CommonResult.success; +import static com.tashow.cloud.web.apilog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 紧急响应时间区间设置") @RestController diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/ProdPropController.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdPropController.java similarity index 85% rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/ProdPropController.java rename to tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdPropController.java index bbb3f9d..78b147a 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/ProdPropController.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdPropController.java @@ -1,40 +1,27 @@ -package com.tashow.cloud.product.controller; +package com.tashow.cloud.product.controller.admin; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.tashow.cloud.common.pojo.CommonResult; import com.tashow.cloud.product.dto.ProdPropDO; import com.tashow.cloud.product.dto.ProdPropValueDO; import com.tashow.cloud.product.service.ProdPropService; import com.tashow.cloud.product.service.ProdPropValueService; -import com.tashow.cloud.product.vo.prodprop.ProdPropPageReqVO; import com.tashow.cloud.product.vo.prodprop.ProdPropRespVO; -import com.tashow.cloud.product.vo.prodprop.ProdPropSaveReqVO; import com.tashow.cloud.productapi.enums.ProdPropRule; -import org.springframework.web.bind.annotation.*; -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import jakarta.validation.Valid; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; -import jakarta.validation.constraints.*; -import jakarta.validation.*; -import jakarta.servlet.http.*; -import java.util.*; -import java.io.IOException; +import java.util.List; -import com.tashow.cloud.common.pojo.PageParam; -import com.tashow.cloud.common.pojo.PageResult; -import com.tashow.cloud.common.pojo.CommonResult; -import com.tashow.cloud.common.util.object.BeanUtils; import static com.tashow.cloud.common.pojo.CommonResult.success; -import com.tashow.cloud.excel.excel.core.util.ExcelUtils; - -import com.tashow.cloud.web.apilog.core.annotation.ApiAccessLog; -import static com.tashow.cloud.web.apilog.core.enums.OperateTypeEnum.*; - @Tag(name = "管理后台 - 商品属性") @RestController @RequestMapping("/tz/prod-prop") diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/ProdPropValueController.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdPropValueController.java similarity index 95% rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/ProdPropValueController.java rename to tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdPropValueController.java index e1be643..19866f3 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/ProdPropValueController.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdPropValueController.java @@ -1,34 +1,31 @@ -package com.tashow.cloud.product.controller; +package com.tashow.cloud.product.controller.admin; +import com.tashow.cloud.common.pojo.CommonResult; +import com.tashow.cloud.common.pojo.PageParam; +import com.tashow.cloud.common.pojo.PageResult; +import com.tashow.cloud.common.util.object.BeanUtils; +import com.tashow.cloud.excel.excel.core.util.ExcelUtils; import com.tashow.cloud.product.dto.ProdPropValueDO; import com.tashow.cloud.product.service.ProdPropValueService; import com.tashow.cloud.product.vo.prodpropvalue.ProdPropValuePageReqVO; import com.tashow.cloud.product.vo.prodpropvalue.ProdPropValueRespVO; import com.tashow.cloud.product.vo.prodpropvalue.ProdPropValueSaveReqVO; -import org.springframework.web.bind.annotation.*; -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; - -import jakarta.validation.constraints.*; -import jakarta.validation.*; -import jakarta.servlet.http.*; -import java.util.*; -import java.io.IOException; - -import com.tashow.cloud.common.pojo.PageParam; -import com.tashow.cloud.common.pojo.PageResult; -import com.tashow.cloud.common.pojo.CommonResult; -import com.tashow.cloud.common.util.object.BeanUtils; -import static com.tashow.cloud.common.pojo.CommonResult.success; - -import com.tashow.cloud.excel.excel.core.util.ExcelUtils; - import com.tashow.cloud.web.apilog.core.annotation.ApiAccessLog; -import static com.tashow.cloud.web.apilog.core.enums.OperateTypeEnum.*; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.io.IOException; +import java.util.List; + +import static com.tashow.cloud.common.pojo.CommonResult.success; +import static com.tashow.cloud.web.apilog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 属性规则") diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/ProdReservationConfigController.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdReservationConfigController.java similarity index 96% rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/ProdReservationConfigController.java rename to tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdReservationConfigController.java index 6bd64cf..3baac44 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/ProdReservationConfigController.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdReservationConfigController.java @@ -1,34 +1,31 @@ -package com.tashow.cloud.product.controller; +package com.tashow.cloud.product.controller.admin; +import com.tashow.cloud.common.pojo.CommonResult; +import com.tashow.cloud.common.pojo.PageParam; +import com.tashow.cloud.common.pojo.PageResult; +import com.tashow.cloud.common.util.object.BeanUtils; +import com.tashow.cloud.excel.excel.core.util.ExcelUtils; import com.tashow.cloud.product.dto.ProdReservationConfigDO; import com.tashow.cloud.product.service.ProdReservationConfigService; import com.tashow.cloud.product.vo.prodreservationconfig.ProdReservationConfigPageReqVO; import com.tashow.cloud.product.vo.prodreservationconfig.ProdReservationConfigRespVO; import com.tashow.cloud.product.vo.prodreservationconfig.ProdReservationConfigSaveReqVO; -import org.springframework.web.bind.annotation.*; -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; - -import jakarta.validation.constraints.*; -import jakarta.validation.*; -import jakarta.servlet.http.*; -import java.util.*; -import java.io.IOException; - -import com.tashow.cloud.common.pojo.PageParam; -import com.tashow.cloud.common.pojo.PageResult; -import com.tashow.cloud.common.pojo.CommonResult; -import com.tashow.cloud.common.util.object.BeanUtils; -import static com.tashow.cloud.common.pojo.CommonResult.success; - -import com.tashow.cloud.excel.excel.core.util.ExcelUtils; - import com.tashow.cloud.web.apilog.core.annotation.ApiAccessLog; -import static com.tashow.cloud.web.apilog.core.enums.OperateTypeEnum.*; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.io.IOException; +import java.util.List; + +import static com.tashow.cloud.common.pojo.CommonResult.success; +import static com.tashow.cloud.web.apilog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 商品预约配置") @RestController diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/ProdServiceAreaRelevanceController.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdServiceAreaRelevanceController.java similarity index 96% rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/ProdServiceAreaRelevanceController.java rename to tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdServiceAreaRelevanceController.java index 61ba834..5f66389 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/ProdServiceAreaRelevanceController.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdServiceAreaRelevanceController.java @@ -1,34 +1,31 @@ -package com.tashow.cloud.product.controller; +package com.tashow.cloud.product.controller.admin; +import com.tashow.cloud.common.pojo.CommonResult; +import com.tashow.cloud.common.pojo.PageParam; +import com.tashow.cloud.common.pojo.PageResult; +import com.tashow.cloud.common.util.object.BeanUtils; +import com.tashow.cloud.excel.excel.core.util.ExcelUtils; import com.tashow.cloud.product.dto.ProdServiceAreaRelevanceDO; import com.tashow.cloud.product.service.ProdServiceAreaRelevanceService; import com.tashow.cloud.product.vo.prodservicearearelevance.ProdServiceAreaRelevancePageReqVO; import com.tashow.cloud.product.vo.prodservicearearelevance.ProdServiceAreaRelevanceRespVO; import com.tashow.cloud.product.vo.prodservicearearelevance.ProdServiceAreaRelevanceSaveReqVO; -import org.springframework.web.bind.annotation.*; -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; - -import jakarta.validation.constraints.*; -import jakarta.validation.*; -import jakarta.servlet.http.*; -import java.util.*; -import java.io.IOException; - -import com.tashow.cloud.common.pojo.PageParam; -import com.tashow.cloud.common.pojo.PageResult; -import com.tashow.cloud.common.pojo.CommonResult; -import com.tashow.cloud.common.util.object.BeanUtils; -import static com.tashow.cloud.common.pojo.CommonResult.success; - -import com.tashow.cloud.excel.excel.core.util.ExcelUtils; - import com.tashow.cloud.web.apilog.core.annotation.ApiAccessLog; -import static com.tashow.cloud.web.apilog.core.enums.OperateTypeEnum.*; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.io.IOException; +import java.util.List; + +import static com.tashow.cloud.common.pojo.CommonResult.success; +import static com.tashow.cloud.web.apilog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 商品与服务区域关联") @RestController diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/ProdServiceAreasController.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdServiceAreasController.java similarity index 96% rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/ProdServiceAreasController.java rename to tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdServiceAreasController.java index 081c859..5af8b51 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/ProdServiceAreasController.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdServiceAreasController.java @@ -1,34 +1,31 @@ -package com.tashow.cloud.product.controller; +package com.tashow.cloud.product.controller.admin; +import com.tashow.cloud.common.pojo.CommonResult; +import com.tashow.cloud.common.pojo.PageParam; +import com.tashow.cloud.common.pojo.PageResult; +import com.tashow.cloud.common.util.object.BeanUtils; +import com.tashow.cloud.excel.excel.core.util.ExcelUtils; import com.tashow.cloud.product.dto.ProdServiceAreasDO; import com.tashow.cloud.product.service.ProdServiceAreasService; import com.tashow.cloud.product.vo.prodserviceareas.ProdServiceAreasPageReqVO; import com.tashow.cloud.product.vo.prodserviceareas.ProdServiceAreasRespVO; import com.tashow.cloud.product.vo.prodserviceareas.ProdServiceAreasSaveReqVO; -import org.springframework.web.bind.annotation.*; -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; - -import jakarta.validation.constraints.*; -import jakarta.validation.*; -import jakarta.servlet.http.*; -import java.util.*; -import java.io.IOException; - -import com.tashow.cloud.common.pojo.PageParam; -import com.tashow.cloud.common.pojo.PageResult; -import com.tashow.cloud.common.pojo.CommonResult; -import com.tashow.cloud.common.util.object.BeanUtils; -import static com.tashow.cloud.common.pojo.CommonResult.success; - -import com.tashow.cloud.excel.excel.core.util.ExcelUtils; - import com.tashow.cloud.web.apilog.core.annotation.ApiAccessLog; -import static com.tashow.cloud.web.apilog.core.enums.OperateTypeEnum.*; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.io.IOException; +import java.util.List; + +import static com.tashow.cloud.common.pojo.CommonResult.success; +import static com.tashow.cloud.web.apilog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 服务区域") @RestController diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/ProdServiceOverAreaRulesController.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdServiceOverAreaRulesController.java similarity index 96% rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/ProdServiceOverAreaRulesController.java rename to tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdServiceOverAreaRulesController.java index 1c65770..ef961d1 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/ProdServiceOverAreaRulesController.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdServiceOverAreaRulesController.java @@ -1,34 +1,31 @@ -package com.tashow.cloud.product.controller; +package com.tashow.cloud.product.controller.admin; +import com.tashow.cloud.common.pojo.CommonResult; +import com.tashow.cloud.common.pojo.PageParam; +import com.tashow.cloud.common.pojo.PageResult; +import com.tashow.cloud.common.util.object.BeanUtils; +import com.tashow.cloud.excel.excel.core.util.ExcelUtils; import com.tashow.cloud.product.dto.ProdServiceOverAreaRulesDO; import com.tashow.cloud.product.service.ProdServiceOverAreaRulesService; import com.tashow.cloud.product.vo.prodserviceoverarearules.ProdServiceOverAreaRulesPageReqVO; import com.tashow.cloud.product.vo.prodserviceoverarearules.ProdServiceOverAreaRulesRespVO; import com.tashow.cloud.product.vo.prodserviceoverarearules.ProdServiceOverAreaRulesSaveReqVO; -import org.springframework.web.bind.annotation.*; -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; - -import jakarta.validation.constraints.*; -import jakarta.validation.*; -import jakarta.servlet.http.*; -import java.util.*; -import java.io.IOException; - -import com.tashow.cloud.common.pojo.PageParam; -import com.tashow.cloud.common.pojo.PageResult; -import com.tashow.cloud.common.pojo.CommonResult; -import com.tashow.cloud.common.util.object.BeanUtils; -import static com.tashow.cloud.common.pojo.CommonResult.success; - -import com.tashow.cloud.excel.excel.core.util.ExcelUtils; - import com.tashow.cloud.web.apilog.core.annotation.ApiAccessLog; -import static com.tashow.cloud.web.apilog.core.enums.OperateTypeEnum.*; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.io.IOException; +import java.util.List; + +import static com.tashow.cloud.common.pojo.CommonResult.success; +import static com.tashow.cloud.web.apilog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 超区规则") diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/ProdTagsController.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdTagsController.java similarity index 95% rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/ProdTagsController.java rename to tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdTagsController.java index 2eece01..0d2aaea 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/ProdTagsController.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdTagsController.java @@ -1,34 +1,31 @@ -package com.tashow.cloud.product.controller; +package com.tashow.cloud.product.controller.admin; +import com.tashow.cloud.common.pojo.CommonResult; +import com.tashow.cloud.common.pojo.PageParam; +import com.tashow.cloud.common.pojo.PageResult; +import com.tashow.cloud.common.util.object.BeanUtils; +import com.tashow.cloud.excel.excel.core.util.ExcelUtils; import com.tashow.cloud.product.dto.ProdTagsDO; import com.tashow.cloud.product.service.ProdTagsService; import com.tashow.cloud.product.vo.prodtags.ProdTagsPageReqVO; import com.tashow.cloud.product.vo.prodtags.ProdTagsRespVO; import com.tashow.cloud.product.vo.prodtags.ProdTagsSaveReqVO; -import org.springframework.web.bind.annotation.*; -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; - -import jakarta.validation.constraints.*; -import jakarta.validation.*; -import jakarta.servlet.http.*; -import java.util.*; -import java.io.IOException; - -import com.tashow.cloud.common.pojo.PageParam; -import com.tashow.cloud.common.pojo.PageResult; -import com.tashow.cloud.common.pojo.CommonResult; -import com.tashow.cloud.common.util.object.BeanUtils; -import static com.tashow.cloud.common.pojo.CommonResult.success; - -import com.tashow.cloud.excel.excel.core.util.ExcelUtils; - import com.tashow.cloud.web.apilog.core.annotation.ApiAccessLog; -import static com.tashow.cloud.web.apilog.core.enums.OperateTypeEnum.*; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.io.IOException; +import java.util.List; + +import static com.tashow.cloud.common.pojo.CommonResult.success; +import static com.tashow.cloud.web.apilog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 商品和标签管理") @RestController diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/ProdWeightRangePricesController.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdWeightRangePricesController.java similarity index 96% rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/ProdWeightRangePricesController.java rename to tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdWeightRangePricesController.java index a3cd582..274dcd9 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/ProdWeightRangePricesController.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdWeightRangePricesController.java @@ -1,34 +1,31 @@ -package com.tashow.cloud.product.controller; +package com.tashow.cloud.product.controller.admin; +import com.tashow.cloud.common.pojo.CommonResult; +import com.tashow.cloud.common.pojo.PageParam; +import com.tashow.cloud.common.pojo.PageResult; +import com.tashow.cloud.common.util.object.BeanUtils; +import com.tashow.cloud.excel.excel.core.util.ExcelUtils; import com.tashow.cloud.product.dto.ProdWeightRangePricesDO; import com.tashow.cloud.product.service.ProdWeightRangePricesService; import com.tashow.cloud.product.vo.prodweightrangeprices.ProdWeightRangePricesPageReqVO; import com.tashow.cloud.product.vo.prodweightrangeprices.ProdWeightRangePricesRespVO; import com.tashow.cloud.product.vo.prodweightrangeprices.ProdWeightRangePricesSaveReqVO; -import org.springframework.web.bind.annotation.*; -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; - -import jakarta.validation.constraints.*; -import jakarta.validation.*; -import jakarta.servlet.http.*; -import java.util.*; -import java.io.IOException; - -import com.tashow.cloud.common.pojo.PageParam; -import com.tashow.cloud.common.pojo.PageResult; -import com.tashow.cloud.common.pojo.CommonResult; -import com.tashow.cloud.common.util.object.BeanUtils; -import static com.tashow.cloud.common.pojo.CommonResult.success; - -import com.tashow.cloud.excel.excel.core.util.ExcelUtils; - import com.tashow.cloud.web.apilog.core.annotation.ApiAccessLog; -import static com.tashow.cloud.web.apilog.core.enums.OperateTypeEnum.*; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.io.IOException; +import java.util.List; + +import static com.tashow.cloud.common.pojo.CommonResult.success; +import static com.tashow.cloud.web.apilog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 体重区间价格") @RestController diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/ProductOrderLimitController.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProductOrderLimitController.java similarity index 96% rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/ProductOrderLimitController.java rename to tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProductOrderLimitController.java index 7b57e4c..ea67554 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/ProductOrderLimitController.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProductOrderLimitController.java @@ -1,34 +1,31 @@ -package com.tashow.cloud.product.controller; +package com.tashow.cloud.product.controller.admin; +import com.tashow.cloud.common.pojo.CommonResult; +import com.tashow.cloud.common.pojo.PageParam; +import com.tashow.cloud.common.pojo.PageResult; +import com.tashow.cloud.common.util.object.BeanUtils; +import com.tashow.cloud.excel.excel.core.util.ExcelUtils; import com.tashow.cloud.product.dto.ProductOrderLimitDO; import com.tashow.cloud.product.service.ProductOrderLimitService; import com.tashow.cloud.product.vo.productorderlimit.ProductOrderLimitPageReqVO; import com.tashow.cloud.product.vo.productorderlimit.ProductOrderLimitRespVO; import com.tashow.cloud.product.vo.productorderlimit.ProductOrderLimitSaveReqVO; -import org.springframework.web.bind.annotation.*; -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; - -import jakarta.validation.constraints.*; -import jakarta.validation.*; -import jakarta.servlet.http.*; -import java.util.*; -import java.io.IOException; - -import com.tashow.cloud.common.pojo.PageParam; -import com.tashow.cloud.common.pojo.PageResult; -import com.tashow.cloud.common.pojo.CommonResult; -import com.tashow.cloud.common.util.object.BeanUtils; -import static com.tashow.cloud.common.pojo.CommonResult.success; - -import com.tashow.cloud.excel.excel.core.util.ExcelUtils; - import com.tashow.cloud.web.apilog.core.annotation.ApiAccessLog; -import static com.tashow.cloud.web.apilog.core.enums.OperateTypeEnum.*; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.io.IOException; +import java.util.List; + +import static com.tashow.cloud.common.pojo.CommonResult.success; +import static com.tashow.cloud.web.apilog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 商品接单上限设置") diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/ShopDetailController.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ShopDetailController.java similarity index 95% rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/ShopDetailController.java rename to tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ShopDetailController.java index a28007e..5f97c1a 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/ShopDetailController.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ShopDetailController.java @@ -1,34 +1,31 @@ -package com.tashow.cloud.product.controller; +package com.tashow.cloud.product.controller.admin; +import com.tashow.cloud.common.pojo.CommonResult; +import com.tashow.cloud.common.pojo.PageParam; +import com.tashow.cloud.common.pojo.PageResult; +import com.tashow.cloud.common.util.object.BeanUtils; +import com.tashow.cloud.excel.excel.core.util.ExcelUtils; import com.tashow.cloud.product.dto.ShopDetailDO; import com.tashow.cloud.product.service.ShopDetailService; import com.tashow.cloud.product.vo.shopdetail.ShopDetailPageReqVO; import com.tashow.cloud.product.vo.shopdetail.ShopDetailRespVO; import com.tashow.cloud.product.vo.shopdetail.ShopDetailSaveReqVO; -import org.springframework.web.bind.annotation.*; -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; - -import jakarta.validation.constraints.*; -import jakarta.validation.*; -import jakarta.servlet.http.*; -import java.util.*; -import java.io.IOException; - -import com.tashow.cloud.common.pojo.PageParam; -import com.tashow.cloud.common.pojo.PageResult; -import com.tashow.cloud.common.pojo.CommonResult; -import com.tashow.cloud.common.util.object.BeanUtils; -import static com.tashow.cloud.common.pojo.CommonResult.success; - -import com.tashow.cloud.excel.excel.core.util.ExcelUtils; - import com.tashow.cloud.web.apilog.core.annotation.ApiAccessLog; -import static com.tashow.cloud.web.apilog.core.enums.OperateTypeEnum.*; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.io.IOException; +import java.util.List; + +import static com.tashow.cloud.common.pojo.CommonResult.success; +import static com.tashow.cloud.web.apilog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 店铺信息") @RestController diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/SkuController.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/SkuController.java similarity index 89% rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/SkuController.java rename to tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/SkuController.java index 32ee534..fb293f3 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/SkuController.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/SkuController.java @@ -1,46 +1,29 @@ -package com.tashow.cloud.product.controller; +package com.tashow.cloud.product.controller.admin; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.tashow.cloud.common.pojo.CommonResult; +import com.tashow.cloud.common.pojo.PageResult; +import com.tashow.cloud.common.util.object.BeanUtils; import com.tashow.cloud.product.dto.*; -import com.tashow.cloud.product.mapper.ProdExtendMapper; import com.tashow.cloud.product.mapper.SkuMapper; 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.product.vo.prod.ProdPageReqVO; -import com.tashow.cloud.product.vo.prod.ProdServiceVO; -import com.tashow.cloud.product.vo.prodprop.ProdPropRespVO; import com.tashow.cloud.product.vo.sku.*; -import com.tashow.cloud.productapi.enums.BaseEnum; -import com.tashow.cloud.productapi.enums.ProdPropRule; -import jakarta.annotation.security.PermitAll; -import org.springframework.web.bind.annotation.*; -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import jakarta.annotation.security.PermitAll; +import jakarta.validation.Valid; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import jakarta.validation.constraints.*; -import jakarta.validation.*; -import jakarta.servlet.http.*; -import java.util.*; -import java.io.IOException; +import java.util.Date; +import java.util.List; -import com.tashow.cloud.common.pojo.PageParam; -import com.tashow.cloud.common.pojo.PageResult; -import com.tashow.cloud.common.pojo.CommonResult; -import com.tashow.cloud.common.util.object.BeanUtils; import static com.tashow.cloud.common.pojo.CommonResult.success; -import com.tashow.cloud.excel.excel.core.util.ExcelUtils; - -import com.tashow.cloud.web.apilog.core.annotation.ApiAccessLog; -import static com.tashow.cloud.web.apilog.core.enums.OperateTypeEnum.*; - @Tag(name = "管理后台 - 单品SKU") @RestController @RequestMapping("/tz/sku") @@ -93,6 +76,13 @@ public class SkuController { return success(skuService.getSKuPropList(prodId)); } + @PutMapping("/deleteProp") + @Operation(summary = "删除规格值") + @PermitAll + public CommonResult deleteProp(@RequestParam("id") Long id) { + skuService.deleteProp(id); + return success(true); + } @DeleteMapping("/delete") @Operation(summary = "删除单品SKU") @@ -108,7 +98,13 @@ public class SkuController { @Parameter(name = "ids", description = "编号", required = true) @PermitAll public CommonResult deleteSkuList(@RequestParam("id") List ids) { - skuMapper.deleteByIds(ids); + for(Long id:ids){ + SkuDO sku = new SkuDO(); + sku.setSkuId(id); + sku.setDeleteTime(new Date()); + // 删除 + skuMapper.deleteById(sku); + } return success(true); } @@ -159,6 +155,14 @@ public class SkuController { return success(pageResult); } +/* @PermitAll + @GetMapping("/getSkuRecycleBinPageList") + @Operation(summary = "获得SKU回收站分页列表") + public CommonResult> getSkuRecycleBinPageList(@Valid SkuPageReqVO pageReqVO) { + PageResult pageResult = skuService.getSkuRecycleBinPageList(pageReqVO); + return success(pageResult); + }*/ + @PostMapping("/createSkuExtend") @Operation(summary = "创建sku扩展服务配置") diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/SkuServiceDeliverController.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/SkuServiceDeliverController.java similarity index 96% rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/SkuServiceDeliverController.java rename to tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/SkuServiceDeliverController.java index 87d4f84..70366c8 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/SkuServiceDeliverController.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/SkuServiceDeliverController.java @@ -1,34 +1,31 @@ -package com.tashow.cloud.product.controller; +package com.tashow.cloud.product.controller.admin; +import com.tashow.cloud.common.pojo.CommonResult; +import com.tashow.cloud.common.pojo.PageParam; +import com.tashow.cloud.common.pojo.PageResult; +import com.tashow.cloud.common.util.object.BeanUtils; +import com.tashow.cloud.excel.excel.core.util.ExcelUtils; import com.tashow.cloud.product.dto.SkuServiceDeliverDO; import com.tashow.cloud.product.service.SkuServiceDeliverService; import com.tashow.cloud.product.vo.skuservicedeliver.SkuServiceDeliverPageReqVO; import com.tashow.cloud.product.vo.skuservicedeliver.SkuServiceDeliverRespVO; import com.tashow.cloud.product.vo.skuservicedeliver.SkuServiceDeliverSaveReqVO; -import org.springframework.web.bind.annotation.*; -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; - -import jakarta.validation.constraints.*; -import jakarta.validation.*; -import jakarta.servlet.http.*; -import java.util.*; -import java.io.IOException; - -import com.tashow.cloud.common.pojo.PageParam; -import com.tashow.cloud.common.pojo.PageResult; -import com.tashow.cloud.common.pojo.CommonResult; -import com.tashow.cloud.common.util.object.BeanUtils; -import static com.tashow.cloud.common.pojo.CommonResult.success; - -import com.tashow.cloud.excel.excel.core.util.ExcelUtils; - import com.tashow.cloud.web.apilog.core.annotation.ApiAccessLog; -import static com.tashow.cloud.web.apilog.core.enums.OperateTypeEnum.*; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.io.IOException; +import java.util.List; + +import static com.tashow.cloud.common.pojo.CommonResult.success; +import static com.tashow.cloud.web.apilog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 服务交付方式") @RestController diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/SkuServiceDetailsController.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/SkuServiceDetailsController.java similarity index 96% rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/SkuServiceDetailsController.java rename to tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/SkuServiceDetailsController.java index f5c8020..58a876d 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/SkuServiceDetailsController.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/SkuServiceDetailsController.java @@ -1,34 +1,31 @@ -package com.tashow.cloud.product.controller; +package com.tashow.cloud.product.controller.admin; +import com.tashow.cloud.common.pojo.CommonResult; +import com.tashow.cloud.common.pojo.PageParam; +import com.tashow.cloud.common.pojo.PageResult; +import com.tashow.cloud.common.util.object.BeanUtils; +import com.tashow.cloud.excel.excel.core.util.ExcelUtils; import com.tashow.cloud.product.dto.SkuServiceDetailsDO; import com.tashow.cloud.product.service.SkuServiceDetailsService; import com.tashow.cloud.product.vo.skuservicedetails.SkuServiceDetailsPageReqVO; import com.tashow.cloud.product.vo.skuservicedetails.SkuServiceDetailsRespVO; import com.tashow.cloud.product.vo.skuservicedetails.SkuServiceDetailsSaveReqVO; -import org.springframework.web.bind.annotation.*; -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; - -import jakarta.validation.constraints.*; -import jakarta.validation.*; -import jakarta.servlet.http.*; -import java.util.*; -import java.io.IOException; - -import com.tashow.cloud.common.pojo.PageParam; -import com.tashow.cloud.common.pojo.PageResult; -import com.tashow.cloud.common.pojo.CommonResult; -import com.tashow.cloud.common.util.object.BeanUtils; -import static com.tashow.cloud.common.pojo.CommonResult.success; - -import com.tashow.cloud.excel.excel.core.util.ExcelUtils; - import com.tashow.cloud.web.apilog.core.annotation.ApiAccessLog; -import static com.tashow.cloud.web.apilog.core.enums.OperateTypeEnum.*; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.io.IOException; +import java.util.List; + +import static com.tashow.cloud.common.pojo.CommonResult.success; +import static com.tashow.cloud.web.apilog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 服务详情") @RestController diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/SkuServiceMaterialController.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/SkuServiceMaterialController.java similarity index 96% rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/SkuServiceMaterialController.java rename to tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/SkuServiceMaterialController.java index e5ec813..fc4d8d8 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/SkuServiceMaterialController.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/SkuServiceMaterialController.java @@ -1,34 +1,31 @@ -package com.tashow.cloud.product.controller; +package com.tashow.cloud.product.controller.admin; +import com.tashow.cloud.common.pojo.CommonResult; +import com.tashow.cloud.common.pojo.PageParam; +import com.tashow.cloud.common.pojo.PageResult; +import com.tashow.cloud.common.util.object.BeanUtils; +import com.tashow.cloud.excel.excel.core.util.ExcelUtils; import com.tashow.cloud.product.dto.SkuServiceMaterialDO; import com.tashow.cloud.product.service.SkuServiceMaterialService; import com.tashow.cloud.product.vo.skuservicematerial.SkuServiceMaterialPageReqVO; import com.tashow.cloud.product.vo.skuservicematerial.SkuServiceMaterialRespVO; import com.tashow.cloud.product.vo.skuservicematerial.SkuServiceMaterialSaveReqVO; -import org.springframework.web.bind.annotation.*; -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; - -import jakarta.validation.constraints.*; -import jakarta.validation.*; -import jakarta.servlet.http.*; -import java.util.*; -import java.io.IOException; - -import com.tashow.cloud.common.pojo.PageParam; -import com.tashow.cloud.common.pojo.PageResult; -import com.tashow.cloud.common.pojo.CommonResult; -import com.tashow.cloud.common.util.object.BeanUtils; -import static com.tashow.cloud.common.pojo.CommonResult.success; - -import com.tashow.cloud.excel.excel.core.util.ExcelUtils; - import com.tashow.cloud.web.apilog.core.annotation.ApiAccessLog; -import static com.tashow.cloud.web.apilog.core.enums.OperateTypeEnum.*; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.io.IOException; +import java.util.List; + +import static com.tashow.cloud.common.pojo.CommonResult.success; +import static com.tashow.cloud.web.apilog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 服务物料详情") diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/SkuServiceTransportController.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/SkuServiceTransportController.java similarity index 96% rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/SkuServiceTransportController.java rename to tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/SkuServiceTransportController.java index 85af9ae..d9dd273 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/SkuServiceTransportController.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/SkuServiceTransportController.java @@ -1,34 +1,31 @@ -package com.tashow.cloud.product.controller; +package com.tashow.cloud.product.controller.admin; +import com.tashow.cloud.common.pojo.CommonResult; +import com.tashow.cloud.common.pojo.PageParam; +import com.tashow.cloud.common.pojo.PageResult; +import com.tashow.cloud.common.util.object.BeanUtils; +import com.tashow.cloud.excel.excel.core.util.ExcelUtils; import com.tashow.cloud.product.dto.SkuServiceTransportDO; import com.tashow.cloud.product.service.SkuServiceTransportService; import com.tashow.cloud.product.vo.skuservicetransport.SkuServiceTransportPageReqVO; import com.tashow.cloud.product.vo.skuservicetransport.SkuServiceTransportRespVO; import com.tashow.cloud.product.vo.skuservicetransport.SkuServiceTransportSaveReqVO; -import org.springframework.web.bind.annotation.*; -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; - -import jakarta.validation.constraints.*; -import jakarta.validation.*; -import jakarta.servlet.http.*; -import java.util.*; -import java.io.IOException; - -import com.tashow.cloud.common.pojo.PageParam; -import com.tashow.cloud.common.pojo.PageResult; -import com.tashow.cloud.common.pojo.CommonResult; -import com.tashow.cloud.common.util.object.BeanUtils; -import static com.tashow.cloud.common.pojo.CommonResult.success; - -import com.tashow.cloud.excel.excel.core.util.ExcelUtils; - import com.tashow.cloud.web.apilog.core.annotation.ApiAccessLog; -import static com.tashow.cloud.web.apilog.core.enums.OperateTypeEnum.*; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.io.IOException; +import java.util.List; + +import static com.tashow.cloud.common.pojo.CommonResult.success; +import static com.tashow.cloud.web.apilog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 服务遗体运输") @RestController diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/SkuServicesFormController.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/SkuServicesFormController.java similarity index 96% rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/SkuServicesFormController.java rename to tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/SkuServicesFormController.java index c12a803..14c7ba5 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/SkuServicesFormController.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/SkuServicesFormController.java @@ -1,34 +1,31 @@ -package com.tashow.cloud.product.controller; +package com.tashow.cloud.product.controller.admin; +import com.tashow.cloud.common.pojo.CommonResult; +import com.tashow.cloud.common.pojo.PageParam; +import com.tashow.cloud.common.pojo.PageResult; +import com.tashow.cloud.common.util.object.BeanUtils; +import com.tashow.cloud.excel.excel.core.util.ExcelUtils; import com.tashow.cloud.product.dto.SkuServicesFormDO; import com.tashow.cloud.product.service.SkuServicesFormService; import com.tashow.cloud.product.vo.skuservicesform.SkuServicesFormPageReqVO; import com.tashow.cloud.product.vo.skuservicesform.SkuServicesFormRespVO; import com.tashow.cloud.product.vo.skuservicesform.SkuServicesFormSaveReqVO; -import org.springframework.web.bind.annotation.*; -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; - -import jakarta.validation.constraints.*; -import jakarta.validation.*; -import jakarta.servlet.http.*; -import java.util.*; -import java.io.IOException; - -import com.tashow.cloud.common.pojo.PageParam; -import com.tashow.cloud.common.pojo.PageResult; -import com.tashow.cloud.common.pojo.CommonResult; -import com.tashow.cloud.common.util.object.BeanUtils; -import static com.tashow.cloud.common.pojo.CommonResult.success; - -import com.tashow.cloud.excel.excel.core.util.ExcelUtils; - import com.tashow.cloud.web.apilog.core.annotation.ApiAccessLog; -import static com.tashow.cloud.web.apilog.core.enums.OperateTypeEnum.*; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.io.IOException; +import java.util.List; + +import static com.tashow.cloud.common.pojo.CommonResult.success; +import static com.tashow.cloud.web.apilog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 商品SKU扩展服务表单") @RestController diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/CategoryDO.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/CategoryDO.java index 4f9fef4..2fed06c 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/CategoryDO.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/CategoryDO.java @@ -35,6 +35,12 @@ public class CategoryDO extends BaseDO { * 父节点 */ private Long parentId; + + /** + * 父节名称 + */ + private String parentName; + /** * 产品类目名称 */ @@ -58,7 +64,7 @@ public class CategoryDO extends BaseDO { /** * 排序 */ - private Integer seq; + private Integer sort; /** * 默认是1，表示正常状态,0为下线状态 */ @@ -68,4 +74,6 @@ public class CategoryDO extends BaseDO { */ private Integer grade; + + } \ No newline at end of file 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 b879676..f388d73 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 @@ -166,5 +166,5 @@ public class SkuDO extends BaseDO { /** * 删除时间 */ - private LocalDateTime delete_time; + private Date deleteTime; } \ 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 43b2f10..691a05c 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 @@ -24,4 +24,7 @@ import org.apache.ibatis.annotations.Param; public interface SkuMapper extends BaseMapperX { IPage getSkuRecycleBinPageList(Page page, @Param("prodId") Long prodId, @Param("properties")String properties); + + List getSkuListByName( @Param("propertiesName")String propertiesName); + } \ No newline at end of file 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 b2e49f0..3cf540b 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 @@ -56,6 +56,14 @@ public interface SkuService { */ void updateProp(SkuPropVO skuPropVO); + /** + * 删除规格值 + * + * @param id 删除规格值 + */ + void deleteProp(Long id); + + SkuPropInfoVO getSKuPropList(Long prodId); 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 85e988d..9b3231e 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 @@ -404,9 +404,21 @@ public class SkuServiceImpl implements SkuService { skuMapper.updateBatch(skuListUpdate); } } - /* prodExtendMapper.updateByProdId(skuPropVO.getProdId(),skuPropVO.getIsDisable(),skuPropVO.getIsExpire()); + prodExtendMapper.updateByProdId(skuPropVO.getProdId(),skuPropVO.getIsDisable(),skuPropVO.getIsExpire()); //保存规格 - prodPropService.updateProdPropAndValues(skuPropVO);*/ + prodPropService.updateProdPropAndValues(skuPropVO); + } + + @Override + public void deleteProp(Long id) { + ProdPropValueDO prodPropValueDO =prodPropValueService.getById(id); + prodPropValueService.deleteProdPropValue(id); + List skuDOList = skuMapper.getSkuListByName(prodPropValueDO.getPropValue()); + for(SkuDO skuDO : skuDOList){ + if(skuDO.getProperties()!=null){ + String[] split = skuDO.getProperties().split(","); + } + } } @Override @@ -446,8 +458,11 @@ public class SkuServiceImpl implements SkuService { public void deleteSku(Long id) { // 校验存在 validateSkuExists(id); + SkuDO sku = new SkuDO(); + sku.setSkuId(id); + sku.setDeleteTime(new Date()); // 删除 - skuMapper.deleteById(id); + skuMapper.deleteById(sku); } private void validateSkuExists(Long id) { diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/category/CategoryPageReqVO.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/category/CategoryPageReqVO.java index 72630a4..5603b2f 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/category/CategoryPageReqVO.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/category/CategoryPageReqVO.java @@ -37,7 +37,7 @@ public class CategoryPageReqVO extends PageParam { private String tag; @Schema(description = "排序") - private Integer seq; + private Integer sort; @Schema(description = "默认是1，表示正常状态,0为下线状态", example = "1") private Integer status; diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/category/CategoryRespVO.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/category/CategoryRespVO.java index ac5eba5..b0c1d4d 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/category/CategoryRespVO.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/category/CategoryRespVO.java @@ -46,7 +46,7 @@ public class CategoryRespVO { @Schema(description = "排序", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("排序") - private Integer seq; + private Integer sort; @Schema(description = "默认是1，表示正常状态,0为下线状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") @ExcelProperty("默认是1，表示正常状态,0为下线状态") diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/category/CategorySaveReqVO.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/category/CategorySaveReqVO.java index d0fd931..84ef5c0 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/category/CategorySaveReqVO.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/category/CategorySaveReqVO.java @@ -19,6 +19,11 @@ public class CategorySaveReqVO { @NotNull(message = "父节点不能为空") private Long parentId; + /** + * 父节名称 + */ + private String parentName; + @Schema(description = "产品类目名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五") @NotEmpty(message = "产品类目名称不能为空") private String categoryName; @@ -36,7 +41,7 @@ public class CategorySaveReqVO { private String tag; @Schema(description = "排序", requiredMode = Schema.RequiredMode.REQUIRED) - private Integer seq; + private Integer sort; @Schema(description = "默认是1，表示正常状态,0为下线状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") private Integer status; 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 4d3670f..6dd292a 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 @@ -15,4 +15,13 @@ and properties like concat('%', #{properties}, '%') + + + + \ No newline at end of file