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

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

~API:商品管理:sku.name赋值;

parent d0c90955
...@@ -231,45 +231,45 @@ public class GoblinStoreMgtGoodsAddParam implements Serializable { ...@@ -231,45 +231,45 @@ public class GoblinStoreMgtGoodsAddParam implements Serializable {
GoblinStoreMgtGoodsAddSkuParam addSkuParam = mgtGoodsAddSkuParamList.get(i); GoblinStoreMgtGoodsAddSkuParam addSkuParam = mgtGoodsAddSkuParamList.get(i);
String skuId = addSkuParam.getSkuId(); String skuId = addSkuParam.getSkuId();
GoblinGoodsSkuInfoVo vo = GoblinGoodsSkuInfoVo.getNew(); GoblinGoodsSkuInfoVo skuInfoVo = GoblinGoodsSkuInfoVo.getNew();
if (StringUtils.isBlank(skuId)) { if (StringUtils.isBlank(skuId)) {
vo.setSkuId(goodsInfoVo.getSpuId().concat(StringUtils.right(String.valueOf(System.nanoTime()), 5))); skuInfoVo.setSkuId(goodsInfoVo.getSpuId().concat(StringUtils.right(String.valueOf(System.nanoTime()), 5)));
} else { } else {
vo.setSkuId(skuId); skuInfoVo.setSkuId(skuId);
} }
vo.setSpuId(goodsInfoVo.getSpuId()); skuInfoVo.setSpuId(goodsInfoVo.getSpuId());
vo.setSkuNo(goodsInfoVo.getSpuNo()); skuInfoVo.setSkuNo(goodsInfoVo.getSpuNo());
vo.setName(goodsInfoVo.getName()); // skuInfoVo.setName(goodsInfoVo.getName());
vo.setSubtitle(goodsInfoVo.getSubtitle()); skuInfoVo.setSubtitle(goodsInfoVo.getSubtitle());
vo.setSkuPic(addSkuParam.getSkuPic()); skuInfoVo.setSkuPic(addSkuParam.getSkuPic());
vo.setSkuIsbn(addSkuParam.getSkuIsbn()); skuInfoVo.setSkuIsbn(addSkuParam.getSkuIsbn());
vo.setStock(addSkuParam.getStock()); skuInfoVo.setStock(addSkuParam.getStock());
vo.setSkuStock(vo.getStock()); skuInfoVo.setSkuStock(skuInfoVo.getStock());
vo.setWarningStock(addSkuParam.getWarningStock()); skuInfoVo.setWarningStock(addSkuParam.getWarningStock());
vo.setSellPrice(addSkuParam.getSellPrice()); skuInfoVo.setSellPrice(addSkuParam.getSellPrice());
vo.setPrice(addSkuParam.getPrice()); skuInfoVo.setPrice(addSkuParam.getPrice());
vo.setPriceMember(addSkuParam.getPriceMember()); skuInfoVo.setPriceMember(addSkuParam.getPriceMember());
vo.setWeight(addSkuParam.getWeight()); skuInfoVo.setWeight(addSkuParam.getWeight());
vo.setBuyFactor(addSkuParam.getBuyFactor()); skuInfoVo.setBuyFactor(addSkuParam.getBuyFactor());
vo.setBuyRoster(addSkuParam.getBuyRoster()); skuInfoVo.setBuyRoster(addSkuParam.getBuyRoster());
vo.setBuyLimit(addSkuParam.getBuyLimit()); skuInfoVo.setBuyLimit(addSkuParam.getBuyLimit());
vo.setStoreId(goodsInfoVo.getStoreId()); skuInfoVo.setStoreId(goodsInfoVo.getStoreId());
vo.setSkuValidity(DateUtil.Formatter.yyyyMMddHHmmss.parse(addSkuParam.getSkuValidity())); skuInfoVo.setSkuValidity(DateUtil.Formatter.yyyyMMddHHmmss.parse(addSkuParam.getSkuValidity()));
vo.setVirtualFlg(goodsInfoVo.getVirtualFlg()); skuInfoVo.setVirtualFlg(goodsInfoVo.getVirtualFlg());
vo.setStatus("3");// 没有审核流程,默认通过 skuInfoVo.setStatus("3");// 没有审核流程,默认通过
// vo.setReason(); // skuInfoVo.setReason();
vo.setShelvesStatus("0"); skuInfoVo.setShelvesStatus("0");
vo.setSkuAppear(StringUtils.isBlank(addSkuParam.getSkuAppear()) ? "0" : addSkuParam.getSkuAppear()); skuInfoVo.setSkuAppear(StringUtils.isBlank(addSkuParam.getSkuAppear()) ? "0" : addSkuParam.getSkuAppear());
vo.setDelFlg("0"); skuInfoVo.setDelFlg("0");
// vo.setShelvesAt(); // skuInfoVo.setShelvesAt();
vo.setCreatedBy(goodsInfoVo.getCreatedBy()); skuInfoVo.setCreatedBy(goodsInfoVo.getCreatedBy());
vo.setCreatedAt(goodsInfoVo.getCreatedAt()); skuInfoVo.setCreatedAt(goodsInfoVo.getCreatedAt());
// vo.setUpdatedBy(); // skuInfoVo.setUpdatedBy();
// vo.setUpdatedAt(); // skuInfoVo.setUpdatedAt();
vo.setLogisticsTemplate(goodsInfoVo.getLogisticsTemplate()); skuInfoVo.setLogisticsTemplate(goodsInfoVo.getLogisticsTemplate());
List<GoblinGoodsSpecDto> skuSpecList = addSkuParam.getSkuSpecList(); List<GoblinGoodsSpecDto> skuSpecList = addSkuParam.getSkuSpecList();
vo.setSkuSpecList(skuSpecList); skuInfoVo.setSkuSpecList(skuSpecList);
for (GoblinGoodsSkuInfoVo goodsSkuInfoVo : vos) {// 规格比对 for (GoblinGoodsSkuInfoVo goodsSkuInfoVo : vos) {// 规格比对
Map<String, String> skuSpecMap = goodsSkuInfoVo.getSkuSpecList().stream() Map<String, String> skuSpecMap = goodsSkuInfoVo.getSkuSpecList().stream()
...@@ -287,16 +287,18 @@ public class GoblinStoreMgtGoodsAddParam implements Serializable { ...@@ -287,16 +287,18 @@ public class GoblinStoreMgtGoodsAddParam implements Serializable {
throw new LiquidnetServiceException(errorMessage.getCode(), errorMessage.getMessage()); throw new LiquidnetServiceException(errorMessage.getCode(), errorMessage.getMessage());
} }
} }
vos.add(vo); vos.add(skuInfoVo);
skuIdList.add(vo.getSkuId()); skuIdList.add(skuInfoVo.getSkuId());
priceGe = priceGe.compareTo(vo.getPrice()) > 0 ? vo.getPrice() : priceGe; priceGe = priceGe.compareTo(skuInfoVo.getPrice()) > 0 ? skuInfoVo.getPrice() : priceGe;
priceLe = priceLe.compareTo(vo.getPrice()) < 0 ? vo.getPrice() : priceLe; priceLe = priceLe.compareTo(skuInfoVo.getPrice()) < 0 ? skuInfoVo.getPrice() : priceLe;
if (CollectionUtils.isEmpty(skuSpecList) || (skuSpecSize > 0 && skuSpecSize != skuSpecList.size())) { if (CollectionUtils.isEmpty(skuSpecList) || (skuSpecSize > 0 && skuSpecSize != skuSpecList.size())) {
ErrorMapping.ErrorMessage errorMessage = ErrorMapping.get("149006"); ErrorMapping.ErrorMessage errorMessage = ErrorMapping.get("149006");
throw new LiquidnetServiceException(errorMessage.getCode(), errorMessage.getMessage()); throw new LiquidnetServiceException(errorMessage.getCode(), errorMessage.getMessage());
} }
String skuname = "";
int specSize = skuSpecList.size();// SKU包含的规格数量 int specSize = skuSpecList.size();// SKU包含的规格数量
skuSpecSize = i == 0 ? specSize : skuSpecSize;// 标记第一个SKU的规格数量,用于校验 skuSpecSize = i == 0 ? specSize : skuSpecSize;// 标记第一个SKU的规格数量,用于校验
List<String> skuSpecNListTmp = CollectionUtil.arrayListString();// 标记单个SKU的规格名称,用于校验 List<String> skuSpecNListTmp = CollectionUtil.arrayListString();// 标记单个SKU的规格名称,用于校验
...@@ -304,6 +306,7 @@ public class GoblinStoreMgtGoodsAddParam implements Serializable { ...@@ -304,6 +306,7 @@ public class GoblinStoreMgtGoodsAddParam implements Serializable {
GoblinGoodsSpecDto specDto = skuSpecList.get(j); GoblinGoodsSpecDto specDto = skuSpecList.get(j);
String specName = specDto.getSpecName(); String specName = specDto.getSpecName();
String specVname = specDto.getSpecVname(); String specVname = specDto.getSpecVname();
skuname = " ".concat(specVname);
GoblinGoodsSpecValueVo specValueVo = GoblinGoodsSpecValueVo.getNew().setSpecVname(specVname).setSpecVsort(i); GoblinGoodsSpecValueVo specValueVo = GoblinGoodsSpecValueVo.getNew().setSpecVname(specVname).setSpecVsort(i);
if (i == 0) { if (i == 0) {
...@@ -332,6 +335,7 @@ public class GoblinStoreMgtGoodsAddParam implements Serializable { ...@@ -332,6 +335,7 @@ public class GoblinStoreMgtGoodsAddParam implements Serializable {
} }
skuSpecNListTmp.add(specName); skuSpecNListTmp.add(specName);
} }
skuInfoVo.setName(skuname.substring(1));
} }
goodsInfoVo.setPriceGe(priceGe); goodsInfoVo.setPriceGe(priceGe);
goodsInfoVo.setPriceLe(priceLe); goodsInfoVo.setPriceLe(priceLe);
......
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