From 8db929c837f26ef63ff78dc079537709ed48ca7c Mon Sep 17 00:00:00 2001
From: Yen <yen1130@qq.com>
Date: Mon, 4 Dec 2023 11:48:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E5=AF=BC=E5=85=A5=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/goods/controller/GoodsSkuController.java     | 2 ++
 .../modules/goods/controller/GoodsSpuController.java     | 8 ++++++--
 .../serve/modules/goods/entity/bo/GoodsSkuImportBo.java  | 6 ++++++
 .../serve/modules/goods/entity/bo/GoodsSpuImportBo.java  | 9 +++++++++
 4 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuController.java b/src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuController.java
index b7c54a21..2a1c9f96 100644
--- a/src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuController.java
+++ b/src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuController.java
@@ -308,6 +308,8 @@ public class GoodsSkuController {
         udpSku.setOrderFlag(skuItem.getOrderFlag());
         udpSku.setSpecialFlag(skuItem.getSpecialFlag());
         udpSku.setCostFlag(skuItem.getCostFlag());
+        udpSku.setCostPrice(skuItem.getCostPrice());
+        udpSku.setMarketPrice(skuItem.getMarketPrice());
         udpSku.setBelong(skuItem.getBelong());
         udpSku.setWrapVal(skuItem.getWrapVal());
         udpSku.setTasteVal(skuItem.getTasteVal());
diff --git a/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuController.java b/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuController.java
index 0faf0d3a..01c4d7ca 100644
--- a/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuController.java
+++ b/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuController.java
@@ -404,8 +404,9 @@ public class GoodsSpuController {
                 goodsSpu.setName(spuItem.getName());
                 //修改类目
                 this.toSetSpuCate(cateList, spuItem, goodsSpu);
-                goodsSpu.setShelf(1);
-                goodsSpu.setCostFlag(1);
+                goodsSpu.setShelf(spuItem.getShelf());
+                goodsSpu.setCostFlag(spuItem.getCostFlag());
+                goodsSpu.setOrderFlag(spuItem.getOrderFlag());
                 spuSaveList.add(goodsSpu);
                 continue;
             }
@@ -421,6 +422,9 @@ public class GoodsSpuController {
                     if(StringUtils.hasText(spuItem.getName())){
                         spu.setName(spuItem.getName());
                     }
+                    spu.setShelf(spuItem.getShelf());
+                    spu.setCostFlag(spuItem.getCostFlag());
+                    spu.setOrderFlag(spuItem.getOrderFlag());
                     //修改类目
                     this.toSetSpuCate(cateList, spuItem, spu);
                     //关联
diff --git a/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsSkuImportBo.java b/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsSkuImportBo.java
index bf460193..96cef8c2 100644
--- a/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsSkuImportBo.java
+++ b/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsSkuImportBo.java
@@ -41,6 +41,12 @@ public class GoodsSkuImportBo {
         /** 销售价格（元） */
         private BigDecimal salesPrice;
 
+        /** 市场价 */
+        private BigDecimal marketPrice;
+
+        /** 成本价 */
+        private BigDecimal costPrice;
+
         /** 重量（kg） */
         private BigDecimal weight;
 
diff --git a/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsSpuImportBo.java b/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsSpuImportBo.java
index 46520a6a..a7cb2b71 100644
--- a/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsSpuImportBo.java
+++ b/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsSpuImportBo.java
@@ -32,6 +32,15 @@ public class GoodsSpuImportBo {
         /** 商品名字 */
         private String name;
 
+        /** 上下架 */
+        private Integer shelf;
+
+        /** 是否可以下单 1、是；0否 */
+        private Integer orderFlag;
+
+        /** 可投放费用标识 */
+        private Integer costFlag;
+
         /** 分类名称 */
         private String categoryName;