修改bug 入库填写定价

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

@@ -829,6 +829,15 @@ 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)));
                 // 如果不等于空则修改
                 if (textbookSubscriptionItem.getId() != null) {
                     textbookSubscriptionTextbookSubscriptionItemMapper.updateById(textbookSubscriptionItem);

src/main/resources/sqlScript/textbook_sql.sql

@@ -387,22 +387,23 @@ create table `wf_textbook_recede`
 (
     id                bigint        not null comment '主键编号'
         primary key,
-    create_user_id    bigint        null comment '创建人',
-    create_date       datetime      null comment '创建时间',
-    modify_user_id    bigint        null comment '修改人',
-    modify_date       datetime      null comment '修改时间',
-    delete_mark       int           not null comment '删除标记',
-    enabled_mark      int           not null comment '有效标志',
-    sort_code         int           null comment '序号',
-
-    applicant_user_id bigint        null comment '申请人',
-    recede_type       varchar(20)   null comment '退书类型(xjr_dictionary_item[recede_type])',
-
-    base_semester_id  bigint        null comment '学期id(base_semester)',
-    class_id          bigint        null comment '班级编号',
+    create_user_id       bigint        null comment '创建人',
+    create_date          datetime      null comment '创建时间',
+    modify_user_id       bigint        null comment '修改人',
+    modify_date          datetime      null comment '修改时间',
+    delete_mark          int           not null comment '删除标记',
+    enabled_mark         int           not null comment '有效标志',
+    sort_code            int           null comment '序号',
 
-    recede_address    varchar(1000) null comment '退还地点',
-    status            int default 0 not null comment '状态（1:结束 0:未结束）'
+    applicant_user_id    bigint        null comment '申请人',
+    is_stu_flag          int           null comment '是否是学生',
+    is_head_tea_flag     int           null comment '是否是班主任',
+    is_class_recede_flag int           null comment '是否是班主任为班级退书',
+    recede_type          varchar(20)   null comment '退书类型(xjr_dictionary_item[recede_type])',
+    base_semester_id     bigint        null comment '学期id(base_semester)',
+    class_id             bigint        null comment '班级编号',
+    recede_address       varchar(1000) null comment '退还地点',
+    status               int default 0 not null comment '状态（1:结束 0:未结束）'
 ) engine = innodb
   default charset = utf8mb4
   collate = utf8mb4_0900_ai_ci comment ='退书申请';
@@ -416,18 +417,20 @@ create table `wf_textbook_recede_item`
 (
     id                    bigint   not null comment '主键编号'
         primary key,
-    create_user_id        bigint   null comment '创建人',
-    create_date           datetime null comment '创建时间',
-    modify_user_id        bigint   null comment '修改人',
-    modify_date           datetime null comment '修改时间',
-    delete_mark           int      not null comment '删除标记',
-    enabled_mark          int      not null comment '有效标志',
-    sort_code             int      null comment '序号',
-
-    wf_textbook_recede_id bigint   null comment '退书申请编号',
-
-    textbook_id           bigint   null comment '教材管理编号',
-    number                int      null comment '数量'
+    create_user_id              bigint       null comment '创建人',
+    create_date                 datetime     null comment '创建时间',
+    modify_user_id              bigint       null comment '修改人',
+    modify_date                 datetime     null comment '修改时间',
+    delete_mark                 int          not null comment '删除标记',
+    enabled_mark                int          not null comment '有效标志',
+    sort_code                   int          null comment '序号',
+
+    wf_textbook_recede_id       bigint       null comment '退书申请编号',
+    textbook_issue_record_id    bigint       null comment '出库记录主键',
+    textbook_issue_order_number varchar(256) null comment '出库订单号',
+    textbook_id                 bigint       null comment '教材管理编号',
+    textbook_name               varchar(256) null comment '教材名字',
+    number                      int          null comment '数量'
 ) engine = innodb
   default charset = utf8mb4
   collate = utf8mb4_0900_ai_ci comment ='退书申请项';