Browse Source

6月小版本

Duan_xu 2 years ago
parent
commit
e9b767745e

+ 6 - 5
src/main/java/com/caimei/modules/product/service/ProductService.java

@@ -391,6 +391,11 @@ public class ProductService extends CrudService<ProductDao, Product> {
             }
         }
         product.setQualificationImg(res);
+        if(product.getNewProductType()==1){
+            product.setShowFlag(1);
+        }else if(product.getNewProductType()==2){
+            product.setShowFlag(3);
+        }
 //        if(StringUtils.isNotBlank(product.getSplitCode())&&"0".equals(product.getSplitCode())){
 //            product.setSplitCode(null);
 //        }
@@ -408,11 +413,7 @@ public class ProductService extends CrudService<ProductDao, Product> {
             if(StringUtils.isNotBlank(product.getCostProportional())){
                 product.setSqlCostProportional(Double.valueOf(product.getCostProportional()));
             }
-            if(product.getNewProductType()==1){
-                product.setShowFlag(1);
-            }else if(product.getNewProductType()==2){
-                product.setShowFlag(3);
-            }
+
 
 
             //保存商品信息

+ 5 - 3
src/main/resources/mappings/modules/product/ProductMapper.xml

@@ -87,8 +87,8 @@
 		a.commodityType as "commodityType",
 		a.splitCode,
         a.announType,
-        a.newvalidFlag,
-        a.newProductType,
+        ifnull(a.newvalidFlag,0),
+         ifnull(a.newProductType,2),
         a.showFlag,
         a.showTime,
         a.newshowTime,
@@ -1710,8 +1710,10 @@
 			<if test="trainingFee != null">
 				trainingFee = #{trainingFee},
 			</if>
+			newProductType=#{newProductType},
+			showFlag=#{showFlag},
 			announType=#{announType},
-				splitCode = #{splitCode}
+			splitCode = #{splitCode}
 		</set>
 		where productID = #{productID}
 	</update>