上架管理与次日达上架增加建议零售价

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjProductLaunch.java

@@ -344,6 +344,13 @@ public class PjProductLaunch implements Serializable {
 	@ApiModelProperty(value = "是否是积分商品")
 	private String whetherIntegral;
 
+
+	/**
+	 * 建议零售价
+	 */
+	@ApiModelProperty(value = "建议零售价")
+	private BigDecimal suggestedRetailPrice;
+
 	@TableField(exist = false)
 	private BigDecimal inventoryShare;
 	@TableField(exist = false)

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/excel/ProductLaunchImportCodeExcel.java

@@ -47,6 +47,13 @@ public class ProductLaunchImportCodeExcel implements Serializable {
 	@ExcelProperty(value = "*售价4")
 	private BigDecimal priceFour;
 
+
+	/**
+	 * 建议零售价
+	 */
+	@ExcelProperty(value = "建议零售价")
+	private BigDecimal suggestedRetailPrice;
+
 	/**
 	 * 库存
 	 */

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/excel/ProductLaunchImportExcel.java

@@ -48,6 +48,13 @@ public class ProductLaunchImportExcel implements Serializable {
 	@ExcelProperty(value = "*售价4")
 	private BigDecimal priceFour;
 
+
+	/**
+	 * 建议零售价
+	 */
+	@ExcelProperty(value = "建议零售价")
+	private BigDecimal suggestedRetailPrice;
+
 	/**
 	 * 库存
 	 */

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/excel/ShareTheNextDayDataExcel.java

@@ -55,6 +55,13 @@ public class ShareTheNextDayDataExcel implements Serializable {
 	 */
 	@ExcelProperty(value = "售价4")
 	private BigDecimal priceFour;
+
+	/**
+	 * 建议零售价
+	 */
+	@ExcelProperty(value = "建议零售价")
+	private BigDecimal suggestedRetailPrice;
+
 	/**
 	 * 来源公司名称
 	 */

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/share/entity/SharePutOnShelves.java

@@ -188,6 +188,15 @@ public class SharePutOnShelves implements Serializable {
 	 */
 	@ApiModelProperty(value = "售价4")
 	private BigDecimal priceFour;
+
+
+	/**
+	 * 建议零售价
+	 */
+	@ApiModelProperty(value = "建议零售价")
+	private BigDecimal suggestedRetailPrice;
+
+
 	/**
 	 * 来源上架id
 	 */

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/shopping/entity/ShoppingMallDetail.java

@@ -108,4 +108,10 @@ public class ShoppingMallDetail implements Serializable {
 	private String goodsDescription;
 
 
+	/**
+	 * 建议零售价
+	 */
+	@ApiModelProperty(value = "建议零售价")
+	private BigDecimal suggestedRetailPrice;
+
 }

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/productLaunch/mapper/ProductLaunchMapper.xml

@@ -144,6 +144,7 @@
         ppl.price_four AS priceFour,
         ppl.inventory AS inventoryLocal,
         ppl.brand_item AS brandItem,
+        ppl.suggested_retail_price AS suggestedRetailPrice,
         IFNULL(SUM(psd.balance_quantity), 0) AS inventory,
         ppl.cname_int AS cnameInt
         FROM
@@ -205,7 +206,19 @@
             and ppl.whether_integral = #{whetherIntegral}
         </if>
         GROUP BY
-        ppl.id
+        ppl.id,
+        psd.CODE,
+        ppl.cname,
+        ppl.bill_type,
+        ppl.brand_id,
+        ppl.price_one,
+        ppl.price_two ,
+        ppl.price_three,
+        ppl.price_four ,
+        ppl.inventory,
+        ppl.brand_item,
+        ppl.suggested_retail_price,
+        ppl.cname_int
         ) allGoods
         <if test="brandId != null or brandName != null  and brandName != ''">
             order by  cnameInt, sort DESC

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/share/service/impl/SharePutOnShelvesServiceImpl.java

@@ -854,6 +854,7 @@ public class SharePutOnShelvesServiceImpl extends ServiceImpl<SharePutOnShelvesM
 				shelves.setShareStatus("已确认");
 				shelves.setGoodsCode(item.getGoodsCode());
 				shelves.setBrandName(item.getBrandName());
+				shelves.setSuggestedRetailPrice(item.getSuggestedRetailPrice());
 				sharePutOnShelvesList.add(shelves);
 			} else {
 				throw new RuntimeException("商品：" + item.getGoodsName() + "未查到上架数据");

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/shopping/mapper/ShoppingMallDetailMapper.xml

@@ -64,6 +64,7 @@
         fpd.brand_item AS brandItem,
         fpd.cname_int AS cnameInt,
         fpd.inventory AS inventoryLocal,
+        fpd.suggestedRetailPrice,
         (SELECT IFNULL(SUM(smd.inventory), 0.00) allInventory
         FROM pjpf_shopping_mall_detail smd
         WHERE smd.goods_code = fpd.goods_code
@@ -121,7 +122,19 @@
             and fpd.inventory > #{inventoryStatus}
         </if>
         GROUP BY
-        fpd.goods_code
+        fpd.goods_code,
+        fpd.id,
+        fpd.goods_name ,
+        fpd.bill_type ,
+        fpd.brand_id ,
+        fpd.price_one,
+        fpd.price_two,
+        fpd.price_three ,
+        fpd.price_four ,
+        fpd.brand_item ,
+        fpd.cname_int ,
+        fpd.inventory,
+        fpd.suggestedRetailPrice
         ) AS allGoods
         <if test="brandId != null or brandName != null  and brandName != ''">
             order by  cnameInt, sort DESC