zhijiezhao 2 år sedan
förälder
incheckning
00af25fd98

+ 1 - 0
src/main/java/com/caimei365/commodity/model/vo/PageFloorVo.java

@@ -2,6 +2,7 @@ package com.caimei365.commodity.model.vo;
 
 import com.caimei365.commodity.model.po.ProductPo;
 import lombok.Data;
+import lombok.ToString;
 
 import java.io.Serializable;
 import java.util.List;

+ 0 - 3
src/main/java/com/caimei365/commodity/service/impl/PageServiceImpl.java

@@ -138,7 +138,6 @@ public class PageServiceImpl implements PageService {
     @Override
     public ResponseJson<Map<String, Object>> getHomeData(Integer userId, Integer source) {
         Map<String, Object> map = new HashMap<>(6);
-
         //楼层管理
         source = source == null ? 1 : source;
         List<PageFloorVo> homePageFloor = pageMapper.getHomePageFloor(source);
@@ -211,8 +210,6 @@ public class PageServiceImpl implements PageService {
 //                pageFloor.setNewfloorlist(newProductList);
 //            }
 //        });
-
-
         return ResponseJson.success(map);
     }
 

+ 4 - 2
src/main/resources/mapper/ShopMapper.xml

@@ -158,12 +158,14 @@
         shopID = #{shopId}, name = #{name}, aliasName = #{aliasName}, commodityType = #{commodityType},
         bigTypeId = #{bigTypeId}, smallTypeId = #{smallTypeId}, tinyTypeId = #{tinyTypeId}, mainImage = #{mainImage},
         brandId = #{brandId}, productType = #{productType}, tags = #{tags}, unit = #{unit}, normalPrice = #{normalPrice},
-        price = #{price}, price = #{price}, includedTax = #{includedTax}, minBuyNumber = #{minBuyNumber}, stock =
-        #{stock},
+        price = #{price}, price = #{price}, includedTax = #{includedTax}, minBuyNumber = #{minBuyNumber}, stock =#{stock},
         newProductType=#{newProductType},
         <if test="productCategory != null and  productCategory != ''">
             productCategory = #{productCategory},
         </if>
+        <if test="trainingFee != null">
+            trainingFee = #{trainingFee},
+        </if>
         <if test="serviceNumber != null and  serviceNumber != ''">
             serviceNumber = #{serviceNumber},
         </if>