新增：展示价格

src/main/java/com/mmc/pms/controller/lease/LeaseGoodsController.java

@@ -49,8 +49,8 @@ public class LeaseGoodsController extends BaseController {
 
     @ApiOperation(value = "租赁商品详情")
     @PostMapping("leaseGoodsDetails")
-    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
-    public ResultBody leaseGoodsDetails(@RequestParam Integer id) {
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = LeaseGoodsVO.class)})
+    public ResultBody<LeaseGoodsVO> leaseGoodsDetails(@RequestParam Integer id) {
         return leaseGoodsService.leaseGoodsDetails(id);
     }
 

src/main/java/com/mmc/pms/entity/lease/LeaseGoodsDO.java

@@ -7,6 +7,7 @@ import lombok.NoArgsConstructor;
 import org.apache.commons.collections4.CollectionUtils;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -89,6 +90,8 @@ public class LeaseGoodsDO implements Serializable {
      */
     private Integer userAccountId;
 
+    private BigDecimal showPrice;
+
     private Date createTime;
 
     private Date updateTime;
@@ -122,6 +125,7 @@ public class LeaseGoodsDO implements Serializable {
         this.productDetails = leaseGoodsVO.getProductDetails();
         this.minLeaseTerm = leaseGoodsVO.getMinLeaseTerm();
         this.maxLeaseTerm = leaseGoodsVO.getMaxLeaseTerm();
+        this.showPrice = leaseGoodsVO.getShowPrice();
         this.shipAddress = leaseGoodsVO.getShipAddress();
         this.returnAddress = leaseGoodsVO.getReturnAddress();
         this.logisticsCompany = leaseGoodsVO.getLogisticsCompany();
@@ -130,7 +134,7 @@ public class LeaseGoodsDO implements Serializable {
     }
 
     public LeaseGoodsVO buildLeaseGoodsVO() {
-        return LeaseGoodsVO.builder().id(id).tradeName(tradeName)
+        return LeaseGoodsVO.builder().id(id).tradeName(tradeName).showPrice(showPrice)
                 .sellingPoint(sellingPoint).level(level).shelfStatus(shelfStatus)
                 .productTypeId(productTypeId).brandInfoId(brandInfoId).deviceModeId(deviceModeId)
                 .productParam(productParam).productDetails(productDetails).minLeaseTerm(minLeaseTerm)

src/main/java/com/mmc/pms/entity/lease/LeasePriceStockDO.java

@@ -60,10 +60,6 @@ public class LeasePriceStockDO implements Serializable {
      */
     private BigDecimal maxDaysRental;
     /**
-     * 展示最低价
-     */
-    private BigDecimal showPrice;
-    /**
      * 库存
      */
     private Integer stock;
@@ -87,7 +83,6 @@ public class LeasePriceStockDO implements Serializable {
         this.thirtyDaysRental = param.getThirtyDaysRental();
         this.ninetyDaysRental = param.getNinetyDaysRental();
         this.maxDaysRental = param.getMaxDaysRental();
-        this.showPrice = param.getShowPrice();
         this.stockOut = param.getStockOut();
     }
 
@@ -96,7 +91,7 @@ public class LeasePriceStockDO implements Serializable {
                 .cashPledge(cashPledge).threeDaysRental(threeDaysRental)
                 .sevenDaysRental(sevenDaysRental).thirtyDaysRental(thirtyDaysRental)
                 .ninetyDaysRental(ninetyDaysRental).maxDaysRental(maxDaysRental)
-                .showPrice(showPrice).skuImage(skuImage).stock(stock).stockOut(stockOut).build();
+                .skuImage(skuImage).stock(stock).stockOut(stockOut).build();
     }
 }
 

src/main/java/com/mmc/pms/model/lease/vo/LeaseGoodsVO.java

@@ -13,6 +13,7 @@ import lombok.NoArgsConstructor;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -96,6 +97,9 @@ public class LeaseGoodsVO implements Serializable {
     @ApiModelProperty(value = "配送方式")
     private Integer modeOfDelivery;
 
+    @ApiModelProperty(value = "展示最低价", example = "1")
+    private BigDecimal showPrice;
+
     @ApiModelProperty(value = "创建时间 用作列表回显", hidden = true)
     private Date createTime;
 

src/main/java/com/mmc/pms/model/lease/vo/LeasePriceStockVO.java

@@ -50,9 +50,6 @@ public class LeasePriceStockVO implements Serializable {
     @ApiModelProperty(value = "180天租金", example = "1")
     private BigDecimal maxDaysRental;
 
-    @ApiModelProperty(value = "展示最低价", example = "1")
-    private BigDecimal showPrice;
-
     @ApiModelProperty(value = "sku图片", example = "https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/35bbd044-7cd7-4c85-ba27-69776e03dbb2.jpg")
     private String skuImage;
 

src/main/resources/mapper/lease/LeaseGoodsDao.xml

@@ -33,10 +33,12 @@
                                  mode_of_delivery,
                                  user_account_id,
                                  district_code,
+                                 show_price,
                                  sort)
         values (#{tradeName}, #{sellingPoint}, #{level}, #{shelfStatus}, #{productTypeId}, #{brandInfoId},
                 #{deviceModeId}, #{productParam}, #{productDetails}, #{minLeaseTerm}, #{maxLeaseTerm}, #{shipAddress},
-                #{returnAddress}, #{logisticsCompany}, #{modeOfDelivery}, #{userAccountId}, #{districtCode}, #{sort})
+                #{returnAddress}, #{logisticsCompany}, #{modeOfDelivery}, #{userAccountId}, #{districtCode},
+                #{showPrice}, #{sort})
     </insert>
     <insert id="batchInsertLeaseGoodsResources">
         insert into lease_goods_resources (lease_goods_id,
@@ -235,6 +237,7 @@
                mode_of_delivery,
                user_account_id,
                create_time,
+               show_price,
                sort
         from lease_goods
         where id = #{id}