Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/textbook/controller/TextbookSubscriptionController.java

@@ -165,8 +165,7 @@ public class TextbookSubscriptionController {
     @ApiOperation(value = "新增教材教辅征订记录表")
     @SaCheckPermission("textbooksubscription:add")
     public RT<Boolean> add(@Valid @RequestBody AddTextbookSubscriptionDto dto){
-        TextbookSubscription textbookSubscription = BeanUtil.toBean(dto, TextbookSubscription.class);
-        boolean isSuccess = textbookSubscriptionService.add(textbookSubscription);
+        boolean isSuccess = textbookSubscriptionService.add(dto);
         return RT.ok(isSuccess);
     }
 

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

@@ -49,17 +49,22 @@ public class AddTextbookSubscriptionItemDto implements Serializable {
     */
     @ApiModelProperty("教师用书征订数量")
     private Integer teacherNum;
+    /**
+     * 定价(元)
+     */
+    @ApiModelProperty("定价(元)")
+    private BigDecimal sourcePrice;
+//    /**
+//     * 小计(元)
+//     */
+//    @ApiModelProperty("小计(元)")
+//    private BigDecimal price;
     /**
     * 实际折扣
     */
     @ApiModelProperty("实际折扣")
     private Double discount;
     /**
-    * 实际价格(元)
-    */
-    @ApiModelProperty("实际价格(元)")
-    private BigDecimal price;
-    /**
     * 当前征订任务征订项入库数量
     */
     @ApiModelProperty("当前征订任务征订项入库数量")

src/main/java/com/xjrsoft/module/textbook/service/ITextbookSubscriptionService.java

@@ -51,10 +51,10 @@ public interface ITextbookSubscriptionService extends MPJBaseService<TextbookSub
     /**
     * 新增
     *
-    * @param textbookSubscription
+    * @param dto
     * @return
     */
-    Boolean add(TextbookSubscription textbookSubscription);
+    Boolean add(AddTextbookSubscriptionDto dto);
 
     /**
      * 入库

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

@@ -364,7 +364,26 @@ public class TextbookSubscriptionServiceImpl extends MPJBaseServiceImpl<Textbook
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Boolean add(TextbookSubscription textbookSubscription) {
+    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);
+
         // 处理征订表
         int sum = 0;
         for (TextbookSubscriptionItem textbookSubscriptionItem : textbookSubscription.getTextbookSubscriptionItemList()) {