修改二手成本价2

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

@@ -1,10 +1,8 @@
 package com.caimei365.commodity.model.po;
 
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.lang.Double;
 import java.util.Date;
 
 /**
@@ -16,7 +14,9 @@ import java.util.Date;
 @Data
 public class ProductPo implements Serializable {
     private static final long serialVersionUID = 1L;
-    /** 商品productID */
+    /**
+     * 商品productID
+     */
     private Integer productId;
     /**
      * 品牌Id
@@ -106,6 +106,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

@@ -11,7 +11,6 @@ import com.caimei365.commodity.model.po.ProductSecondPo;
 import com.caimei365.commodity.model.vo.*;
 import com.caimei365.commodity.service.SecondHandService;
 import com.caimei365.commodity.utils.ImageUtils;
-import com.caimei365.commodity.utils.MathUtil;
 import com.github.pagehelper.PageHelper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
@@ -21,7 +20,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
-import java.math.BigDecimal;
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -347,9 +345,9 @@ public class SecondHandServiceImpl implements SecondHandService {
         // 默认发布到二手供应商
         product.setShopId(1252);
         product.setSellNumber(secondDto.getStock());
-        BigDecimal costPrice = MathUtil.mul(secondDto.getPrice(), 0.95, 2);
-        product.setCostPrice(costPrice.doubleValue());
-        product.setCostCheckFlag(1);
+        product.setCostPrice(0d);
+        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}