From c20c9c54afbf7998f1031cfe379a31821630179a Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Tue, 24 Sep 2024 16:09:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=20=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E8=AD=A6=E6=88=92=E7=BA=BF=20=E5=BF=AB=E6=8D=B7=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=20=E5=95=86=E5=93=81=E9=80=80=E6=AC=BE=E9=80=80?= =?UTF-8?q?=E5=9B=9E=E5=BA=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/ysk/cashier/dto/product/TbProductDto.java | 6 ++++++ .../main/java/cn/ysk/cashier/pojo/product/TbProduct.java | 9 ++++++++- .../service/impl/productimpl/StockServiceImpl.java | 7 +++++++ .../src/main/java/cn/ysk/cashier/vo/TbProductNewVo.java | 9 +++++++++ .../src/main/java/cn/ysk/cashier/vo/TbProductVo.java | 8 ++++++++ 5 files changed, 38 insertions(+), 1 deletion(-) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductDto.java index e8941726..cc358958 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductDto.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductDto.java @@ -215,6 +215,12 @@ public class TbProductDto implements Serializable { private Integer stockNumber; + private Integer isGrounding = 1; + + private Integer isRefundStock = 1; + + private Integer warnLine = 0; + /** * 团购卷分类Id */ diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProduct.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProduct.java index 52b8e2a1..2ad7c706 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProduct.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProduct.java @@ -320,11 +320,18 @@ public class TbProduct implements Serializable { @ApiModelProperty("库存数量") private Integer stockNumber = 0; - @Column(name = "is_grounding") @ApiModelProperty("上下架") private Integer isGrounding = 1; + @Column(name = "is_refund_stock") + @ApiModelProperty("退款是否退回库存") + private Integer isRefundStock = 1; + + @Column(name = "warn_line") + @ApiModelProperty("库存警戒线") + private Integer warnLine = 0; + public void copy(TbProduct source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/StockServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/StockServiceImpl.java index 93554599..c0dd7e49 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/StockServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/StockServiceImpl.java @@ -400,6 +400,13 @@ public class StockServiceImpl implements StockService { tbProductRepository.upLowPrice(product.getId(),new BigDecimal(updateValueVO.getValue())); tbProductSkuRepository.upSalePrice(product.getId(),new BigDecimal(updateValueVO.getValue())); break; + case "refundStock"://商品 暂停销售 + if (!"0".equals(updateValueVO.getValue()) && !"1".equals(updateValueVO.getValue())) { + throw new BadRequestException("无效值"); + } + sqlQuery.append(" set is_refund_stock = ").append(updateValueVO.getValue()); + description.append(" 修改为" + ("0".equals(updateValueVO.getValue()) ? "退款不退回库存":"退款退回库存")); + break; // case "stock"://库存开关 // if (!"0".equals(updateValueVO.getValue()) && !"1".equals(updateValueVO.getValue())) { // throw new BadRequestException("无效值"); diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/vo/TbProductNewVo.java b/eladmin-system/src/main/java/cn/ysk/cashier/vo/TbProductNewVo.java index b9998421..f7c44847 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/vo/TbProductNewVo.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/vo/TbProductNewVo.java @@ -2,8 +2,10 @@ package cn.ysk.cashier.vo; import cn.ysk.cashier.cons.domain.ViewConSku; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.persistence.Column; import java.io.Serializable; import java.math.BigDecimal; import java.sql.Timestamp; @@ -38,6 +40,13 @@ public class TbProductNewVo { private List conInfos; private List skuList = new ArrayList<>(); + + //退款是否退回库存 + private Integer isRefundStock = 1; + + //库存警戒线 + private Integer warnLine = 0; + //排序 private Integer sort; diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/vo/TbProductVo.java b/eladmin-system/src/main/java/cn/ysk/cashier/vo/TbProductVo.java index 034b542b..70d11cea 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/vo/TbProductVo.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/vo/TbProductVo.java @@ -5,9 +5,11 @@ import cn.ysk.cashier.dto.TbPlatformDictDto; import cn.ysk.cashier.dto.shop.TbCouponCategoryDto; import cn.ysk.cashier.pojo.shop.TbPurchaseNotice; import com.alibaba.fastjson.JSONArray; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import cn.ysk.cashier.pojo.product.TbProductSku; +import javax.persistence.Column; import javax.validation.constraints.NotNull; import java.math.BigDecimal; import java.util.ArrayList; @@ -222,6 +224,12 @@ public class TbProductVo { private BigDecimal maxPrice; + private Integer isGrounding = 1; + + private Integer isRefundStock = 1; + + private Integer warnLine = 0; + private List conInfos; private TbPurchaseNotice notices=new TbPurchaseNotice();