批次修改

src/main/java/com/izouma/awesomeAdmin/service/SaleBatchService.java

@@ -75,9 +75,8 @@ public class SaleBatchService {
         return saleBatches;
     }
 
-    public SaleBatchDto create1(SaleBatchDto record) {
-        List<SalesBatchExtension> extensions = record.getExtensions();
-        SaleBatch batch = record.getSaleBatch();
+    public SaleBatch create1(SaleBatch batch) {
+        List<SalesBatchExtension> extensions = batch.getExtensions();
         BigDecimal maxPrice = extensions.stream()
                                         .map(SalesBatchExtension::getMaxPrice)
                                         .max(BigDecimal::compareTo)
@@ -88,14 +87,14 @@ public class SaleBatchService {
         extensionRepo.saveAllAndFlush(extensions);
         schedule();
         cacheService.clearBatch();
-        return new SaleBatchDto(saleBatch, extensions);
+        return batch;
     }
 
-    public SaleBatchDto update1(SaleBatchDto record) {
-        List<SalesBatchExtension> extensions = record.getExtensions();
-        SaleBatch orig = saleBatchRepo.findById(record.getSaleBatch().getId())
+    public SaleBatch update1(SaleBatch batch) {
+        List<SalesBatchExtension> extensions = batch.getExtensions();
+        SaleBatch orig = saleBatchRepo.findById(batch.getId())
                                       .orElseThrow(new BusinessException(Translator.toLocale("record.not_found")));
-        ObjUtils.merge(orig, record.getSaleBatch());
+        ObjUtils.merge(orig, batch);
         SaleBatch saleBatch = saleBatchRepo.saveAndFlush(orig);
         List<SalesBatchExtension> list = extensionRepo.findAllByBatchId(orig.getId());
         if (list.size() > 0) {
@@ -105,7 +104,7 @@ public class SaleBatchService {
         extensionRepo.saveAll(extensions);
         schedule();
         cacheService.clearBatch();
-        return new SaleBatchDto(saleBatch, extensions);
+        return batch;
     }
 
     public SaleBatchDto addExtensions(List<SalesBatchExtension> extensions) {

src/main/java/com/izouma/awesomeAdmin/web/SaleBatchController.java

@@ -46,8 +46,8 @@ public class SaleBatchController extends BaseController {
 
     @PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")
-    public SaleBatchDto saveOne(@RequestBody SaleBatchDto record) {
-        if (record.getSaleBatch().getId() == null) {
+    public SaleBatch saveOne(@RequestBody SaleBatch record) {
+        if (record.getId() == null) {
             return saleBatchService.create1(record);
         } else {
             return saleBatchService.update1(record);