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

Commit 3d13fbc1 authored by 胡佳晨's avatar 胡佳晨

修改 分批购时间配置

parent ef21fc64
...@@ -48,6 +48,8 @@ public class GoblinStoreMgtGoodsSkuListVo implements Serializable, Cloneable { ...@@ -48,6 +48,8 @@ public class GoblinStoreMgtGoodsSkuListVo implements Serializable, Cloneable {
private Integer upchain; private Integer upchain;
@ApiModelProperty(position = 38, value = "盲盒命中率") @ApiModelProperty(position = 38, value = "盲盒命中率")
private BigDecimal hitRatio; private BigDecimal hitRatio;
@ApiModelProperty(position = 39, value = "系统时间")
private String sysTime;
public String getSaleStartTime() { public String getSaleStartTime() {
return DateUtil.Formatter.yyyyMMddHHmmss.format(saleStartTime); return DateUtil.Formatter.yyyyMMddHHmmss.format(saleStartTime);
......
...@@ -1613,6 +1613,7 @@ public class GoblinMongoUtils { ...@@ -1613,6 +1613,7 @@ public class GoblinMongoUtils {
} }
public PagedResult<GoblinStoreMgtGoodsSkuListVo> getSkuSearch(GoblinStoreMgtGoodsSkuFilterParam filterParam) { public PagedResult<GoblinStoreMgtGoodsSkuListVo> getSkuSearch(GoblinStoreMgtGoodsSkuFilterParam filterParam) {
String sysTime = DateUtil.getNowTime();
Criteria criteria = Criteria.where("storeId").is(filterParam.getStoreId()).and("spuId").is(filterParam.getSpuId()).and("delFlg").is("0"); Criteria criteria = Criteria.where("storeId").is(filterParam.getStoreId()).and("spuId").is(filterParam.getSpuId()).and("delFlg").is("0");
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);
...@@ -1657,6 +1658,7 @@ public class GoblinMongoUtils { ...@@ -1657,6 +1658,7 @@ public class GoblinMongoUtils {
} }
mgtGoodsSkuListVo.setSurplusStock(stock); mgtGoodsSkuListVo.setSurplusStock(stock);
} }
mgtGoodsSkuListVo.setSysTime(sysTime);
voList.add(mgtGoodsSkuListVo); voList.add(mgtGoodsSkuListVo);
} }
return pagedResult.setList(voList).setTotal(count, 20); return pagedResult.setList(voList).setTotal(count, 20);
......
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