教材优化

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

@@ -996,26 +996,26 @@ public class TextbookServiceImpl extends MPJBaseServiceImpl<TextbookMapper, Text
             throw new MyException("入库失败，该教材不存在");
         }
 
-        BigDecimal price = ObjectUtil.isNull(dto.getPrice()) ? new BigDecimal(0) : dto.getPrice();
-        Double discount = ObjectUtil.isNull(dto.getDiscount()) ? 10 : dto.getDiscount();
-        BigDecimal subtotal = price.multiply(new BigDecimal(discount / 10));
+//        BigDecimal price = ObjectUtil.isNull(dto.getPrice()) ? new BigDecimal(0) : dto.getPrice();
+//        double discount = ObjectUtil.isNull(dto.getDiscount()) ? 10 : dto.getDiscount();
+//        BigDecimal subtotal = price.multiply(new BigDecimal(discount / 10));
         //更新总的库存数量
         this.updateById(new Textbook() {
             {
                 setId(textbook.getId());
                 Integer oldStock = ObjectUtil.isNull(textbook.getStock()) ? 0 : textbook.getStock();
                 setStock(oldStock + (ObjectUtil.isNull(dto.getWarehouseNumber()) ? 0 : dto.getWarehouseNumber()));
-                setPrice(price);
-                setDiscount(discount);
-                setSubtotal(subtotal);
+//                setPrice(price);
+//                setDiscount(discount);
+//                setSubtotal(subtotal);
                 setModifyDate(new Date());
             }
         });
         //添加入库记录
         TextbookWarehouseRecord textbookWarehouseRecord = BeanUtil.toBean(dto, TextbookWarehouseRecord.class);
         textbookWarehouseRecord.setWarehouseMode(WarehouseModeEnum.WmManual.getCode());
-        textbookWarehouseRecord.setDiscount(discount);
-        textbookWarehouseRecord.setSubtotal(subtotal);
+        textbookWarehouseRecord.setDiscount(textbook.getDiscount());
+        textbookWarehouseRecord.setSubtotal(textbook.getSubtotal());
         textbookWarehouseRecord.setCreateDate(new Date());
         QueryWrapper<TextbookWarehouseRecord> queryWrapperSortcode = new QueryWrapper<>();
         queryWrapperSortcode.select("IFNULL(MAX(sort_code),0) as sortCode");