平台端、商家端获取所有会员标签业务处理所属商家过滤

cereshop-admin/src/main/resources/mybatis/mapper/label/CerePlatformLabelDAO.xml

@@ -247,7 +247,7 @@
   <select id="findAll" resultType="com.shop.cereshop.commons.domain.label.CerePlatformLabel">
     SELECT buyer_label_id, label_name, label_type, meet_conditions, last_consumption_time, consumption_frequency,
     consumption_money, consumption_day, consumption_start_time, consumption_end_time,
-    frequency_start, frequency_end, money_start, money_end FROM cere_platform_label
+    frequency_start, frequency_end, money_start, money_end FROM cere_platform_label where business_id=0
   </select>
 
   <select id="findAllByDay" parameterType="java.lang.Object" resultType="java.lang.Object">

cereshop-business/src/main/java/com/shop/cereshop/business/dao/label/CerePlatformLabelDAO.java

@@ -33,7 +33,7 @@ public interface CerePlatformLabelDAO extends BaseMapper<CerePlatformLabel> {
 
     void deleteByIds(@Param("ids") List<Long> ids);
 
-    List<CerePlatformLabel> findAll();
+    List<CerePlatformLabel> findAll(Long businessId);
 
     List<Long> findAllByDay(@Param("consumptionDay") Integer consumptionDay);
 

cereshop-business/src/main/java/com/shop/cereshop/business/service/label/CerePlatformLabelService.java

@@ -29,7 +29,7 @@ public interface CerePlatformLabelService {
 
     List<PlatformLabel> findExcel(LabelExcelParam param) throws CoBusinessException;
 
-    List<CerePlatformLabel> findAll();
+    List<CerePlatformLabel> findAll(Long business);
 
     List<Long> findAllByDay(Integer consumptionDay);
 

cereshop-business/src/main/java/com/shop/cereshop/business/service/label/impl/CerePlatformLabelServiceImpl.java

@@ -195,8 +195,8 @@ public class CerePlatformLabelServiceImpl implements CerePlatformLabelService {
     }
 
     @Override
-    public List<CerePlatformLabel> findAll() {
-        return cerePlatformLabelDAO.findAll();
+    public List<CerePlatformLabel> findAll(Long business) {
+        return cerePlatformLabelDAO.findAll(business);
     }
 
     @Override

cereshop-business/src/main/resources/mybatis/mapper/label/CerePlatformLabelDAO.xml

@@ -247,10 +247,10 @@
     )
   </delete>
 
-  <select id="findAll" resultType="com.shop.cereshop.commons.domain.label.CerePlatformLabel">
+  <select id="findAll" parameterType="java.lang.Long" resultType="com.shop.cereshop.commons.domain.label.CerePlatformLabel">
     SELECT buyer_label_id, label_name, label_type, meet_conditions, last_consumption_time, consumption_frequency,
            consumption_money, consumption_day, consumption_start_time, consumption_end_time,
-           frequency_start, frequency_end, money_start, money_end FROM cere_platform_label
+           frequency_start, frequency_end, money_start, money_end FROM cere_platform_label where business_id=#{businessId}
   </select>
 
   <select id="findAllByDay" parameterType="java.lang.Object" resultType="java.lang.Long">

cereshop-business/src/main/resources/mybatis/mapper/member/CerePlatformMembershipDAO.xml

@@ -10,7 +10,7 @@
     <result column="update_time" jdbcType="VARCHAR" property="updateTime" />
   </resultMap>
   <sql id="Base_Column_List">
-    member_id, member_name, member_icon, member_reason, create_time, update_time
+    member_id, business_id, member_name, member_icon, member_reason, create_time, update_time
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
     select