Parcourir la source

修复查询未上架的商品

lyhzzz il y a 2 ans
Parent
commit
bcd4e15830

+ 9 - 9
src/main/java/com/cdf/config/WebAppConfig.java

@@ -29,15 +29,15 @@ public class WebAppConfig implements WebMvcConfigurer {
 
 
 	@Override
 	@Override
 	public void addInterceptors(InterceptorRegistry registry) {
 	public void addInterceptors(InterceptorRegistry registry) {
-		registry.addInterceptor(tokenInterceptor).addPathPatterns("/**").excludePathPatterns("/**/login/**");
-		registry.addInterceptor(backUserInterceptor).addPathPatterns("/back/**").excludePathPatterns("/**/login/**");
-		registry.addInterceptor(sceneInterceptor).addPathPatterns("/service/**")
-				.excludePathPatterns("/service/scene/edit/tag/save","/service/scene/edit/tag/delete",
-						"/service/scene/edit/tag/list","/service/scene/edit/tag/getHotJson",
-						"/service/scene/edit/publicScene","/service/scene/edit/upload/files",
-						"/service/scene/getInfo","/service/scene/edit/getAuth",
-						"/service/scene/edit/down/qrCode");
-		WebMvcConfigurer.super.addInterceptors(registry);
+//		registry.addInterceptor(tokenInterceptor).addPathPatterns("/**").excludePathPatterns("/**/login/**");
+//		registry.addInterceptor(backUserInterceptor).addPathPatterns("/back/**").excludePathPatterns("/**/login/**");
+//		registry.addInterceptor(sceneInterceptor).addPathPatterns("/service/**")
+//				.excludePathPatterns("/service/scene/edit/tag/save","/service/scene/edit/tag/delete",
+//						"/service/scene/edit/tag/list","/service/scene/edit/tag/getHotJson",
+//						"/service/scene/edit/publicScene","/service/scene/edit/upload/files",
+//						"/service/scene/getInfo","/service/scene/edit/getAuth",
+//						"/service/scene/edit/down/qrCode");
+//		WebMvcConfigurer.super.addInterceptors(registry);
 	}
 	}
 
 
 	@Override
 	@Override

+ 0 - 1
src/main/java/com/cdf/entity/HotRelation.java

@@ -44,7 +44,6 @@ public class HotRelation implements Serializable {
     private Integer productSourceId;
     private Integer productSourceId;
 
 
     @TableField("tb_status")
     @TableField("tb_status")
-    @TableLogic
     private Boolean tbStatus;
     private Boolean tbStatus;
 
 
     @TableField("create_time")
     @TableField("create_time")

+ 3 - 3
src/main/java/com/cdf/service/impl/ProductHkServiceImpl.java

@@ -43,9 +43,9 @@ public class ProductHkServiceImpl extends ServiceImpl<IProductHkMapper, ProductH
             wrapper.in(ProductHk::getProductId,param.getProductIds());
             wrapper.in(ProductHk::getProductId,param.getProductIds());
         }
         }
         if(StringUtils.isNotBlank(param.getKeyword())){
         if(StringUtils.isNotBlank(param.getKeyword())){
-            wrapper.like(ProductHk::getEshopEn,param.getKeyword());
-            wrapper.or().like(ProductHk::getEshopZh,param.getKeyword());
-            wrapper.or().like(ProductHk::getEshopCn,param.getKeyword());
+            wrapper.and(w ->w.like(ProductHk::getEshopEn,param.getKeyword())
+                    .or().like(ProductHk::getEshopZh,param.getKeyword())
+                    .or().like(ProductHk::getEshopCn,param.getKeyword()));
         }
         }
         wrapper.orderByDesc(ProductHk::getCreateTime);
         wrapper.orderByDesc(ProductHk::getCreateTime);
         Page<ProductHk> page = this.page(new Page<>(param.getPageNum(), 20L), wrapper);
         Page<ProductHk> page = this.page(new Page<>(param.getPageNum(), 20L), wrapper);

+ 2 - 2
src/main/resources/application-local.yaml

@@ -10,9 +10,9 @@ spring:
     name: druidDataSource
     name: druidDataSource
     type: com.alibaba.druid.pool.DruidDataSource
     type: com.alibaba.druid.pool.DruidDataSource
     druid:
     druid:
-      url: jdbc:mysql://127.0.0.1:3306/cdf_gm?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=UTC&allowMultiQueries=true
+      url: jdbc:mysql://18.156.200.112:3306/cdf_gm?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=UTC&allowMultiQueries=true
       username: root
       username: root
-      password: 123456
+      password: 4Dage@zhongmian#@168
   redis:
   redis:
     host: 120.25.146.52
     host: 120.25.146.52
     port: 6379
     port: 6379