diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/DraftGoods.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/DraftGoods.java
index 48d74437..23e0a4a3 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/DraftGoods.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/DraftGoods.java
@@ -151,4 +151,10 @@ public class DraftGoods extends BaseEntity {
     @ApiModelProperty(value = "sku列表JSON")
     private String skuListJson;
 
+    /**
+     * @see cn.lili.modules.goods.entity.enums.GoodsTypeEnum
+     */
+    @ApiModelProperty(value = "商品类型", required = true)
+    private String goodsType;
+
 }
\ No newline at end of file
diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/DraftGoodsServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/DraftGoodsServiceImpl.java
index 3566b0e7..3ff33cd8 100644
--- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/DraftGoodsServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/DraftGoodsServiceImpl.java
@@ -16,7 +16,6 @@ import cn.lili.modules.goods.service.GoodsGalleryService;
 import cn.lili.modules.goods.service.GoodsSkuService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -70,7 +69,7 @@ public class DraftGoodsServiceImpl extends ServiceImpl<DraftGoodsMapper, DraftGo
         draftGoods.setGoodsGalleryListJson(JSONUtil.toJsonStr(draftGoods.getGoodsGalleryList()));
         draftGoods.setSkuListJson(JSONUtil.toJsonStr(this.getGoodsSkuList(draftGoods.getSkuList())));
         draftGoods.setGoodsParamsListJson(JSONUtil.toJsonStr(draftGoods.getGoodsParamsList()));
-        this.saveOrUpdate(draftGoods);
+        this.save(draftGoods);
     }
 
     @Override
diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java
index edf43efb..5be1378a 100644
--- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java
@@ -334,12 +334,12 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
         //判断商品类型
         switch (goods.getGoodsType()) {
             case "PHYSICAL_GOODS":
-                if (goods.getTemplateId() == null) {
+                if (goods.getTemplateId().equals("0")) {
                     throw new ServiceException("实物商品需选择配送模板");
                 }
                 break;
             case "VIRTUAL_GOODS":
-                if (goods.getTemplateId() != null) {
+                if (!goods.getTemplateId().equals("0")) {
                     throw new ServiceException("虚拟商品不需要选择配送模板");
                 }
                 break;
diff --git a/framework/src/main/java/cn/lili/modules/search/entity/dos/EsGoodsIndex.java b/framework/src/main/java/cn/lili/modules/search/entity/dos/EsGoodsIndex.java
index 76f54d9e..ddca62c3 100644
--- a/framework/src/main/java/cn/lili/modules/search/entity/dos/EsGoodsIndex.java
+++ b/framework/src/main/java/cn/lili/modules/search/entity/dos/EsGoodsIndex.java
@@ -8,7 +8,6 @@ import cn.lili.modules.goods.entity.dos.GoodsSku;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 import org.springframework.data.annotation.Id;
@@ -225,6 +224,12 @@ public class EsGoodsIndex implements Serializable {
     @Field(type = FieldType.Date, format = DateFormat.basic_date_time)
     private Date releaseTime;
 
+    /**
+     * @see cn.lili.modules.goods.entity.enums.GoodsTypeEnum
+     */
+    @ApiModelProperty(value = "商品类型", required = true)
+    private String goodsType;
+
     /**
      * 商品属性（参数和规格）
      */
diff --git a/framework/src/main/java/cn/lili/modules/store/serviceimpl/BillServiceImpl.java b/framework/src/main/java/cn/lili/modules/store/serviceimpl/BillServiceImpl.java
index 4ed46ab9..36c92826 100644
--- a/framework/src/main/java/cn/lili/modules/store/serviceimpl/BillServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/store/serviceimpl/BillServiceImpl.java
@@ -51,12 +51,9 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements Bi
     //商家流水
     @Autowired
     private StoreFlowService storeFlowService;
-<<<<<<< HEAD
-=======
     //结算单
     @Resource
     private BillMapper billMapper;
->>>>>>> master
 
     @Override
     public void createBill(String storeId, Date startTime, DateTime endTime) {
@@ -86,10 +83,6 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements Bi
                 .eq("store_id",storeId)
                 .eq("flow_type",FlowTypeEnum.PAY.name())
                 .between("create_time",startTime,endTime));
-<<<<<<< HEAD
-
-=======
->>>>>>> master
         Double orderPrice = 0D;
         if (orderBill != null) {
             bill.setOrderPrice(orderBill.getOrderPrice());