记得上下班打卡 | git大法好,push需谨慎

Commit bee8d19d authored by 张国柄's avatar 张国柄

~spuType;

parent 76f2900c
...@@ -102,6 +102,7 @@ public class GoblinStoreMgtDigitalGoodsAddSkuParam implements Serializable { ...@@ -102,6 +102,7 @@ public class GoblinStoreMgtDigitalGoodsAddSkuParam implements Serializable {
private String intro; private String intro;
@ApiModelProperty(position = 30, required = true, value = "详情[256]", example = "详情...") @ApiModelProperty(position = 30, required = true, value = "详情[256]", example = "详情...")
@NotBlank(message = "藏品详情不能为空") @NotBlank(message = "藏品详情不能为空")
@Size(max = 2000, message = "藏品详情内容过长")
private String details; private String details;
// @ApiModelProperty(position = 31, required = true, value = "上架处理方式[1-等待手动上架|2-直接上架售卖|3-预约定时上架]", example = "1") // @ApiModelProperty(position = 31, required = true, value = "上架处理方式[1-等待手动上架|2-直接上架售卖|3-预约定时上架]", example = "1")
......
...@@ -42,5 +42,5 @@ public class GoblinStoreMgtGoodsFilterParam implements Serializable { ...@@ -42,5 +42,5 @@ public class GoblinStoreMgtGoodsFilterParam implements Serializable {
@ApiModelProperty(position = 20, required = false, value = "价格区间MAX") @ApiModelProperty(position = 20, required = false, value = "价格区间MAX")
private BigDecimal priceLe; private BigDecimal priceLe;
@ApiModelProperty(position = 21, required = false, value = "商品类型[0-常规|1-数字藏品]") @ApiModelProperty(position = 21, required = false, value = "商品类型[0-常规|1-数字藏品]")
private int spuType; private Integer spuType;
} }
...@@ -359,10 +359,12 @@ public class GoblinMongoUtils { ...@@ -359,10 +359,12 @@ public class GoblinMongoUtils {
// SPU分页 // SPU分页
public PagedResult<GoblinStoreMgtGoodsListVo> getMgtGoodsInfoVos(GoblinStoreMgtGoodsFilterParam filterParam) { public PagedResult<GoblinStoreMgtGoodsListVo> getMgtGoodsInfoVos(GoblinStoreMgtGoodsFilterParam filterParam) {
Criteria criteria = Criteria.where("delFlg").is("0").and("storeId").is(filterParam.getStoreId()).and("marketId").exists(false); Criteria criteria = Criteria.where("delFlg").is("0").and("storeId").is(filterParam.getStoreId()).and("marketId").exists(false);
if (0 == filterParam.getSpuType()) { if (null != filterParam.getSpuType()) {
criteria.andOperator(Criteria.where("spuType").exists(false).orOperator(Criteria.where("spuType").is(0))); if (0 == filterParam.getSpuType()) {
} else { criteria.andOperator(Criteria.where("spuType").exists(false).orOperator(Criteria.where("spuType").is(0)));
criteria.and("spuType").is(1); } else {
criteria.and("spuType").is(1);
}
} }
if (StringUtils.isNotBlank(filterParam.getKeyword())) { if (StringUtils.isNotBlank(filterParam.getKeyword())) {
Pattern pattern = Pattern.compile("^.*" + filterParam.getKeyword() + ".*$", Pattern.CASE_INSENSITIVE); Pattern pattern = Pattern.compile("^.*" + filterParam.getKeyword() + ".*$", Pattern.CASE_INSENSITIVE);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment