入库后定价和折扣修改记录。

src/main/java/com/xjrsoft/module/textbook/entity/TextbookDiscountAlterRecord.java

@@ -77,14 +77,14 @@ public class TextbookDiscountAlterRecord implements Serializable {
     @ApiModelProperty("入库编号")
     private Long textbookWarehouseRecordId;
     /**
-     * 旧的价格
+     * 旧的定价
      */
-    @ApiModelProperty("旧的价格")
+    @ApiModelProperty("旧的定价")
     private BigDecimal oldPrice;
     /**
-     * 新的价格
+     * 新的定价
      */
-    @ApiModelProperty("新的价格")
+    @ApiModelProperty("新的定价")
     private BigDecimal newPrice;
     /**
      * 旧的折扣

src/main/java/com/xjrsoft/module/textbook/service/impl/TextbookWarehouseRecordServiceImpl.java

@@ -226,7 +226,7 @@ public class TextbookWarehouseRecordServiceImpl extends MPJBaseServiceImpl<Textb
         updateTextbookWarehouseRecord.setId(textbookWarehouseRecord.getId());
         updateTextbookWarehouseRecord.setPrice(ObjectUtils.isNotEmpty(dto.getPrice()) ? dto.getPrice() : BigDecimal.ZERO);
         updateTextbookWarehouseRecord.setDiscount(ObjectUtils.isNotEmpty(dto.getDiscount()) ? dto.getDiscount() : 10);
-        updateTextbookWarehouseRecord.setSubtotal(textbookWarehouseRecord.getPrice().multiply(BigDecimal.valueOf(dto.getDiscount() / 10)));
+        updateTextbookWarehouseRecord.setSubtotal(updateTextbookWarehouseRecord.getPrice().multiply(BigDecimal.valueOf(dto.getDiscount() / 10)));
         updateTextbookWarehouseRecord.setTotalPrice(updateTextbookWarehouseRecord.getSubtotal().multiply(BigDecimal.valueOf(textbookWarehouseRecord.getWarehouseNumber())));
         updateTextbookWarehouseRecord.setActualTotalPrice(updateTextbookWarehouseRecord.getSubtotal().multiply(BigDecimal.valueOf(textbookWarehouseRecord.getActualWarehouseNumber())));
         updateTextbookWarehouseRecord.setModifyDate(new Date());

src/main/java/com/xjrsoft/module/textbook/vo/TextbookDiscountAlterRecordListVo.java

@@ -5,6 +5,7 @@ import com.alibaba.excel.annotation.write.style.ContentStyle;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -52,6 +53,16 @@ public class TextbookDiscountAlterRecordListVo {
     @ExcelProperty("入库编号")
     @ApiModelProperty("入库编号")
     private Long textbookWarehouseRecordId;
+    /**
+     * 旧的定价
+     */
+    @ApiModelProperty("旧的定价")
+    private BigDecimal oldPrice;
+    /**
+     * 新的定价
+     */
+    @ApiModelProperty("新的定价")
+    private BigDecimal newPrice;
     /**
      * 旧的折扣
      */