Merge branch 'dev' into 'test'

Dev See merge request !37

Merge branch 'dev' into 'test'
7ad712ae · wangpeng · 744cc9fb · 3501adb7 · 7ad712ae
Commit 7ad712ae authored Mar 18, 2022 by wangpeng
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

SkuServiceImpl.java ...erver/admin/goods_center/service/impl/SkuServiceImpl.java +5 -1

No files found.
--- a/mall-server-admin/src/main/java/com/fzm/mall/server/admin/goods_center/service/impl/SkuServiceImpl.java
+++ b/mall-server-admin/src/main/java/com/fzm/mall/server/admin/goods_center/service/impl/SkuServiceImpl.java
@@ -84,7 +84,11 @@ public class SkuServiceImpl extends ServiceImpl<SkuMapper, Sku> implements ISkuS
            if (StringUtils.isBlank(kDTO.getImage())) {
                sku.setThumb(thumb);
            }
-            if (salesType == null || salesType.equals(SalesTypeEnum.ORDINARY.getType())) {
+            if (salesType == null) {
+                sku.setCirculation(kDTO.getStock());
+                sku.setPrice(kDTO.getOriginalPrice());
+            }
+            if (salesType != null && salesType.equals(SalesTypeEnum.ORDINARY.getType())) {
                sku.setCirculation(kDTO.getStock());
                sku.setOriginalPrice(price);
                sku.setPrice(price);