优惠包交接管理新增接口

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverDto.java

@@ -1,6 +1,7 @@
 package com.yxt.anrui.buscenter.api.busdiscountpackagehandover;
 
 import com.yxt.anrui.buscenter.api.busdiscountpackagehandoverlist.BusDiscountpackageHandoverList;
+import com.yxt.anrui.buscenter.api.busdiscountpackagehandoverlist.BusDiscountpackageHandoverListDto;
 import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -49,7 +50,7 @@ public class BusDiscountpackageHandoverDto implements Dto {
     @ApiModelProperty("使用组织名称")
     private String useOrgName; // 库存状态value
     @ApiModelProperty("优惠包交接优惠包列表")
-    private List<BusDiscountpackageHandoverList> busDiscountpackageHandoverLists;
+    private List<BusDiscountpackageHandoverListDto> busDiscountpackageHandoverLists;
 
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverFeign.java

@@ -26,6 +26,7 @@ public interface BusDiscountpackageHandoverFeign {
     @PostMapping("/listPage")
     public ResultBean<PagerVo<BusDiscountpackageHandoverVo>> listPage(@RequestBody PagerQuery<BusDiscountpackageHandoverQuery> pq);
 
+
     @ApiOperation("新增保存")
     @PostMapping("/save")
     public ResultBean save(@RequestBody BusDiscountpackageHandoverDto dto);

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandoverlist/BusDiscountpackageHandoverList.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.yxt.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 /**
  * @author Administrator
@@ -12,6 +13,7 @@ import io.swagger.annotations.ApiModelProperty;
  */
 @ApiModel(value = "优惠包交接优惠包列表", description = "优惠包交接优惠包列表")
 @TableName("bus_discountpackage_handoverlist")
+@Data
 public class BusDiscountpackageHandoverList extends BaseEntity {
 
     private static final long serialVersionUID = 1L;

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverService.java

@@ -1,9 +1,16 @@
 package com.yxt.anrui.buscenter.biz.busdiscountpackagehandover;
+
 import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.BusDiscountpackageHandover;
 import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.BusDiscountpackageHandoverDto;
+import com.yxt.anrui.buscenter.api.busdiscountpackagehandoverlist.BusDiscountpackageHandoverList;
+import com.yxt.anrui.buscenter.api.busdiscountpackagehandoverlist.BusDiscountpackageHandoverListDto;
+import com.yxt.anrui.buscenter.biz.busdiscountpackagehandoverlist.BusDiscountpackageHandoverListService;
 import com.yxt.common.base.service.MybatisBaseService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * @author Administrator
  * @description
@@ -12,15 +19,31 @@ import org.springframework.stereotype.Service;
 @Service
 public class BusDiscountpackageHandoverService extends MybatisBaseService<BusDiscountpackageHandoverMapper, BusDiscountpackageHandover> {
 
+    @Autowired
+    private BusDiscountpackageHandoverListService busDiscountpackageHandoverListService;
+
     /**
      * 新增
+     *
      * @param dto
      */
     public void saveOrUpdateDto(BusDiscountpackageHandoverDto dto) {
-        String sid = dto.getSid();
         BusDiscountpackageHandover entity = new BusDiscountpackageHandover();
-        entity.setSid(sid);
+        String sid = entity.getSid();
+        dto.setSid(sid);
         dto.fillEntity(entity);
-        this.saveOrUpdate(entity);
+        List<BusDiscountpackageHandoverListDto> listDtos = dto.getBusDiscountpackageHandoverLists();
+        if (null != listDtos) {
+            for (BusDiscountpackageHandoverListDto listDto : listDtos) {
+                listDto.setMainSid(entity.getSid());
+                BusDiscountpackageHandoverList handoverList = new BusDiscountpackageHandoverList();
+                String listSid = handoverList.getSid();
+                listDto.setMainSid(sid);
+                listDto.setSid(listSid);
+                listDto.fillEntity(handoverList);
+                busDiscountpackageHandoverListService.save(handoverList);
+            }
+        }
+        this.save(entity);
     }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandoverlist/BusDiscountpackageHandoverListService.java

@@ -14,9 +14,7 @@ public class BusDiscountpackageHandoverListService extends MybatisBaseService<Bu
 
 
     public void saveOrUpdateDto(BusDiscountpackageHandoverListDto dto) {
-        String sid = dto.getSid();
         BusDiscountpackageHandoverList entity = new BusDiscountpackageHandoverList();
-        entity.setSid(sid);
         dto.fillEntity(entity);
         this.saveOrUpdate(entity);
     }