修改bug 入库填写定价

src/main/java/com/xjrsoft/module/textbook/dto/AddTextbookSubscriptionItemDto.java

@@ -49,16 +49,16 @@ public class AddTextbookSubscriptionItemDto implements Serializable {
     */
     @ApiModelProperty("教师用书征订数量")
     private Integer teacherNum;
-    /**
-     * 定价(元)
-     */
-    @ApiModelProperty("定价(元)")
-    private BigDecimal sourcePrice;
 //    /**
-//     * 小计(元)
+//     * 定价(元)
 //     */
-//    @ApiModelProperty("小计(元)")
-//    private BigDecimal price;
+//    @ApiModelProperty("定价(元)")
+//    private BigDecimal sourcePrice;
+    /**
+     * 小计(元)
+     */
+    @ApiModelProperty("小计(元)")
+    private BigDecimal price;
     /**
     * 实际折扣
     */

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

@@ -267,11 +267,14 @@ public class TextbookSubscriptionServiceImpl extends MPJBaseServiceImpl<Textbook
         BigDecimal currentPrice;
         BigDecimal currentTotalPrice;
         for (TextbookSubscriptionItem textbookSubscriptionItem : textbookSubscriptionItemList) {
-            stuNum += textbookSubscriptionItem.getStudentNum();
-            teaNum += textbookSubscriptionItem.getTeacherNum();
+            int itemStuNum = ObjectUtils.isNotEmpty(textbookSubscriptionItem.getStudentNum()) ? textbookSubscriptionItem.getStudentNum() : 0;
+            int itemTeaNum = ObjectUtils.isNotEmpty(textbookSubscriptionItem.getTeacherNum()) ? textbookSubscriptionItem.getTeacherNum() : 0;
+
+            stuNum += itemStuNum;
+            teaNum += itemTeaNum;
 
             currentPrice = textbookSubscriptionItem.getPrice();
-            currentTotalPrice = currentPrice.multiply(BigDecimal.valueOf(textbookSubscriptionItem.getTeacherNum() + textbookSubscriptionItem.getStudentNum()));
+            currentTotalPrice = currentPrice.multiply(BigDecimal.valueOf(itemStuNum + itemTeaNum));
             totalPrice = totalPrice.add(currentTotalPrice);
         }
         TextbookSubscriptionDetailVo textbookSubscriptionDetailVo = new TextbookSubscriptionDetailVo();
@@ -367,22 +370,22 @@ public class TextbookSubscriptionServiceImpl extends MPJBaseServiceImpl<Textbook
     public Boolean add(AddTextbookSubscriptionDto dto) {
         TextbookSubscription textbookSubscription = BeanUtil.toBean(dto, TextbookSubscription.class);
 
-        List<TextbookSubscriptionItem> textbookSubscriptionItemList = new ArrayList<>();
-        TextbookSubscriptionItem item;
-        for(AddTextbookSubscriptionItemDto addItemDto : dto.getTextbookSubscriptionItemList()){
-            item = BeanUtil.toBean(addItemDto, TextbookSubscriptionItem.class);
-            if(ObjectUtils.isEmpty(addItemDto.getSourcePrice())){
-                addItemDto.setSourcePrice(BigDecimal.ZERO);
-            }
-
-            if(ObjectUtils.isEmpty(addItemDto.getDiscount())){
-                addItemDto.setDiscount(10D);
-            }
-
-            item.setPrice(addItemDto.getSourcePrice().multiply(BigDecimal.valueOf(addItemDto.getDiscount() / 10)));
-            textbookSubscriptionItemList.add(item);
-        }
-        textbookSubscription.setTextbookSubscriptionItemList(textbookSubscriptionItemList);
+//        List<TextbookSubscriptionItem> textbookSubscriptionItemList = new ArrayList<>();
+//        TextbookSubscriptionItem item;
+//        for(AddTextbookSubscriptionItemDto addItemDto : dto.getTextbookSubscriptionItemList()){
+//            item = BeanUtil.toBean(addItemDto, TextbookSubscriptionItem.class);
+//            if(ObjectUtils.isEmpty(addItemDto.getSourcePrice())){
+//                addItemDto.setSourcePrice(BigDecimal.ZERO);
+//            }
+//
+//            if(ObjectUtils.isEmpty(addItemDto.getDiscount())){
+//                addItemDto.setDiscount(10D);
+//            }
+//
+//            item.setPrice(addItemDto.getSourcePrice().multiply(BigDecimal.valueOf(addItemDto.getDiscount() / 10)));
+//            textbookSubscriptionItemList.add(item);
+//        }
+//        textbookSubscription.setTextbookSubscriptionItemList(textbookSubscriptionItemList);
 
         // 处理征订表
         int sum = 0;
@@ -444,6 +447,17 @@ public class TextbookSubscriptionServiceImpl extends MPJBaseServiceImpl<Textbook
         // 处理征订项
         TextbookSubscriptionItemClass textbookSubscriptionItemClass;
         for (TextbookSubscriptionItem textbookSubscriptionItem : textbookSubscription.getTextbookSubscriptionItemList()) {
+
+            if(ObjectUtils.isEmpty(textbookSubscriptionItem.getPrice())){
+                textbookSubscriptionItem.setPrice(BigDecimal.ZERO);
+            }
+
+            if(ObjectUtils.isEmpty(textbookSubscriptionItem.getDiscount())){
+                textbookSubscriptionItem.setDiscount(10D);
+            }
+
+            textbookSubscriptionItem.setPrice(textbookSubscriptionItem.getPrice().multiply(BigDecimal.valueOf(textbookSubscriptionItem.getDiscount() / 10)));
+
             String[] classIdArr = new String[0];
             if (ObjectUtils.isNotEmpty(textbookSubscription.getSubscriptionMethod())
                     && textbookSubscription.getSubscriptionMethod() == 1

src/main/resources/sqlScript/textbook_sql.sql

@@ -458,10 +458,9 @@ create table `textbook_discount_alter_record`
   collate = utf8mb4_0900_ai_ci comment ='教材折扣变更记录';
 
 alter table wf_textbook_recede_item
-    change textbook_issue_record_id textbook_issue_order_number varchar(256) null comment '出库订单号';
+    add textbook_issue_order_number varchar(256) null comment '出库订单号' after textbook_issue_record_id;
+
 
-alter table wf_textbook_recede_item
-    add textbook_issue_record_id bigint null comment '出库记录主键' after wf_textbook_recede_id;