商品划线价和回收折扣设置

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/GoodsMgrController.java

@@ -217,7 +217,7 @@ public class GoodsMgrController extends BaseApiController {
     goods.setStatus(GoodsStatusEnum.PUT_INIT);
     // 多SKU
     List<GoodsSku> skuList = goodsParam.getSkuList();
-    if (goods.getMultiSku() == 1) { //
+    if (goods.getMultiSku() == 1) {
       if ((null == skuList || skuList.size() == 0)) {
         return AjaxResult.error("商品" + goods.getTitle() + "不满足多SKU条件！");
       } else {
@@ -226,13 +226,17 @@ public class GoodsMgrController extends BaseApiController {
         goods.setExchangePrice(firstGoodsSku.getExchangePrice());
         goods.setValue(firstGoodsSku.getValue());
         goods.setCost(firstGoodsSku.getCost());
+        goods.setDiscountRate(firstGoodsSku.getDiscountRate());
         // 累计库存
         int totalQuantity = skuList.stream().mapToInt(GoodsSku::getQuantity).sum();
         goods.setQuantity(totalQuantity);
       }
     }
     if (null == goods.getOriginPrice()) {
-      goods.setOriginPrice(goods.getExchangePrice());
+      goods.setOriginPrice(goodsParam.getExchangePrice());
+    }
+    if (null == goods.getDiscountRate()) {
+      goods.setDiscountRate(goodsParam.getDiscountRate());
     }
     // 3.插入数据
     try {
@@ -287,10 +291,15 @@ public class GoodsMgrController extends BaseApiController {
         goods.setValue(firstGoodsSku.getValue());
         goods.setCost(firstGoodsSku.getCost());
         if (null == firstGoodsSku.getOriginPrice()) {
-          goods.setOriginPrice(firstGoodsSku.getExchangePrice());
+          goods.setOriginPrice(goodsParam.getExchangePrice());
         } else {
           goods.setOriginPrice(firstGoodsSku.getOriginPrice());
         }
+        if (null == firstGoodsSku.getDiscountRate()) {
+          goods.setDiscountRate(goodsParam.getDiscountRate());
+        } else {
+          goods.setDiscountRate(firstGoodsSku.getDiscountRate());
+        }
         // 累计库存
         int totalQuantity = skuList.stream().mapToInt(GoodsSku::getQuantity).sum();
         goods.setQuantity(totalQuantity);

mp-service/src/main/java/com/qs/mp/admin/domain/param/GoodsParam.java

@@ -9,6 +9,7 @@ import com.qs.mp.common.enums.GoodsStatusEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 import javax.validation.constraints.NotNull;
@@ -76,6 +77,9 @@ public class GoodsParam {
 	@ApiModelProperty(value = "商品成本", required = false)
 	private Integer cost;
 
+	@ApiModelProperty("回收折扣")
+	private BigDecimal discountRate;
+
 	/**
 	 * 库存数量
 	 */