Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify

xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/biz/BannerBiz.java

@@ -31,10 +31,6 @@ public class BannerBiz extends BaseBiz<BannerMapper,Banner> {
     }*/
 
     public List<Banner> findBannerList(Integer type) {
-        Banner banner = new Banner();
-        banner.setIsDel(0);
-        banner.setType(type);
-        //mapper.findByType(type);
         return  mapper.findBannerListByType(type);
     }
 

xx-campsite/xx-campsite-api/src/main/java/com/xxfc/platform/campsite/dto/CampsiteShopPageDTO.java

@@ -5,8 +5,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.persistence.Column;
-import javax.persistence.Table;
 import java.io.Serializable;
+import java.util.Objects;
 
 
 /**
@@ -92,5 +92,20 @@ public class CampsiteShopPageDTO implements Serializable {
     @ApiModelProperty(value = "创建时间", hidden = true)
     private Long crtTime;
 
-
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        CampsiteShopPageDTO that = (CampsiteShopPageDTO) o;
+        return Objects.equals(id, that.id);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id);
+    }
 }

xx-campsite/xx-campsite-server/pom.xml

@@ -6,6 +6,7 @@
         <groupId>com.xxfc.common</groupId>
         <artifactId>xx-common-platform-web</artifactId>
         <version>2.0-SNAPSHOT</version>
+        <relativePath/>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.xxfc.platform</groupId>

xx-campsite/xx-campsite-server/src/main/java/com/xxfc/platform/campsite/biz/CampsiteShopBiz.java

@@ -67,6 +67,7 @@ public class CampsiteShopBiz extends BaseBiz<CampsiteShopMapper,CampsiteShop> {
             log.debug("根据type=【{}】查询到的店铺数据：【{}】",type,campsiteShopPageDTOS);
         }
         List<CampsiteShopPageVo> campsiteShopPageVoList = new ArrayList<>();
+        campsiteShopPageDTOS = campsiteShopPageDTOS.stream().distinct().collect(Collectors.toList());
         for (CampsiteShopPageDTO campsiteShopPageDTO : campsiteShopPageDTOS) {
             CampsiteShopPageVo campsiteShopPageVo = new CampsiteShopPageVo();
             BeanUtils.copyProperties(campsiteShopPageDTO,campsiteShopPageVo);

xx-campsite/xx-campsite-server/src/main/resources/mapper/CampsiteShopMapper.xml

@@ -41,7 +41,7 @@
         FROM `campsite_shop_tag`  cst
         left JOIN `campsite_shop` cs on cst.shop_id=cs.id
         left JOIN `campsite_tag` ct on cst.tag_id=ct.id
-        where cs.sale_state=1
+        where cs.sale_state=1 and cs.is_del=0
         <if test="typeId!=null">
             and cst.tag_id=#{typeId}
         </if>