xw 2 tygodni temu
rodzic
commit
389ca7991a

+ 0 - 3
fs-common/src/main/java/com/fs/common/core/redis/RedisCache.java

@@ -1,6 +1,5 @@
 package com.fs.common.core.redis;
 
-import java.io.IOException;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -292,8 +291,6 @@ public class RedisCache
                         keys.add(key);
                     }
                 }
-            } catch (IOException e) {
-                throw new RuntimeException("Redis SCAN failed, pattern: " + pattern, e);
             }
             return null;
         });

+ 1 - 1
fs-service/src/main/java/com/fs/course/service/impl/UserProjectRepeatMaintainServiceImpl.java

@@ -65,7 +65,7 @@ public class UserProjectRepeatMaintainServiceImpl implements IUserProjectRepeatM
         if (fsUserId == null) {
             return false;
         }
-        Integer count = fsUserProjectRepeatMapper.selectCount(
+        Long count = fsUserProjectRepeatMapper.selectCount(
                 new QueryWrapper<FsUserProjectRepeat>()
                         .eq("fs_user_id", fsUserId)
                         .eq("is_repeat", 1));

+ 9 - 6
fs-service/src/main/java/com/fs/hisStore/domain/FsStoreProductTagScrm.java

@@ -5,26 +5,29 @@ import com.fs.common.core.domain.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+
 /**
- * 商品标签对象 fs_store_product_tag_scrm
+ * 闂ㄥ簵鍟嗗搧鏍囩�琛� fs_store_product_tag_scrm
  */
 @EqualsAndHashCode(callSuper = true)
 @Data
-public class FsStoreProductTagScrm extends BaseEntity {
+public class FsStoreProductTagScrm extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    /** 涓婚敭ID */
     private Long id;
 
-    @Excel(name = "店铺ID")
+    @Excel(name = "闂ㄥ簵ID")
     private Long storeId;
 
-    @Excel(name = "标签名称")
+    @Excel(name = "鏍囩�鍚嶇О")
     private String tagName;
 
-    @Excel(name = "状态", readConverterExp = "1=显示,0=隐藏")
+    @Excel(name = "鐘舵€�", readConverterExp = "1=鏄剧ず,0=闅愯棌")
     private Integer status;
 
-    @Excel(name = "排序")
+    @Excel(name = "鎺掑簭")
     private Long sort;
 }

+ 1 - 1
fs-service/src/main/java/com/fs/hisStore/mapper/FsStoreProductTagScrmMapper.java

@@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 /**
- * ÉÌÆ·±êÇ© Mapper
+ * Mapper
  */
 public interface FsStoreProductTagScrmMapper {
 

+ 1 - 1
fs-service/src/main/java/com/fs/hisStore/service/IFsStoreProductTagScrmService.java

@@ -7,7 +7,7 @@ import com.fs.hisStore.vo.FsStoreTagProductVO;
 import java.util.List;
 
 /**
- * ÉĚơąęÇŠ Service ˝ÓżÚ
+ * Service
  */
 public interface IFsStoreProductTagScrmService {
 

+ 3 - 3
fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreProductTagScrmServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
 import java.util.List;
 
 /**
- * 商品标签 Service 实现
+ * Service
  */
 @Service
 public class FsStoreProductTagScrmServiceImpl implements IFsStoreProductTagScrmService {
@@ -48,7 +48,7 @@ public class FsStoreProductTagScrmServiceImpl implements IFsStoreProductTagScrmS
     @Override
     public int insert(FsStoreProductTagScrm entity) {
         if (entity.getTagName() != null && entity.getTagName().length() > 4) {
-            throw new ServiceException("标签名称最多4个字");
+            throw new ServiceException("鏍囩�鍚嶇О涓嶈兘瓒呰繃4涓�瓧");
         }
         entity.setCreateTime(DateUtils.getNowDate());
         entity.setUpdateTime(DateUtils.getNowDate());
@@ -58,7 +58,7 @@ public class FsStoreProductTagScrmServiceImpl implements IFsStoreProductTagScrmS
     @Override
     public int update(FsStoreProductTagScrm entity) {
         if (entity.getTagName() != null && entity.getTagName().length() > 4) {
-            throw new ServiceException("标签名称最多4个字");
+            throw new ServiceException("鏍囩�鍚嶇О涓嶈兘瓒呰繃4涓�瓧");
         }
         entity.setUpdateTime(DateUtils.getNowDate());
         return mapper.update(entity);

+ 8 - 1
fs-service/src/main/java/com/fs/hisStore/vo/FsStoreProductTagListVO.java

@@ -6,18 +6,25 @@ import java.io.Serializable;
 import java.util.Date;
 
 /**
- * 商品标签列表VO(含关联商品数量)
+ * 鍟嗗搧鏍囩�鍒楄〃VO 闂ㄥ簵鍟嗗搧鏍囩�
  */
 @Data
 public class FsStoreProductTagListVO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    /** 涓婚敭ID */
     private Long id;
+    /** 闂ㄥ簵ID */
     private Long storeId;
+    /** 鏍囩�鍚嶇О */
     private String tagName;
+    /** 鐘舵€� 0绂佺敤 1鍚�敤 */
     private Integer status;
+    /** 鎺掑簭鍊� */
     private Long sort;
+    /** 鍒涘缓鏃堕棿 */
     private Date createTime;
+    /** 鍏宠仈鍟嗗搧鏁伴噺 */
     private Integer productCount;
 }

+ 1 - 1
fs-service/src/main/java/com/fs/hisStore/vo/FsStoreTagProductVO.java

@@ -6,7 +6,7 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 
 /**
- * ±êÇ©¹ØÁªÉÌÆ·Ïî
+ *
  */
 @Data
 public class FsStoreTagProductVO implements Serializable {