Merge remote-tracking branch 'remotes/origin/developer' into developerB

# Conflicts:
#	src/main/java/com/caimei365/commodity/model/po/ProductPo.java

src/main/java/com/caimei365/commodity/model/po/ProductPo.java

@@ -107,6 +107,10 @@ public class ProductPo implements Serializable {
      * 成本价选中标志：1固定成本 2比例成
      */
     private Integer costCheckFlag;
+    /**
+     * 比例成本百分比
+     */
+    private Double costProportional;
     /**
      * 是否有sku：1有， 0没有
      */

src/main/java/com/caimei365/commodity/service/impl/SecondHandServiceImpl.java

@@ -346,7 +346,8 @@ public class SecondHandServiceImpl implements SecondHandService {
         product.setShopId(1252);
         product.setSellNumber(secondDto.getStock());
         product.setCostPrice(0d);
-        product.setCostCheckFlag(1);
+        product.setCostCheckFlag(2);
+        product.setCostProportional(95d);
         product.setHasSkuFlag(1);
         // 商品状态默认待审核
         product.setValidFlag(1);

src/main/resources/mapper/SecondHandMapper.xml

@@ -23,12 +23,12 @@
     <insert id="insertProduct" keyColumn="productID" keyProperty="productId" parameterType="com.caimei365.commodity.model.po.ProductPo" useGeneratedKeys="true">
         insert into product (
             brandId, name, price, price1, stock, aliasName, normalPrice, mainImage, productCategory, preferredFlag, shopId,
-            sellNumber, costPrice, costCheckFlag, hasSkuFlag, validFlag, ladderPriceFlag, sortIndex, featuredFlag, byFlag,
+            sellNumber, costPrice, costCheckFlag, costProportional, hasSkuFlag, validFlag, ladderPriceFlag, sortIndex, featuredFlag, byFlag,
             step, actFlag, actStatus, freePostFlag, productType, machineType, includedTax, recommendType, invoiceType,
             visibility, addTime, updateTime, onlineTime, downlineTime
         ) values (
             #{brandId}, #{name}, #{price}, #{price}, #{stock}, #{aliasName}, #{normalPrice}, #{mainImage}, #{productCategory},
-            #{preferredFlag}, #{shopId}, #{sellNumber}, #{costPrice}, #{costCheckFlag}, #{hasSkuFlag}, #{validFlag},
+            #{preferredFlag}, #{shopId}, #{sellNumber}, #{costPrice}, #{costCheckFlag}, #{costProportional}, #{hasSkuFlag}, #{validFlag},
             #{ladderPriceFlag}, #{sortIndex}, #{featuredFlag}, #{byFlag}, #{step}, #{actFlag}, #{actStatus},
             #{freePostFlag}, #{productType}, #{machineType}, #{includedTax}, #{recommendType}, #{invoiceType},
             #{visibility}, #{addTime}, #{updateTime}, #{onlineTime}, #{offlineTime}