Merge remote-tracking branch 'origin/dev_goblin' into dev_goblin

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/goblin/service/impl/GoblinFrontBannerServiceImpl.java

@@ -44,6 +44,7 @@ public class GoblinFrontBannerServiceImpl extends ServiceImpl<GoblinFrontBannerM
 
     public boolean create(GoblinFrontBanner goblinFrontBanner){
         goblinFrontBanner.setCreateTime(LocalDateTime.now());
+        goblinFrontBanner.setUpdateTime(LocalDateTime.now());
         //设置bannerid
         goblinFrontBanner.setBannerId(IDGenerator.nextSnowId());
         //增加 banner

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/goblin/service/impl/GoblinFrontCubeServiceImpl.java

@@ -47,6 +47,7 @@ public class GoblinFrontCubeServiceImpl extends ServiceImpl<GoblinFrontCubeMappe
 
     public boolean create(GoblinFrontCube goblinFrontCube){
         goblinFrontCube.setCreateTime(LocalDateTime.now());
+        goblinFrontCube.setUpdateTime(LocalDateTime.now());
         //设置bannerid
         goblinFrontCube.setCubeId(IDGenerator.nextSnowId());
         //增加 banner

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/goblin/service/impl/GoblinFrontHotWordServiceImpl.java

@@ -46,6 +46,7 @@ public class GoblinFrontHotWordServiceImpl extends ServiceImpl<GoblinFrontHotWor
 
     public boolean create(GoblinFrontHotWord goblinFrontHotWord){
         goblinFrontHotWord.setCreateTime(LocalDateTime.now());
+        goblinFrontHotWord.setUpdateTime(LocalDateTime.now());
         //设置bannerid
         goblinFrontHotWord.setHotWordId(IDGenerator.nextSnowId());
         //增加 banner

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/goblin/service/impl/GoblinFrontNavigationServiceImpl.java

@@ -50,6 +50,7 @@ public class GoblinFrontNavigationServiceImpl extends ServiceImpl<GoblinFrontNav
 
     public boolean create(GoblinFrontNavigation goblinFrontNavigation){
         goblinFrontNavigation.setCreateTime(LocalDateTime.now());
+        goblinFrontNavigation.setUpdateTime(LocalDateTime.now());
         //设置金刚位id
         goblinFrontNavigation.setNavigationId(IDGenerator.nextSnowId());
         //mysql插入

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/goblin/service/impl/GoblinFrontSelectGoodsServiceImpl.java

@@ -56,6 +56,7 @@ public class GoblinFrontSelectGoodsServiceImpl extends ServiceImpl<GoblinFrontSe
         }
         //
         goblinFrontSelectGoods.setCreateTime(LocalDateTime.now());
+        goblinFrontSelectGoods.setUpdateTime(LocalDateTime.now());
         //设置bannerid
         goblinFrontSelectGoods.setSelectGoodsId(IDGenerator.nextSnowId());
         //增加 banner

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/controller/GoblinFrontController.java

@@ -115,6 +115,11 @@ public class GoblinFrontController {
     public ResponseDto<List<GoblinGoodsInfoVo>> getStoreGoodes(@RequestParam(name = "storeId", required = true)String storeId,@RequestParam(name = "categoryId", required = true)String categoryId) throws ParseException {
         return ResponseDto.success( goblinFrontService.getStoreGoodes(storeId,categoryId));
     }
+    @GetMapping("getStoreGoodes")
+    @ApiOperation("搜索商品名字")
+    public ResponseDto<List<GoblinGoodsInfoVo>> searchGoodesName(@RequestParam(name = "name", required = true)String name) throws ParseException {
+        return ResponseDto.success( goblinFrontService.searchGoodesName(name));
+    }
 
 
 

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinFrontServiceImpl.java

@@ -350,6 +350,9 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
         return goblinCategoryzfVo;
 
     }
+    public List<GoblinGoodsInfoVo> searchGoodesName(String name){
+        return null;
+    }
     public List<GoblinGoodsInfoVo> getStoreGoodes(String storeId,String categoryId){
         //
         Query query = new Query();