bugfix

src/main/java/com/caimei/modules/product/entity/Product.java

@@ -71,6 +71,7 @@ public class Product extends DataEntity<Product> {
     private String costPrice;        // 成本价
     private Double SqlCostPrice;
     private String costProportional;        // 比例成本百分比
+    private Double sqlCostProportional;     //入数据库字段
     private String costCheckFlag;        // 成本价选中标志：1固定成本 2比例成
     private String precisehKey;        // 精确关键字
     private String giftFlag;//是否可以参加赠送(0:无法参加，1:可以参加赠送，2:已参加过赠送)
@@ -223,6 +224,22 @@ public class Product extends DataEntity<Product> {
      */
     private Integer searchType;
 
+    public String getBeautyActFlag() {
+        return beautyActFlag;
+    }
+
+    public void setBeautyActFlag(String beautyActFlag) {
+        this.beautyActFlag = beautyActFlag;
+    }
+
+    public Double getSqlCostProportional() {
+        return sqlCostProportional;
+    }
+
+    public void setSqlCostProportional(Double sqlCostProportional) {
+        this.sqlCostProportional = sqlCostProportional;
+    }
+
     public Double getSqlTaxPoint() {
         return sqlTaxPoint;
     }

src/main/java/com/caimei/modules/product/service/ProductService.java

@@ -400,6 +400,9 @@ public class ProductService extends CrudService<ProductDao, Product> {
             if(StringUtils.isNotBlank(product.getSupplierTaxPoint())){
                 product.setSqlSupplierTaxPoint(Double.valueOf(product.getSupplierTaxPoint()));
             }
+            if(StringUtils.isNotBlank(product.getCostProportional())){
+                product.setSqlCostProportional(Double.valueOf(product.getCostProportional()));
+            }
             productDao.insert(product);
             productDetailInfo.setProductID(product.getProductID());
             // 保存商品图片

src/main/resources/mappings/modules/product/ProductMapper.xml

@@ -452,7 +452,7 @@
 					 #{downlineTime},
 					 #{freePostFlag},
 					 #{SqlCostPrice},
-					 #{costProportional},
+					 #{sqlCostProportional},
 					 #{costCheckFlag},
 					 #{precisehKey},
 		         	 #{visibility},