修改入库数量的时候应该修改征订项的入库数量

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

@@ -222,26 +222,6 @@ public class TextbookWarehouseRecordServiceImpl extends MPJBaseServiceImpl<Textb
             throw new MyException("入库数量不能少于已经发放数量");
         }
 
-        // 如果是征订入库
-        // 根据入库记录找到对应的征订
-//        MPJLambdaWrapper<TextbookWarehouseRecord> textbookWarehouseRecordMPJLambdaWrapper = new MPJLambdaWrapper<>();
-//        textbookWarehouseRecordMPJLambdaWrapper
-//                .disableSubLogicDel()
-//                .select(TextbookSubscriptionItem::getId)
-//                .select(TextbookSubscriptionItem.class, x -> VoToColumnUtil.fieldsToColumns(TextbookSubscriptionItem.class).contains(x.getProperty()))
-//                .innerJoin(TextbookSubscriptionItem.class, TextbookSubscriptionItem::getId, TextbookWarehouseRecord::getDataItemId)
-//                .eq(TextbookWarehouseRecord::getId, dto.getId())
-//        ;
-//        TextbookSubscriptionItem textbookSubscriptionItem = textbookWarehouseRecordMapper.selectJoinOne(TextbookSubscriptionItem.class, textbookWarehouseRecordMPJLambdaWrapper);
-//        if (ObjectUtils.isNotEmpty(textbookSubscriptionItem)) {
-//            TextbookSubscriptionItem updateTextbookSubscriptionItem = new TextbookSubscriptionItem();
-//            updateTextbookSubscriptionItem.setId(textbookSubscriptionItem.getId());
-//            updateTextbookSubscriptionItem.setDiscount(ObjectUtils.isNotEmpty(dto.getDiscount()) ? dto.getDiscount() : 10);
-//            updateTextbookSubscriptionItem.setPrice(textbookWarehouseRecord.getPrice().multiply(BigDecimal.valueOf(dto.getDiscount() / 10)));
-//            updateTextbookSubscriptionItem.setModifyDate(new Date());
-//            textbookSubscriptionItemMapper.updateById(updateTextbookSubscriptionItem);
-//        }
-
         TextbookWarehouseRecord updateTextbookWarehouseRecord = new TextbookWarehouseRecord();
         updateTextbookWarehouseRecord.setId(textbookWarehouseRecord.getId());
 
@@ -292,6 +272,26 @@ public class TextbookWarehouseRecordServiceImpl extends MPJBaseServiceImpl<Textb
             textbookIssueRecordMapper.updateById(updateTextbookIssueRecord);
         }
 
+        // 如果是征订入库
+        // 根据入库记录找到对应的征订
+        MPJLambdaWrapper<TextbookSubscriptionItem> textbookWarehouseRecordMPJLambdaWrapper = new MPJLambdaWrapper<>();
+        textbookWarehouseRecordMPJLambdaWrapper
+                .disableSubLogicDel()
+                .select(TextbookSubscriptionItem::getId)
+                .select(TextbookSubscriptionItem.class, x -> VoToColumnUtil.fieldsToColumns(TextbookSubscriptionItem.class).contains(x.getProperty()))
+                .innerJoin(TextbookWarehouseRecord.class, TextbookWarehouseRecord::getDataItemId, TextbookSubscriptionItem::getId)
+                .eq(TextbookWarehouseRecord::getId, dto.getId())
+        ;
+        TextbookSubscriptionItem textbookSubscriptionItem = textbookSubscriptionItemMapper.selectJoinOne(TextbookSubscriptionItem.class, textbookWarehouseRecordMPJLambdaWrapper);
+        if (ObjectUtils.isNotEmpty(textbookSubscriptionItem)) {
+            TextbookSubscriptionItem updateTextbookSubscriptionItem = new TextbookSubscriptionItem();
+            updateTextbookSubscriptionItem.setId(textbookSubscriptionItem.getId());
+
+            updateTextbookSubscriptionItem.setInStockNum(dto.getWarehouseNumber());
+            updateTextbookSubscriptionItem.setModifyDate(new Date());
+            textbookSubscriptionItemMapper.updateById(updateTextbookSubscriptionItem);
+        }
+
         // 需要找到使用当前入库记录的出库记录对应的学生确认领取，改变其值
         LambdaUpdateWrapper<TextbookStudentClaim> textbookStudentClaimLambdaUpdateWrapper = new LambdaUpdateWrapper<>();
         textbookStudentClaimLambdaUpdateWrapper