From 39d070d638802114a5159d27074f77c81b372dd6 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Sat, 9 Aug 2025 14:21:43 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E5=85=A8=E7=BD=91=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=A0=E9=99=A4=E6=93=8D=E4=BD=9C=EF=BC=9B?= =?UTF-8?q?=E5=85=A8=E7=BD=91=E4=BA=A7=E5=93=81=E6=98=8E=E7=BB=86=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=93=8D=E4=BD=9C=E6=97=B6=E9=97=B4=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../all/controller/AllProductController.java | 12 ++++++++++ .../AllProductDetailController.java | 13 +++++++++++ .../sale/all/param/AllProductQueryParam.java | 8 +++++++ .../sale/all/service/IAllProductService.java | 6 +++++ .../service/impl/AllProductServiceImpl.java | 22 +++++++++++++++++++ .../sale/all/vo/AllProductDetailQueryVO.java | 9 ++++++++ 6 files changed, 70 insertions(+) diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/all/controller/AllProductController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/all/controller/AllProductController.java index 6cdd0392..a4b36258 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/all/controller/AllProductController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/all/controller/AllProductController.java @@ -126,6 +126,18 @@ public class AllProductController extends BaseController { return AjaxResult.success(iAllProductService.updateById(param)); } + /** + * 删除 + * + * @param pkId + * @return + */ + @DeleteMapping("/{pkId}") + public AjaxResult delete(@PathVariable Integer pkId) { + iAllProductService.deleteProduct(pkId, SecurityUtils.getUserId()); + return AjaxResult.success(); + } + /** * 修改库存数量 * diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/all/controller/AllProductDetailController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/all/controller/AllProductDetailController.java index 9a9205cb..b103207b 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/all/controller/AllProductDetailController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/all/controller/AllProductDetailController.java @@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.hzs.common.core.enums.EProductSource; +import com.hzs.common.core.utils.DateUtils; import com.hzs.common.core.utils.StringUtils; import com.hzs.common.core.utils.poi.ExcelUtil; import com.hzs.common.core.web.controller.BaseController; @@ -49,6 +50,12 @@ public class AllProductDetailController extends BaseController { if (StringUtils.isNotEmpty(param.getOrderCode())) { queryWrapper.like(AllProductDetail::getOrderCode, param.getOrderCode()); } + if (StringUtils.isNotEmpty(param.getStartDate())) { + queryWrapper.ge(AllProductDetail::getCreationTime, DateUtils.getStartTime(DateUtils.parseDateOne(param.getStartDate(), DateUtils.YAMMER))); + } + if (StringUtils.isNotEmpty(param.getEndDate())) { + queryWrapper.le(AllProductDetail::getCreationTime, DateUtils.getEndTime(DateUtils.parseDateOne(param.getEndDate(), DateUtils.YAMMER))); + } queryWrapper.orderByDesc(AllProductDetail::getCreationTime); List productList = iAllProductDetailService.list(queryWrapper); @@ -82,6 +89,12 @@ public class AllProductDetailController extends BaseController { if (StringUtils.isNotEmpty(param.getOrderCode())) { queryWrapper.like(AllProductDetail::getOrderCode, param.getOrderCode()); } + if (StringUtils.isNotEmpty(param.getStartDate())) { + queryWrapper.ge(AllProductDetail::getCreationTime, DateUtils.getStartTime(DateUtils.parseDateOne(param.getStartDate(), DateUtils.YAMMER))); + } + if (StringUtils.isNotEmpty(param.getEndDate())) { + queryWrapper.le(AllProductDetail::getCreationTime, DateUtils.getEndTime(DateUtils.parseDateOne(param.getEndDate(), DateUtils.YAMMER))); + } queryWrapper.orderByDesc(AllProductDetail::getCreationTime); List productList = iAllProductDetailService.list(queryWrapper); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/all/param/AllProductQueryParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/all/param/AllProductQueryParam.java index d994af0c..52a8290d 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/all/param/AllProductQueryParam.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/all/param/AllProductQueryParam.java @@ -27,5 +27,13 @@ public class AllProductQueryParam { * 来源订单号 */ private String orderCode; + /** + * 开始时间 + */ + private String startDate; + /** + * 结束时间 + */ + private String endDate; } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/all/service/IAllProductService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/all/service/IAllProductService.java index 26c9036b..046cb407 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/all/service/IAllProductService.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/all/service/IAllProductService.java @@ -15,4 +15,10 @@ public interface IAllProductService extends IService { */ void changeInventory(AllProduct param); + /** + * 删除产品 + * @param pkId + */ + void deleteProduct(Integer pkId, Long userId); + } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/all/service/impl/AllProductServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/all/service/impl/AllProductServiceImpl.java index 23d4372f..f1507f95 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/all/service/impl/AllProductServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/all/service/impl/AllProductServiceImpl.java @@ -1,6 +1,8 @@ package com.hzs.sale.all.service.impl; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.hzs.common.core.enums.EDelFlag; import com.hzs.common.core.enums.EProductSource; import com.hzs.common.domain.sale.all.AllProduct; import com.hzs.common.domain.sale.all.AllProductDetail; @@ -11,6 +13,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.Date; + /** * 全系统产品 服务实现类 */ @@ -34,4 +38,22 @@ public class AllProductServiceImpl extends ServiceImpllambdaUpdate() + .eq(AllProduct::getPkId, pkId) + .set(AllProduct::getDelFlag, EDelFlag.DELETE.getValue()) + .set(AllProduct::getPkModified, userId) + .set(AllProduct::getModifiedTime, new Date()) + ); + + iAllProductDetailService.update(Wrappers.lambdaUpdate() + .eq(AllProductDetail::getPkAllProduct, pkId) + .set(AllProductDetail::getDelFlag, EDelFlag.DELETE.getValue()) + .set(AllProductDetail::getPkModified, userId) + .set(AllProductDetail::getModifiedTime, new Date()) + ); + } + } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/all/vo/AllProductDetailQueryVO.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/all/vo/AllProductDetailQueryVO.java index ba30c0ac..6729641b 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/all/vo/AllProductDetailQueryVO.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/all/vo/AllProductDetailQueryVO.java @@ -1,9 +1,11 @@ package com.hzs.sale.all.vo; +import com.fasterxml.jackson.annotation.JsonFormat; import com.hzs.common.core.annotation.Excel; import lombok.Data; import java.io.Serializable; +import java.util.Date; @Data public class AllProductDetailQueryVO implements Serializable { @@ -33,4 +35,11 @@ public class AllProductDetailQueryVO implements Serializable { @Excel(name = "变动说明") private String remark; + /** + * 创建时间 + */ + @Excel(name = "创建时间", dateFormat = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date creationTime; + }