联合丽格1.0.2

src/main/java/com/caimei/modules/product/dao/ProductDao.java

@@ -179,13 +179,18 @@ public interface ProductDao extends CrudDao<Product> {
 
     void insertSku(CmSku s);
 
+    void insertOrganizeSku(CmSku s);
+
     void insertCmLadderPrice(CmLadderPrice l);
 
     void deleteSkus(Integer productID);
 
     List<CmSku> findSkuList(Integer productID);
+
     List<CmSku> findSkuListProduct(Integer productID);
 
+    List<CmSku> findSkuOrganizeList(Integer productID);
+
     List<CmLadderPrice> findLadderPriceBySku(Integer skuId);
 
     List<ProductLadderPrice> findLadderPrice(Integer skuId);
@@ -198,14 +203,20 @@ public interface ProductDao extends CrudDao<Product> {
 
     void updateCmSku(CmSku cmSku);
 
+    void updateOrganizeSku(CmSku cmSku);
+
     CmSku findSku(Integer productId);
 
+    CmSku findOrganizeSku(Integer productId);
+
     CmSku findSkuById(Integer skuId);
 
     List<Integer> findSkuIdByPromotionsId(Integer promotionsId);
 
     void deleteProductSkus(@Param("skuIds")List<Integer> skuIds,@Param("productId")Integer productId);
 
+    void deleteProductOrganizeSkus(@Param("skuIds")List<Integer> skuIds,@Param("productId")Integer productId);
+
     void deletePromotionSku(@Param("skuIds")List<Integer> skuIds,@Param("productId")Integer productId);
 
     String findProductIdBySku(String productId);

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

@@ -16,6 +16,7 @@ import java.util.List;
 public class CmSku extends DataEntity<CmSku> {
     private Integer skuId;
     private Integer productId;
+    private Integer organizeId; // 组织Id
     private Double touchPrice; //单品促销优惠价
     private String unit;        // 包装规格
     private Double normalPrice;        // 市场价
@@ -31,6 +32,9 @@ public class CmSku extends DataEntity<CmSku> {
     private List<CmLadderPrice> ladderPriceList;
     private Double discount;       //超级会员会员折扣
     private Integer priceType;     //超级会员价类型：1折扣，2优惠价
+    private Double organizePercent; // 组织百分比
+    private Double shopPercent;     // 供应商百分比
+    private Double cmPercent;       // 采美百分比
 
     public Double getTouchPrice() {
         return touchPrice;
@@ -80,6 +84,14 @@ public class CmSku extends DataEntity<CmSku> {
         this.productId = productId;
     }
 
+    public Integer getOrganizeId() {
+        return organizeId;
+    }
+
+    public void setOrganizeId(Integer organizeId) {
+        this.organizeId = organizeId;
+    }
+
     public Integer getSkuId() {
         return skuId;
     }
@@ -167,4 +179,28 @@ public class CmSku extends DataEntity<CmSku> {
     public void setLadderPriceList(List<CmLadderPrice> ladderPriceList) {
         this.ladderPriceList = ladderPriceList;
     }
+
+    public Double getOrganizePercent() {
+        return organizePercent;
+    }
+
+    public void setOrganizePercent(Double organizePercent) {
+        this.organizePercent = organizePercent;
+    }
+
+    public Double getShopPercent() {
+        return shopPercent;
+    }
+
+    public void setShopPercent(Double shopPercent) {
+        this.shopPercent = shopPercent;
+    }
+
+    public Double getCmPercent() {
+        return cmPercent;
+    }
+
+    public void setCmPercent(Double cmPercent) {
+        this.cmPercent = cmPercent;
+    }
 }

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

@@ -19,6 +19,8 @@ public class Product extends DataEntity<Product> {
     private Integer preferredFlag; //新品上线(001) 优惠商品(010) 常用商品(100)，三者同时存在111
     private String displayOnCRMFlag; //是否在crm可以被搜索到 1是 0否
     private Integer productID;        // productIDprice1
+    private String groundMall;         // 上架商城
+    private List<String> organizeNames;  // 上架平台
     private Integer brandID;        // 品牌Id
     private CmBrand brand;//品牌信息
     private Integer bigTypeID;//一级商品分类
@@ -576,6 +578,22 @@ public class Product extends DataEntity<Product> {
         this.productIds = productIds;
     }
 
+    public String getGroundMall() {
+        return groundMall;
+    }
+
+    public void setGroundMall(String groundMall) {
+        this.groundMall = groundMall;
+    }
+
+    public List<String> getOrganizeNames() {
+        return organizeNames;
+    }
+
+    public void setOrganizeNames(List<String> organizeNames) {
+        this.organizeNames = organizeNames;
+    }
+
     public BigDecimal getActivityPrice() {
         return activityPrice;
     }

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

@@ -20,6 +20,7 @@ import com.caimei.modules.product.dao.ProductNewDao;
 import com.caimei.modules.product.entity.*;
 import com.caimei.modules.sys.utils.UploadImageUtils;
 import com.caimei.modules.user.dao.NewCmShopDao;
+import com.caimei.modules.weisha.dao.CmMallOrganizeDao;
 import com.caimei.po.ProductImage;
 import com.caimei.po.ProductLadderPrice;
 import com.caimei.redis.RedisService;
@@ -80,6 +81,8 @@ public class ProductNewService extends CrudService<ProductNewDao, Product> {
     private NewShopOrderDao newShopOrderDao;
     @Autowired
     private WeChatService weChatService;
+    @Autowired
+    private CmMallOrganizeDao cmMallOrganizeDao;
     @Value("${wwwServer}")
     private String domain;
 
@@ -99,7 +102,25 @@ public class ProductNewService extends CrudService<ProductNewDao, Product> {
         entity.setPage(page);
         List<Product> list = dao.findList(entity);
         list.forEach(p -> {
-            CmSku sku = productDao.findSku(p.getProductID());
+            String ids = p.getGroundMall().replaceAll("##", ",");
+            String organizeName = "";
+            // 上架平台
+            List<String> organizeNames = new ArrayList<>();
+            if (p.getGroundMall().contains("0")) {
+                organizeName = "【采美】平台";
+                organizeNames.add(organizeName);
+            }
+            if (p.getGroundMall().contains("4")) {
+                organizeName = "【丽格集采联盟】平台";
+                organizeNames.add(organizeName);
+            }
+            p.setOrganizeNames(organizeNames);
+            CmSku sku = null;
+            if (p.getGroundMall().contains("0")) {
+                sku = productDao.findSku(p.getProductID());
+            } else {
+                sku = productDao.findOrganizeSku(p.getProductID());
+            }
             if (null != sku) {
                 p.setPrice(sku.getPrice());
                 p.setNormalPrice(sku.getNormalPrice());

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

@@ -30,6 +30,7 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 @Service
 @Transactional(readOnly = false)
@@ -344,6 +345,16 @@ public class ProductService extends CrudService<ProductDao, Product> {
         if (product.getVisibility() == null) {
             product.setVisibility("3");
         }
+        ArrayList<Integer> listMall = new ArrayList();
+        if (null != product.getSkuList()) {
+            List<Integer> collect = product.getSkuList().stream().map(CmSku::getOrganizeId).collect(Collectors.toList());
+            collect.forEach(c -> {
+                if (!listMall.contains(c)) {
+                    listMall.add(c);
+                }
+            });
+            product.setGroundMall(StringUtils.strip(listMall.toString(),"[]"));
+        }
         if (null != product.getShopType() && 2 == product.getShopType()) {
             product.setValidFlag("2");
             if (StringUtils.isNotBlank(product.getTaxPoint())) {
@@ -398,7 +409,8 @@ public class ProductService extends CrudService<ProductDao, Product> {
     }
 
     private void updateSku(Product product) {
-        List<CmSku> skuList = product.getSkuList();
+        List<CmSku> skuList = product.getSkuList().stream().filter(p -> 0 == p.getOrganizeId()).collect(Collectors.toList());
+        List<CmSku> skuOrganizeList = product.getSkuList().stream().filter(p -> 4 == p.getOrganizeId()).collect(Collectors.toList());
         if (null != skuList && skuList.size() > 0) {
             List<Integer> skuIds = new ArrayList<>();
             skuList.forEach(s -> {
@@ -432,6 +444,25 @@ public class ProductService extends CrudService<ProductDao, Product> {
             // 删除促销活动sku
             productDao.deletePromotionSku(skuIds, product.getProductID());
         }
+        // 外部商城
+        if (null != skuOrganizeList && skuOrganizeList.size() > 0) {
+            List<Integer> skuIds = new ArrayList<>();
+            
+            skuOrganizeList.forEach(s -> {
+                s.setProductId(product.getProductID());
+                s.setShopPercent(s.getCostProportional());
+                if (null != s.getSkuId()) {
+                    productDao.updateOrganizeSku(s);
+                } else {
+                    /*s.setOrganizePercent(0.00d);
+                    s.setShopPercent(83.00d);
+                    s.setCmPercent(17.00d);*/
+                    productDao.insertOrganizeSku(s);
+                    skuIds.add(s.getSkuId());
+                }
+            });
+            productDao.deleteProductOrganizeSkus(skuIds, product.getProductID());
+        }
     }
 
     public void addSkus(Product product) {
@@ -443,8 +474,13 @@ public class ProductService extends CrudService<ProductDao, Product> {
 
                 if (null != s.getPrice()) {
                     s.productId(product.getProductID());
-                    productDao.insertSku(s);
-                    if (s.getLadderPriceFlag().equals("1")) {
+                    s.setShopPercent(s.getCostProportional());
+                    if (0 == s.getOrganizeId()) {
+                        productDao.insertSku(s);
+                    } else {
+                        productDao.insertOrganizeSku(s);
+                    }
+                    if (s.getLadderPriceFlag().equals("1") && 0 == s.getOrganizeId()) {
                         productDao.deleteLadderPriceById(s.getSkuId(),s.getProductId());
                     }
                     if (null != s.ladderPriceFlag() && 1 == s.ladderPriceFlag()) {
@@ -593,8 +629,14 @@ public class ProductService extends CrudService<ProductDao, Product> {
     public List<CmSku> findSkuList(Integer productID) {
         List<CmSku> skus = productDao.findSkuListProduct(productID);
         skus.forEach(s -> {
+            s.setOrganizeId(0);
             s.ladderPriceList(productDao.findLadderPriceBySku(s.skuId()));
         });
+        List<CmSku> skuOrganizeList = productDao.findSkuOrganizeList(productID);
+        skuOrganizeList.forEach(o -> {
+            o.setOrganizeId(4);
+            skus.add(o);
+        });
         return skus;
     }
 

src/main/java/com/caimei/modules/weisha/dao/CmMallOrganizeDao.java

@@ -5,6 +5,8 @@ import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
 import com.caimei.modules.weisha.entity.CmMallOrganize;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 组织列表DAO接口
  *
@@ -23,4 +25,11 @@ public interface CmMallOrganizeDao extends CrudDao<CmMallOrganize> {
      * @return
      */
     CmMallOrganize findOrganizeMobileOnly(CmMallOrganize cmMallOrganize);
-}
+
+    /**
+     * 组织名称集合
+     * @param ids
+     * @return
+     */
+    List<String> getOrganizeName(@Param("ids") String ids);
+}

src/main/java/com/caimei/modules/weisha/entity/CmOrganizeSku.java

@@ -36,6 +36,10 @@ public class CmOrganizeSku {
      * 包装规格
      */
     private String unit;
+    /**
+     * 库存
+     */
+    private Integer stock;
     /**
      * 机构价
      */

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

@@ -10,6 +10,7 @@
     <sql id="productColumns">
         a.productID AS "id",
 		a.productID AS "productID",
+        a.groundMall AS "groundMall",
 		a.brandID AS "brandID",
 		a.bigTypeID AS "bigTypeID",
 		ifnull(a.smallTypeID,-1)  AS "smallTypeID",
@@ -1044,6 +1045,30 @@
                 #{minBuyNumber},
                 #{unit})
     </insert>
+    <insert id="insertOrganizeSku" keyColumn="id" keyProperty="id" parameterType="com.caimei.modules.product.entity.CmSku"
+            useGeneratedKeys="true">
+        insert into cm_mall_product_sku
+        (productId,
+         normalPrice,
+         price,
+         costprice,
+         stock,
+         minBuyNumber,
+         unit,
+         organizePercent,
+         shopPercent,
+         cmPercent)
+        values (#{productId},
+                #{normalPrice},
+                #{price},
+                #{costPrice},
+                #{stock},
+                #{minBuyNumber},
+                #{unit},
+                #{organizePercent},
+                #{shopPercent},
+                #{cmPercent})
+    </insert>
     <insert id="insertCmLadderPrice">
         insert into product_ladder_price (skuId, productId, userType, ladderNum,
                                           buyNum, buyPrice, createBy, createDate, delFlag)
@@ -1109,6 +1134,15 @@
             #{id}
         </foreach>
     </delete>
+    <delete id="deleteProductOrganizeSkus">
+        DELETE
+        FROM cm_mall_product_sku
+        WHERE productId = #{productId}
+        and skuId not in
+        <foreach collection="skuIds" close=")" separator="," open="(" item="id">
+            #{id}
+        </foreach>
+    </delete>
 
     <delete id="deletePromotionSku">
         DELETE from cm_promotion_sku
@@ -1638,6 +1672,19 @@
             minBuyNumber=#{minBuyNumber}
         where skuId = #{skuId}
     </update>
+    <update id="updateOrganizeSku">
+        update cm_mall_product_sku
+        set productId=#{productId},
+            ladderPriceFlag=#{ladderPriceFlag},
+            normalPrice=#{normalPrice},
+            price=#{price},
+            costProportional=#{costProportional},
+            costPrice=#{costPrice},
+            stock=#{stock},
+            unit=#{unit},
+            minBuyNumber=#{minBuyNumber}
+        where id = #{skuId}
+    </update>
 
     <select id="getProductByTypeName" resultType="com.caimei.modules.brand.entity.BrandAndProductType">
         select b.name   AS "bigTypeName",
@@ -1906,6 +1953,20 @@
         left join cm_svip_product_sku csps on cs.skuId = csps.skuId
         where cs.productId = #{productID}
     </select>
+    <select id="findSkuOrganizeList" resultType="com.caimei.modules.product.entity.CmSku">
+        select id as skuId,
+               productId,
+               unit,
+               normalPrice,
+               stock,
+               "1" as costCheckFlag,
+               shopPercent as costProportional,
+               costPrice,
+               price,
+               minBuyNumber
+        from cm_mall_product_sku
+        where productId = #{productID}
+    </select>
     <select id="findLadderPriceBySku" resultType="com.caimei.modules.product.entity.CmLadderPrice">
         select skuId, productId, userType, ladderNum, buyNum, buyPrice, delFlag
         FROM product_ladder_price
@@ -1961,6 +2022,13 @@
         order by price asc
         limit 1
     </select>
+    <select id="findOrganizeSku" resultType="com.caimei.modules.product.entity.CmSku">
+        SELECT price, costPrice,"1" AS costCheckFlag, shopPercent AS costProportional, normalPrice
+        FROM cm_mall_product_sku
+        WHERE productId = 1686
+        ORDER BY price ASC
+        LIMIT 1
+    </select>
     <select id="findSkuById" resultType="com.caimei.modules.product.entity.CmSku">
         select skuId, price, costPrice, costCheckFlag, costProportional, unit
         from cm_sku

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

@@ -12,6 +12,7 @@
         ifnull(a.announType,1) as announType,
         a.productID AS "id",
         a.productID AS "productID",
+        a.groundMall AS "groundMall",
         a.brandID AS "brandID",
         ifnull(a.bigTypeID,0) AS "bigTypeID",
         ifnull(a.smallTypeID,0)  AS "smallTypeID",
@@ -158,7 +159,9 @@
             <if test="tinyTypeID != null and tinyTypeID != 0">
                 AND a.tinyTypeID = #{tinyTypeID}
             </if>
-
+            <if test="groundMall != null and groundMall != ''">
+                AND a.groundMall like concat('%',#{groundMall},'%')
+            </if>
             <if test="productCategory != null and productCategory != ''">
                 AND a.productCategory = #{productCategory}
                 <if test="productCategory == 2">

src/main/resources/mappings/modules/weisha/CmMallOrganizeMapper.xml

@@ -135,4 +135,13 @@
         </if>
     </select>
 
+    <select id="getOrganizeName" resultType="java.lang.String">
+        select organizeName
+        from cm_mall_organize
+        <where>
+            <if test="ids != null and ids != ''">
+                id in ( #{ids} )
+            </if>
+        </where>
+    </select>
 </mapper>

src/main/resources/mappings/modules/weisha/CmOrganizeProductMapper.xml

@@ -77,21 +77,14 @@
         SELECT
         cmps.id,
         cmps.productId,
-        cmps.id,
-        cmps.skuId,
         cmps.minBuyNumber,
         cmps.price,
-        cs.unit,
-        cs.price as clubPrice,
-        cs.costCheckFlag as costCheckFlag,
-        cs.costPrice as costPrice,
-        cs.costProportional as costProportional,
-        cs.minBuyNumber AS cmMinBuyNumber,
+        cmps.stock
+        cmps.unit,
         cmps.organizePercent,
         cmps.shopPercent,
         cmps.cmPercent
         FROM cm_mall_product_sku cmps
-        LEFT JOIN cm_sku cs ON cmps.skuId = cs.skuId
         <where>
             <if test="productIds.size() > 0">
                 cmps.productId in
@@ -207,8 +200,8 @@
     </insert>
 
     <insert id="insertMallSku">
-        INSERT INTO cm_mall_product_sku(skuId, productId, mallProductId, minBuyNumber, price)
-        VALUES (#{skuId}, #{productId}, #{mallProductId}, #{minBuyNumber}, #{price})
+        INSERT INTO cm_mall_product_sku(productId, mallProductId, minBuyNumber, price)
+        VALUES (#{productId}, #{mallProductId}, #{minBuyNumber}, #{price})
     </insert>
 
     <update id="updateMallProduct">

src/main/webapp/WEB-INF/views/modules/product-new/productEdit.jsp

@@ -16,7 +16,7 @@
             padding: 10px;
             white-space: nowrap;
             margin-top: 10px;
-            width: 900px;
+            width: 1200px;
         }
 
         .sku .sku-item {
@@ -595,15 +595,29 @@
                             class="input-small"/>
             </td>
         </tr>
-
         <tr>
-            <th><span class="red">*</span>SKU种类：</th>
+            <th><span class="red">*</span>上架平台：</th>
+            <td>
+                <input id="caimei" type="checkbox" name="groundMall" value="0" >【采美】平台
+                <input id="bcc" type="checkbox" name="groundMall" value="4" >【丽格集采联盟】平台
+            </td>
+        </tr>
+        <tr id="groundSkuCaimei">
+            <th><span class="red">*</span>SKU种类：<br><span class="red">【采美】平台</span></th>
             <td>
                 <div><span><button class="addSku" onclick="return false">添加SKU</button></span></div>
                     <%-- 插入html --%>
                 <div id="skus"></div>
             </td>
         </tr>
+        <tr id="groundSkuBcc">
+            <th><span class="red">*</span>SKU种类：<br><span class="red">【丽格集采联盟】平台</span></th>
+            <td>
+                <div><span><button class="addMallSku" onclick="return false">添加SKU</button></span></div>
+                    <%-- 插入html --%>
+                <div id="mallSkus"></div>
+            </td>
+        </tr>
         <tr>
             <th><span class="red">*</span>是否含税：</th>
             <td>
@@ -841,6 +855,7 @@
 <script type="text/html" id="skuTemplate">
     <div class="sku">
         <input type="hidden" name="skuId">
+        <input type="hidden" name="organizeId">
         <div class="sku-item sku-unit">
             <span class="red">*</span>包装规格：
             <input name="unit" type="text" maxlength="15" style="width: 40px" class="short required"/>
@@ -866,8 +881,10 @@
             <input style="width: 60px" name="costPrice" type="number" maxlength="11" class="short"/> 元
         </div>
         <div class="sku-item sku-costProportional" style="display: none;">
-            <span class="red">*</span>比例成本百分比：
-            <input style="width: 50px" name="costProportional" type="number" maxlength="11" class="short"/>%
+            <span class="red">*</span>佣金比例：
+            供应商：<input style="width: 50px" name="costProportional" type="number" maxlength="11" class="short"/>%
+            集团：<input style="width: 50px" name="organizePercent" type="number" maxlength="11" class="short"/>%
+            采美：<input style="width: 50px" name="cmPercent" type="number" maxlength="11" class="short"/>%
         </div>
         <div class="sku-item sku-price">
             <span class="red">*</span>机构价：
@@ -928,6 +945,30 @@
 
 <script type="text/javascript">
 
+    $('#caimei').change(function () {
+        var item = $('#caimei').val()
+        console.log('item---'+item)
+        var check = $(this).prop('checked')
+        console.log('check---'+check)
+        if (check) {
+            $("#groundSkuCaimei").show(100)
+        } else {
+            $("#groundSkuCaimei").hide(100)
+        }
+    })
+
+    $('#bcc').change(function () {
+        var item = $('#bcc').val()
+        console.log('item---'+item)
+        var checkBcc = $(this).prop('checked')
+        console.log('checkBcc---'+checkBcc)
+        if (checkBcc) {
+            $("#groundSkuBcc").show(100)
+        } else {
+            $("#groundSkuBcc").hide(100)
+        }
+    })
+
     /*$(function () {
         // debugger
         var productType= $("#productType").val();
@@ -1019,11 +1060,26 @@
                     }
                     ;
                 } else {
+                    var costProportional = $("#costProportional").val()
+                    var organizePercent = $("#organizePercent").val()
+                    var cmPercent = $("#cmPercent").val()
                     if ($("#costProportional").val() == '') {
                         alertx("请输入成本比例");
                         return false;
-                    }
-                    ;
+                    };
+                    if ($("#organizePercent").val() == '') {
+                        alertx("请输入集团比例");
+                        return false;
+                    };
+                    if ($("#cmPercent").val() == '') {
+                        alertx("请输入供应商比例");
+                        return false;
+                    };
+                    /*const num = costProportional*1 + organizePercent*1 + cmPercent*1
+                    if (num != 100) {
+                        alertx("佣金比例和需为100")
+                        return false;
+                    }*/
                 }
                 if ($('#minBuyNumber:visible').length > 0) {
                     var minBuyNumber = $('#minBuyNumber').val();
@@ -1108,7 +1164,19 @@
                 }
             }
         });
-
+        // 初始化上平台sku显示
+        if (-1 != groundMall.indexOf("0")) {
+            $('#caimei').attr('checked',true)
+            $('#groundSkuCaimei').show(100)
+        } else {
+            $('#groundSkuCaimei').hide(100)
+        }
+        if (-1 != groundMall.indexOf("4")) {
+            $('#bcc').attr('checked',true)
+            $('#groundSkuBcc').show(100)
+        } else {
+            $('#groundSkuBcc').hide(100)
+        }
         // 初始化sku
         insertDefaultSkuRow();
         // 初始化关联标签库
@@ -1901,9 +1969,10 @@
 
     var skuIndex = 0;
     var productJson = ${productJson};
-    console.log(productJson);
+    console.log("productJson",productJson);
     var skuList = productJson.skuList;
-
+    var groundMall = productJson.groundMall;
+    console.log("groundMall",groundMall)
 
     $(".addSku").click(function () {
         var skuTemplate = $('#skuTemplate').html()
@@ -1914,7 +1983,20 @@
             costCheckFlag: '1',
             ladderPriceFlag: '0'
         }
-        setSkuPrototypeValues(current, product);
+        setSkuPrototypeValues(current, product, 0);
+        skuEventBind(current, product);
+    })
+
+    $(".addMallSku").click(function () {
+        var skuTemplate = $('#skuTemplate').html()
+        $("#mallSkus").append(skuTemplate).show();
+        var current = $("#mallSkus").find('.sku').eq(-1);
+        var product = {
+            skuIndex: ++skuIndex,
+            costCheckFlag: '1',
+            ladderPriceFlag: '0'
+        }
+        setSkuPrototypeValues(current, product, 4);
         skuEventBind(current, product);
     })
 
@@ -1931,7 +2013,7 @@
                 var current = $("#skus").find('.sku').eq(-1);
                 var product = skuList[i];
                 product.skuIndex = i;
-                setSkuPrototypeValues(current, product);
+                setSkuPrototypeValues(current, product, product.organizeId);
                 skuEventBind(current, product);
                 skuIndex = i
             }
@@ -1946,10 +2028,13 @@
 
 
     /* 设置新增sku属性值 */
-    function setSkuPrototypeValues(el, product) {
+    function setSkuPrototypeValues(el, product, organize) {
         console.log(product);
         if (!product) return;
         var skuIndex = product.skuIndex;
+        var organizeId = el.find('input[name$="organizeId"]');
+        organizeId.val(organize)
+        organizeId.attr('name', 'skuList[' + skuIndex + '].organizeId');
         var index = el.find('input[name$="index"]');
         index.val(skuIndex);
 
@@ -1983,6 +2068,14 @@
         var costProportional = el.find('input[name$="costProportional"]');
         costProportional.val(product.costProportional)
         costProportional.attr('name', 'skuList[' + skuIndex + '].costProportional');
+        // 组织百分比
+        var organizePercent = el.find('input[name$="organizePercent"]');
+        organizePercent.val(product.organizePercent)
+        organizePercent.attr('name', 'skuList[' + skuIndex + '].organizePercent');
+        // 采美百分比
+        var cmPercent = el.find('input[name$="cmPercent"]');
+        cmPercent.val(product.cmPercent)
+        cmPercent.attr('name', 'skuList[' + skuIndex + '].cmPercent');
 
         if (product.costCheckFlag != 1) {
             costProportional.parent('.sku-costProportional').show();
@@ -2060,6 +2153,8 @@
         var costCheckFlag = el.find('input[name$="costCheckFlag"]');
         var costPrice = el.find('input[name$="costPrice"]');
         var costProportional = el.find('input[name$="costProportional"]');
+        var organizePercent = el.find('input[name$="organizePercent"]');
+        var cmPercent = el.find('input[name$="cmPercent"]');
         // 机构价
         var clubPrice = el.find('input[name$="skuList[' + i + '].price"]');
         //阶梯价格

src/main/webapp/WEB-INF/views/modules/product-new/productList.jsp

@@ -432,6 +432,14 @@
                     <form:option value="2" label="未关联"/>
                 </form:select>
             </div>
+            <div class="item">
+                <label>上架平台：</label>
+                <form:select path="isRelevance" class="input-medium">
+                    <form:option value="" label="请选择"/>
+                    <form:option value="0" label="【采美】平台"/>
+                    <form:option value="4" label="【丽格集采联盟】平台"/>
+                </form:select>
+            </div>
             <div class="item">
                 <input id="searchValidFlag" value="${product.searchValidFlag}" style="display: none"/>
                 <label>商品状态：</label>
@@ -489,6 +497,7 @@
         <th>新品参与状态</th>
         <th>新品审核状态</th>
         <th>关联标签库</th>
+        <th>上架平台</th>
         <th>提交时间</th>
         <shiro:hasPermission name="product:product:edit">
             <th>操作</th>
@@ -646,6 +655,11 @@
                     未关联
                 </c:if>
             </td>
+            <td>
+                <c:forEach items="${product.organizeNames}" var="organize">
+                    <p>${organize}</p>
+                </c:forEach>
+            </td>
             <td>
                 <c:if test="${empty product.addTime}">
                     ---
@@ -1094,19 +1108,19 @@
     function validChange(id, flag) {
         var msg = "提示信息";
         if (flag == 10) {
-            msg = "确定冻结该商品吗？";
+            msg = "本操作只对采美平台商品有效，确定冻结该商品吗？";
         } else if (flag == 22) {
-            msg = "确定解除冻结该商品吗？";
+            msg = "本操作只对采美平台商品有效，确定解除冻结该商品吗？";
         } else if (flag == 9) {
-            msg = "确定隐身此商品吗？";
+            msg = "本操作只对采美平台商品有效，确定隐身此商品吗？";
         } else if (flag == 2) {
-            msg = "确定显身此商品吗？";
+            msg = "本操作只对采美平台商品有效，确定显身此商品吗？";
         } else if (flag == 0) {
-            msg = "确定删除该商品吗？";
+            msg = "本操作只对采美平台商品有效，确定删除该商品吗？";
         } else if (flag == 32) {
-            msg = "确定重新上架该商品吗？";
+            msg = "本操作只对采美平台商品有效，确定重新上架该商品吗？";
         } else if (flag == 33) {
-            msg = "确定下架该商品吗？";
+            msg = "本操作只对采美平台商品有效，确定下架该商品吗？";
         }
         $("#msg").text(msg);
         $('.tips-popup-reason').show();