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

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinStoreInfoVo.java

@@ -57,6 +57,8 @@ public class GoblinStoreInfoVo implements Serializable, Cloneable {
 
     @ApiModelProperty(position = 30, value = "店铺认证信息")
     private GoblinStoreCertificationVo certificationVo;
+    @ApiModelProperty(position = 31, value = "商铺商品数量")
+    private int count;
 
 
     private static final GoblinStoreInfoVo obj = new GoblinStoreInfoVo();

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/store/homeSet/RubikArea.html

@@ -173,7 +173,7 @@
             // addItem (1);
             let url = window.location.hostname;
             if (url.includes('test')) {
-                $("#iframe").attr('src', 'https://testm.zhengzai.tv/#/goods/home?place=admin');
+                $("#iframe").attr('src', 'https://ttestm.zhengzai.tv/#/goods/home?place=admin');
             } else if (!url.includes('test') && url.includes('admin')) {
                 $("#iframe").attr('src', 'https://m.zhengzai.tv/#/goods/home?place=admin');
             } else {

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/store/homeSet/carefullyGoods.html

@@ -186,7 +186,7 @@
         $(function() {
             let url = window.location.hostname;
             if (url.includes('test')) {
-                $("#iframe").attr('src', 'https://testm.zhengzai.tv/#/goods/home?place=admin');
+                $("#iframe").attr('src', 'https://ttestm.zhengzai.tv/#/goods/home?place=admin');
             } else if (!url.includes('test') && url.includes('admin')) {
                 $("#iframe").attr('src', 'https://m.zhengzai.tv/#/goods/home?place=admin');
             } else {

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/store/homeSet/index.html

@@ -149,7 +149,7 @@
         $(function() {
             let url = window.location.hostname;
             if (url.includes('test')) {
-                $("#iframe").attr('src', 'https://testm.zhengzai.tv/#/goods/home?place=admin');
+                $("#iframe").attr('src', 'https://ttestm.zhengzai.tv/#/goods/home?place=admin');
             } else if (!url.includes('test') && url.includes('admin')) {
                 $("#iframe").attr('src', 'https://m.zhengzai.tv/#/goods/home?place=admin');
             } else {

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/store/homeSet/kingArea.html

@@ -161,7 +161,7 @@
         $(function() {
             let url = window.location.hostname;
             if (url.includes('test')) {
-                $("#iframe").attr('src', 'https://testm.zhengzai.tv/#/goods/home?place=admin');
+                $("#iframe").attr('src', 'https://ttestm.zhengzai.tv/#/goods/home?place=admin');
             } else if (!url.includes('test') && url.includes('admin')) {
                 $("#iframe").attr('src', 'https://m.zhengzai.tv/#/goods/home?place=admin');
             } else {

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/store/homeSet/searchStore.html

@@ -130,7 +130,7 @@
         $(function(){
             let url = window.location.hostname;
             if (url.includes('test')) {
-                $("#iframe").attr('src', 'https://testm.zhengzai.tv/#/goods/home?place=admin');
+                $("#iframe").attr('src', 'https://ttestm.zhengzai.tv/#/goods/home?place=admin');
             } else if (!url.includes('test') && url.includes('admin')) {
                 $("#iframe").attr('src', 'https://m.zhengzai.tv/#/goods/home?place=admin');
             } else {

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/store/homeSet/topBanner.html

@@ -165,7 +165,7 @@
         $(function(){
             let url = window.location.hostname;
             if (url.includes('test')) {
-                $("#iframe").attr('src', 'https://testm.zhengzai.tv/#/goods/home?place=admin');
+                $("#iframe").attr('src', 'https://ttestm.zhengzai.tv/#/goods/home?place=admin');
             } else if (!url.includes('test') && url.includes('admin')) {
                 $("#iframe").attr('src', 'https://m.zhengzai.tv/#/goods/home?place=admin');
             } else {

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

@@ -111,9 +111,9 @@ public class GoblinFrontController {
         return ResponseDto.success( goblinFrontService.getStoreCategory(storeId));
     }
     @GetMapping("getStoreGoodes")
-    @ApiOperation("获得店铺分类")
-    public ResponseDto<List<GoblinStoreGoodsCategoryVo>> getStoreGoodes(@RequestParam(name = "storeId", required = true)String storeId) throws ParseException {
-        return ResponseDto.success( goblinFrontService.getStoreCategory(storeId));
+    @ApiOperation("获得店铺商品")
+    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));
     }
 
 

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

@@ -304,7 +304,12 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
         return goblinFrontCubeVo;
     }
     public  GoblinStoreInfoVo getStore(String storId){
-      return   goblinRedisUtils.getStoreInfoVo(storId);
+        Query query = new Query();
+        query.addCriteria(Criteria.where("storeId").is(storId));
+        long count = mongoTemplate.count(query, GoblinGoodsInfoVo.class, GoblinGoodsInfoVo.class.getSimpleName());
+        GoblinStoreInfoVo goblinStoreInfoVo=goblinRedisUtils.getStoreInfoVo(storId);
+        goblinStoreInfoVo.setCount((int) count);
+      return   goblinStoreInfoVo;
     }
     /***
      * @author zhangfuxin