Merge branch 'quanku_12-14' into quanku_change_user_by_wwdz

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/FavoritesServiceImpl.java

@@ -255,6 +255,7 @@ public class FavoritesServiceImpl implements FavoritesService {
                     itemResponseVo.setDetail(item.getDetail());
                     itemResponseVo.setFavoritesId(dto.getId());
                     itemResponseVo.setIsDeleted(item.getIsDeleted());
+                    itemResponseVo.setIsOnSale(item.getIsOnSale());
                     itemResponseVo.setViewPermission(item.getViewPermission());
                     // 设置价格
                     itemResponseVo.setPrice(getPrice(item.getPrice()));

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/FootPrintServiceImpl.java

@@ -101,6 +101,7 @@ public class FootPrintServiceImpl implements FootPrintService {
                 itemResponseVo.setImages(item.getImages());
                 itemResponseVo.setDetail(item.getDetail());
                 itemResponseVo.setIsDeleted(item.getIsDeleted());
+                itemResponseVo.setIsOnSale(item.getIsOnSale());
                 // 设置价格
                 itemResponseVo.setPrice(getPrice(item.getPrice()));
                 // 设置是否收藏或是否是自己发布的

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/ItemServiceImpl.java

@@ -303,6 +303,7 @@ public class ItemServiceImpl implements ItemService {
                 itemResponseVo.setIsCollected(favoritesItemsRelationDao.isCollected(dto.getUserId(), item.getId(), null) ? 1 : 0);
                 itemResponseVo.setDetail(item.getDetail());
                 itemResponseVo.setSourceType(item.getSourceType());
+                itemResponseVo.setIsOnSale(item.getIsOnSale());
                 itemResponseVo.setViewPermission(0);
                 // 设置藏品发布用户的昵称和头像
                 itemCommonService.getNicknameAvatar(item.getId(), itemResponseVo);
@@ -397,6 +398,7 @@ public class ItemServiceImpl implements ItemService {
                         itemResponseVo.setDetail(item.getDetail());
                         itemResponseVo.setSourceType(item.getSourceType());
                         itemResponseVo.setViewPermission(item.getViewPermission());
+                        itemResponseVo.setIsOnSale(item.getIsOnSale());
                         // 设置价格
                         itemResponseVo.setPrice(getPrice(item.getPrice()));
                         // 设置图片或视频
@@ -450,6 +452,7 @@ public class ItemServiceImpl implements ItemService {
                         itemResponseVo.setDetail(es.getDetail());
                         itemResponseVo.setSourceType(es.getSourceType());
                         itemResponseVo.setViewPermission(0);
+                        itemResponseVo.setIsOnSale(es.getIsOnSale());
                         // 设置价格
                         itemResponseVo.setPrice(getPrice(es.getPrice()));
                         // 设置图片或视频
@@ -511,6 +514,7 @@ public class ItemServiceImpl implements ItemService {
                 itemResponseVo.setDetail(item.getDetail());
                 itemResponseVo.setSourceType(item.getSourceType());
                 itemResponseVo.setViewPermission(0);
+                itemResponseVo.setIsOnSale(item.getIsOnSale());
                 // 设置藏品发布用户的昵称和头像
                 itemCommonService.getNicknameAvatar(item.getId(), itemResponseVo);
                 AgentTranceResponseVo agentTranceResponseVo = new AgentTranceResponseVo();
@@ -822,6 +826,11 @@ public class ItemServiceImpl implements ItemService {
     @Override
     public Result del(ItemRequestDto dto) {
         try {
+            List<ConsignSale> consignSales = consignSaleDao.findByItemId(dto.getId());
+            long count = consignSales.stream().filter(consignSale -> consignSale.getCustomState().intValue() == ConsignSaleEnum.SaleForUserStateEnum.CONSIGN_SALEING.getCode()).count();
+            if (count > 0) {
+                return Result.failed("该藏品正在寄售中，不能删除");
+            }
             itemDao.deleteById(dto.getId());
             UserItemsRelation userItemsRelation = itemDao.find(dto.getId());
             if (Objects.nonNull(userItemsRelation)) {

ch-wx-api/src/main/java/com/wwdz/ch/wx/web/ConsignSaleController.java

@@ -47,10 +47,13 @@ public class ConsignSaleController {
         Validator validator = new Validator(FormHandler.ofEntity(dto));
         validator.set("userId", "用户ID").must().number()
                 .set("name", "标题").must().string()
-                .set("images", "图片").must().string()
                 .end();
         if (!validator.isValid()) {
-            return Result.failed(ResultCode.PARAM_ERROR.getCode(), validator.getErrorInfo());
+            return Result.failed(validator.getErrorInfo());
+        }
+
+        if (org.springframework.util.StringUtils.isEmpty(dto.getImages())) {
+            return Result.failed("请至少上传一张图片");
         }
         //先发布商品
         dto.setPrice(StringUtils.isBlank(dto.getPrice()) ? "0" : dto.getPrice());