删除盲盒转换的商品时，恢复原始类型

ch-dao/src/main/java/com/wwdz/ch/db/dao/ItemTagOperateRecordDao.java

@@ -21,4 +21,12 @@ public interface ItemTagOperateRecordDao {
      */
     List<ItemTagOperateRecord> findByPage(ItemTagOperateRecordRequestDto dto);
 
+
+    /**
+     * 查询是否存在该商品的制作标签记录
+     * @param itemId
+     * @return
+     */
+    boolean isExisted(long itemId);
+
 }

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

@@ -157,6 +157,8 @@ public class SupplierItemServiceImpl implements SupplierItemService {
     @Autowired
     RedisUtils redisUtils;
 
+    @Autowired
+    ItemTagOperateRecordDao itemTagOperateRecordDao;
 
     @Override
     public Result findList(SupplierItemRequestDto dto) {
@@ -1164,6 +1166,14 @@ public class SupplierItemServiceImpl implements SupplierItemService {
     public Result delete(SupplierItemRequestDto dto) {
         try {
             supplierItemDao.delete(dto.getId());
+            //判断是否是盲盒标签制作的商品，如果是盲盒商品，则恢复商品类型为盲盒，以便重新扫码
+            if (itemTagOperateRecordDao.isExisted(dto.getId())) {
+                SupplierItem supplierItem = new SupplierItem();
+                supplierItem.setId(dto.getId());
+                supplierItem.setType(DistributionEnum.DistributionTypeEnum.BLACK.getCode());
+                supplierItem.setCreatorId(CommConsts.PRINT_ITEM_TAG_CREATOR_ID);
+                supplierItemDao.update(supplierItem);
+            }
             //删除标签关联
             CollectionItemsRelationRequestDto collectionItemsRelationRequestDto = new CollectionItemsRelationRequestDto();
             collectionItemsRelationRequestDto.setItemId(dto.getId());
@@ -1364,7 +1374,7 @@ public class SupplierItemServiceImpl implements SupplierItemService {
         try {
             //判断是否已经上架过
             SupplierItem supplierItem = supplierItemDao.findById(dto.getItemId());
-            if (supplierItem.getCreatorId() != null && !supplierItem.getIsDeleted()) {
+            if (supplierItem.getCreatorId() != CommConsts.PRINT_ITEM_TAG_CREATOR_ID && !supplierItem.getIsDeleted()) {
                 return Result.failed(ResultCode.ITEM_UPLOADED);
             }
             SupplierItemVo supplierItemVo = new SupplierItemVo();