Merge branch '2.0.0' of http://git.ycjcjy.com/fuxingfan/smartCommunity into 2.0.0

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TpShopType.java

@@ -1,6 +1,7 @@
 package com.community.huiju.model;
 
 import java.util.Date;
+import java.util.List;
 
 public class TpShopType {
     private Integer id;
@@ -17,6 +18,17 @@ public class TpShopType {
 
     private Integer createUser;
 
+    // 首页图标
+    private List<String> img;
+
+    public List<String> getImg() {
+        return img;
+    }
+
+    public void setImg(List<String> img) {
+        this.img = img;
+    }
+
     public Integer getId() {
         return id;
     }

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TpShopServicelmpl.java

@@ -83,51 +83,61 @@ public class TpShopServicelmpl implements TpShopServicel {
         // 当前线下商铺是否展示
         String shopSetting= tpShopMapper.shopSetting(userElement.getCommunityId());
         List<TpShop> tpShopList = null;
-        List<TpShopType> tpShopType =null;
-        if (null != shopSetting){
-            tpShopList= tpShopMapper.selectShopCommunity(userElement.getCommunityId());
-            for (TpShop tpShop:tpShopList){
+        List<TpShopType> tpShopTypeList =null;
+        if (null != shopSetting) {
+            tpShopList = tpShopMapper.selectShopCommunity(userElement.getCommunityId());
+            for (TpShop tpShop : tpShopList) {
                 // 1 表示查询当前首页图片
-                List<TpShopImg> tpShopImgList= tpShopImgMapper.selectShopIdCommunity(userElement.getCommunityId(),tpShop.getId(),1);
+                List<TpShopImg> tpShopImgList = tpShopImgMapper.selectShopIdCommunity(userElement.getCommunityId(), tpShop.getId(), 1);
                 tpShop.setTpShopImgList(tpShopImgList);
             }
             // 查询当前商铺类型
-             tpShopType= tpShopTypeMapper.selectCommunityIdShop(userElement.getCommunityId());
-        }
-        //购物
-        List<String> tpShopTypeImgShop= new ArrayList<>();
-        //购物车3x
-        tpShopTypeImgShop.add("http://jingcheng-h5temp.oss-cn-shanghai.aliyuncs.com/1557816503894.png?Expires=1559643891&OSSAccessKeyId=LTAIkc75dpkJw8Lb");
-        //购物车2x
-        tpShopTypeImgShop.add("http://jingcheng-h5temp.oss-cn-shanghai.aliyuncs.com/1557816639291.png?Expires=1559644026&OSSAccessKeyId=LTAIkc75dpkJw8Lb");
-
-        //美食图片
-        List<String> tpShopTypeImgCate= new ArrayList<>();
-        // 美食图片3x
-        tpShopTypeImgCate.add("http://jingcheng-h5temp.oss-cn-shanghai.aliyuncs.com/1557816913843.png?Expires=1559644301&OSSAccessKeyId=LTAIkc75dpkJw8Lb");
-       // 美食图片2x
-        tpShopTypeImgCate.add("http://jingcheng-h5temp.oss-cn-shanghai.aliyuncs.com/1557816963921.png?Expires=1559644351&OSSAccessKeyId=LTAIkc75dpkJw8Lb");
+            tpShopTypeList = tpShopTypeMapper.selectCommunityIdShop(userElement.getCommunityId());
+           for (TpShopType tpShopType:tpShopTypeList){
+               int a=tpShopType.getId().intValue();
+             if (a == 1){
+                 //美食图片
+                 List<String> tpShopTypeImg = new ArrayList<>();
+                 // 美食图片3x
+                 tpShopTypeImg.add("http://jingcheng-h5temp.oss-cn-shanghai.aliyuncs.com/1557816913843.png?Expires=1559644301&OSSAccessKeyId=LTAIkc75dpkJw8Lb");
+                 // 美食图片2x
+                 tpShopTypeImg.add("http://jingcheng-h5temp.oss-cn-shanghai.aliyuncs.com/1557816963921.png?Expires=1559644351&OSSAccessKeyId=LTAIkc75dpkJw8Lb");
+                 tpShopType.setImg(tpShopTypeImg);
+             }
+            if (a == 2){
+                //购物
+                List<String> tpShopTypeImg = new ArrayList<>();
+                //购物车3x
+                tpShopTypeImg.add("http://jingcheng-h5temp.oss-cn-shanghai.aliyuncs.com/1557816503894.png?Expires=1559643891&OSSAccessKeyId=LTAIkc75dpkJw8Lb");
+                //购物车2x
+                tpShopTypeImg.add("http://jingcheng-h5temp.oss-cn-shanghai.aliyuncs.com/1557816639291.png?Expires=1559644026&OSSAccessKeyId=LTAIkc75dpkJw8Lb");
+                tpShopType.setImg(tpShopTypeImg);
+            }
+            if (a == 3){
+                   //休闲
+                   List<String> tpShopTypeImg = new ArrayList<>();
+                   // 休闲3x
+                tpShopTypeImg.add("http://jingcheng-h5temp.oss-cn-shanghai.aliyuncs.com/1557817084664.png?Expires=1559644472&OSSAccessKeyId=LTAIkc75dpkJw8Lb");
+                   // 休闲2x
+                tpShopTypeImg.add("http://jingcheng-h5temp.oss-cn-shanghai.aliyuncs.com/1557817102003.png?Expires=1559644489&OSSAccessKeyId=LTAIkc75dpkJw8Lb");
+                tpShopType.setImg(tpShopTypeImg);
+               }
+               if (a == 4){
+                   // 运动图片
+                   List<String> tpShopTypeImg = new ArrayList<>();
+                   // 运动图片3x
+                   tpShopTypeImg.add("http://jingcheng-h5temp.oss-cn-shanghai.aliyuncs.com/1557817239384.png?Expires=1559644626&OSSAccessKeyId=LTAIkc75dpkJw8Lb");
+                   // 运动图片2x
+                   tpShopTypeImg.add("http://jingcheng-h5temp.oss-cn-shanghai.aliyuncs.com/1557817273156.png?Expires=1559644660&OSSAccessKeyId=LTAIkc75dpkJw8Lb");
+                   tpShopType.setImg(tpShopTypeImg);
+               }
 
-        //休闲
-        List<String> tpShopTypeImgRecreation= new ArrayList<>();
-        // 休闲3x
-        tpShopTypeImgRecreation.add("http://jingcheng-h5temp.oss-cn-shanghai.aliyuncs.com/1557817084664.png?Expires=1559644472&OSSAccessKeyId=LTAIkc75dpkJw8Lb");
-       // 休闲2x
-        tpShopTypeImgRecreation.add("http://jingcheng-h5temp.oss-cn-shanghai.aliyuncs.com/1557817102003.png?Expires=1559644489&OSSAccessKeyId=LTAIkc75dpkJw8Lb");
+           }
 
-        // 运动图片
-        List<String> tpShopTypeImgExercise= new ArrayList<>();
-        // 运动图片3x
-        tpShopTypeImgExercise.add("http://jingcheng-h5temp.oss-cn-shanghai.aliyuncs.com/1557817239384.png?Expires=1559644626&OSSAccessKeyId=LTAIkc75dpkJw8Lb");
-        // 运动图片2x
-        tpShopTypeImgExercise.add("http://jingcheng-h5temp.oss-cn-shanghai.aliyuncs.com/1557817273156.png?Expires=1559644660&OSSAccessKeyId=LTAIkc75dpkJw8Lb");
+        }
         Map<String,Object> hashMap= new HashMap<>();
-        hashMap.put("tpShopType",tpShopType);
+        hashMap.put("tpShopType",tpShopTypeList);
         hashMap.put("tpShopList",tpShopList);
-        hashMap.put("tpShopTypeImgShop",tpShopTypeImgShop);
-        hashMap.put("tpShopTypeImgCate",tpShopTypeImgCate);
-        hashMap.put("tpShopTypeImgRecreation",tpShopTypeImgRecreation);
-        hashMap.put("tpShopTypeImgExercise",tpShopTypeImgExercise);
         response.addSuccess(hashMap);
         return response;