Skip to content

M
mall-server
Commit a732c79e authored by wangpeng's avatar wangpeng
Browse files
Options

Merge branch 'dev' into 'test'

外部通证优化 See merge request !32
parents 92080742 47b734dc
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
mall-server-admin/src/main/java/com/fzm/mall/server/admin/goods_center/service/impl/SkuServiceImpl.java
View file @ a732c79e
...@@ -84,12 +84,12 @@ public class SkuServiceImpl extends ServiceImpl<SkuMapper, Sku> implements ISkuS ...@@ -84,12 +84,12 @@ public class SkuServiceImpl extends ServiceImpl<SkuMapper, Sku> implements ISkuS
if (StringUtils.isBlank(kDTO.getImage())) { if (StringUtils.isBlank(kDTO.getImage())) {
sku.setThumb(thumb); sku.setThumb(thumb);
} }
if (salesType.equals(SalesTypeEnum.ORDINARY.getType())) { if (salesType == null || salesType.equals(SalesTypeEnum.ORDINARY.getType())) {
sku.setCirculation(kDTO.getStock()); sku.setCirculation(kDTO.getStock());
sku.setOriginalPrice(price); sku.setOriginalPrice(price);
sku.setPrice(price); sku.setPrice(price);
} }
if (salesType.equals(SalesTypeEnum.BLIND_BOX.getType())) { if (salesType != null && salesType.equals(SalesTypeEnum.BLIND_BOX.getType())) {
sku.setOriginalPrice(blindBoxPrice); sku.setOriginalPrice(blindBoxPrice);
sku.setPrice(blindBoxPrice); sku.setPrice(blindBoxPrice);
} }
...@@ -100,7 +100,7 @@ public class SkuServiceImpl extends ServiceImpl<SkuMapper, Sku> implements ISkuS ...@@ -100,7 +100,7 @@ public class SkuServiceImpl extends ServiceImpl<SkuMapper, Sku> implements ISkuS
//规格属性入库 //规格属性入库
skuPropService.add(kDTO.getPropertyList(), skuId); skuPropService.add(kDTO.getPropertyList(), skuId);
if (salesType.equals(SalesTypeEnum.BLIND_BOX.getType())) { if (salesType != null && salesType.equals(SalesTypeEnum.BLIND_BOX.getType())) {
if (commodityPass.equals(CommodityPassTypeEnum.INNER.getType())) { if (commodityPass.equals(CommodityPassTypeEnum.INNER.getType())) {
long tokenId = System.currentTimeMillis(); long tokenId = System.currentTimeMillis();
sku.setCoinName(MALLGlobalConfig.NFT_PREFIX + tokenId); sku.setCoinName(MALLGlobalConfig.NFT_PREFIX + tokenId);
......
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