藏品转拍卖品

ch-admin-api/src/main/java/com/wwdz/ch/admin/controller/SysSpecialPerformanceController.java

@@ -5,6 +5,7 @@ import com.wwdz.ch.admin.service.SysSpecialPerformanceService;
 import com.wwdz.ch.admin.service.SysSupplierItemService;
 import com.wwdz.ch.core.consts.ResultCode;
 import com.wwdz.ch.core.type.Result;
+import com.wwdz.ch.db.domain.distribution.SpecialPerformanceConfig;
 import com.wwdz.ch.db.dto.request.distribution.SpecialPerformanceConfigRequestDto;
 import com.wwdz.ch.db.dto.request.distribution.SpecialPerformanceRequestDto;
 import com.wwdz.ch.db.dto.request.distribution.SupplierItemRequestDto;
@@ -48,6 +49,49 @@ public class SysSpecialPerformanceController {
     }
 
 
+    @ApiOperation(value = "新增拍卖专场")
+    @PostMapping("/create")
+    public Result create(@RequestBody SpecialPerformanceRequestDto dto) {
+        logger.info("新增拍卖专场,请求参数:{}", JSON.toJSONString(dto));
+        if (dto.getSpecialPerformanceId() == null) {
+            return Result.failed(ResultCode.PARAM_ERROR);
+        }
+        return sysSpecialPerformanceService.create(dto);
+    }
+
+
+    @ApiOperation(value = "删除拍卖专场")
+    @PostMapping("/delete")
+    public Result delete(@RequestBody SpecialPerformanceRequestDto dto) {
+        logger.info("删除拍卖专场,请求参数:{}", JSON.toJSONString(dto));
+        if (dto.getSpecialPerformanceId() == null) {
+            return Result.failed(ResultCode.PARAM_ERROR);
+        }
+        return sysSpecialPerformanceService.delete(dto);
+    }
+
+
+    @ApiOperation(value = "删除拍卖专场的商品")
+    @PostMapping("/deleteItem")
+    public Result deleteItem(@RequestBody SpecialPerformanceConfigRequestDto dto) {
+        logger.info("删除拍卖专场的商品,请求参数:{}", JSON.toJSONString(dto));
+        if (dto.getSpecialPerformanceId() == null) {
+            return Result.failed(ResultCode.PARAM_ERROR);
+        }
+        return sysSpecialPerformanceService.deleteItem(dto);
+    }
+
+    @ApiOperation(value = "添加拍卖专场的商品")
+    @PostMapping("/addItem")
+    public Result addItem(@RequestBody SpecialPerformanceConfigRequestDto dto) {
+        logger.info("添加拍卖专场的商品,请求参数:{}", JSON.toJSONString(dto));
+        if (dto.getSpecialPerformanceId() == null) {
+            return Result.failed(ResultCode.PARAM_ERROR);
+        }
+        return sysSpecialPerformanceService.addItem(dto);
+    }
+
+
     @ApiOperation(value = "修改拍卖专场")
     @PostMapping("/update")
     public Result update(@RequestBody SpecialPerformanceRequestDto dto) {

ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/SysSpecialPerformanceServiceImpl.java

@@ -67,12 +67,13 @@ public class SysSpecialPerformanceServiceImpl implements SysSpecialPerformanceSe
                 long itemNum = specialPerformanceConfigDao.countItem(specialPerformance.getId());
                 specialPerformanceVo.setItemNum(itemNum);
                 //出价总数
-                List<SpecialPerformanceConfig> allItemlist = specialPerformanceConfigDao.findAllItem(dto.getSpecialPerformanceId());
+                List<SpecialPerformanceConfig> allItemlist = specialPerformanceConfigDao.findAllItem(specialPerformance.getId());
                 List<Long> itemIdList = allItemlist.stream().map(SpecialPerformanceConfig::getItemId).collect(Collectors.toList());
                 AuctionRecordRequestDto auctionRecordRequestDtoOfTotal = new AuctionRecordRequestDto();
                 auctionRecordRequestDtoOfTotal.setItemIdList(itemIdList);
                 long totalOfferNum = auctionRecordDao.count(auctionRecordRequestDtoOfTotal);
                 specialPerformanceVo.setOfferNum(totalOfferNum);
+                specialPerformanceVo.setStateName(SpecialPerformanceEnum.StateEnum.getNameByCode(specialPerformance.getState()));
                 specialPerformanceVos.add(specialPerformanceVo);
             }
             return Result.success(PageSearchResult.of(pageInfo, specialPerformanceVos));

ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/SysSupplierItemServiceImpl.java

@@ -425,10 +425,10 @@ public class SysSupplierItemServiceImpl implements SysSupplierItemService {
                 supplierItem.setUpdateTime(now);
                 supplierItem.setType(DistributionEnum.DistributionTypeEnum.AUCTION.getCode());
                 supplierItem.setIsAbleSale(true);
-                supplierItemDao.insert(supplierItem);
+                long newItemId = supplierItemDao.insert(supplierItem);
                 //新增默认拍卖配置
                 AuctionConfig auctionConfig = new AuctionConfig();
-                auctionConfig.setItemId(itemId);
+                auctionConfig.setItemId(newItemId);
                 auctionConfig.setIsValid(false);
                 auctionConfig.setIsDeal(false);
                 auctionConfig.setStartTime(StringUtils.isEmpty(dto.getAuctionStartTime()) ? new Date(): DateUtils.parseString(dto.getAuctionStartTime()));

ch-core/src/main/java/com/wwdz/ch/core/consts/SpecialPerformanceEnum.java

@@ -39,8 +39,8 @@ public class SpecialPerformanceEnum {
         DELETED(-1, "删除"),
         NOT_START(0, "未开始"),
         PREVIEW(1, "预览中"),
-        PROCESSING(10, "竞拍中"),
-        END(20, "竞拍结束")
+        PROCESSING(2, "竞拍中"),
+        END(3, "竞拍结束")
         ;
 
         private int code;