parent
81a4bfdf72
commit
c20c9c54af
|
|
@ -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
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -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));
|
||||
|
|
|
|||
|
|
@ -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("无效值");
|
||||
|
|
|
|||
|
|
@ -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<ViewConSku> conInfos;
|
||||
|
||||
private List<TbProductSkuVos> skuList = new ArrayList<>();
|
||||
|
||||
//退款是否退回库存
|
||||
private Integer isRefundStock = 1;
|
||||
|
||||
//库存警戒线
|
||||
private Integer warnLine = 0;
|
||||
|
||||
//排序
|
||||
private Integer sort;
|
||||
|
||||
|
|
|
|||
|
|
@ -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<ViewConSku> conInfos;
|
||||
|
||||
private TbPurchaseNotice notices=new TbPurchaseNotice();
|
||||
|
|
|
|||
Loading…
Reference in New Issue