| @@ -46,4 +46,7 @@ public class WxBusiness extends TenantEntityWithoutFinalTenantId { | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private Integer limitEnd; | private Integer limitEnd; | ||||
| @TableField(exist = false) | |||||
| private Integer isRoot; | |||||
| } | } | ||||
| @@ -10,9 +10,9 @@ public interface WxBusinessMapper extends CommonMapper<WxBusiness, String> { | |||||
| List<WxBusiness> findList(WxBusiness wxBusiness); | List<WxBusiness> findList(WxBusiness wxBusiness); | ||||
| List<WxBusiness> findListAll(@Param("finalTenantId") String finalTenantId); | |||||
| List<WxBusiness> findListForMerchant(@Param("finalTenantId") String finalTenantId,@Param("tenantId") String tenantId, @Param("parentTenantId") String parentTenantId); | |||||
| List<WxBusiness> findListForCoupon(@Param("finalTenantId") String finalTenantId,@Param("tenantId") String tenantId, @Param("parentTenantId") String parentTenantId, @Param("platCode") Integer platCode); | |||||
| List<WxBusiness> findListAll(WxBusiness wxBusiness); | |||||
| List<WxBusiness> findListForMerchant(@Param("wxBusiness")WxBusiness wxBusiness,@Param("tenantId") String tenantId, @Param("parentTenantId") String parentTenantId); | |||||
| List<WxBusiness> findListForCoupon(@Param("wxBusiness")WxBusiness wxBusiness,@Param("tenantId") String tenantId, @Param("parentTenantId") String parentTenantId, @Param("platCode") Integer platCode); | |||||
| List<Map<String,Object>> businessDataList(WxBusiness wxBusiness); | List<Map<String,Object>> businessDataList(WxBusiness wxBusiness); | ||||
| @@ -52,16 +52,19 @@ public class WxBusinessServiceImpl implements WxBusinessService { | |||||
| @Override | @Override | ||||
| public List<WxBusiness> findListAll(TenantEntity tenantEntity, Integer filter,Integer paltCode) { | public List<WxBusiness> findListAll(TenantEntity tenantEntity, Integer filter,Integer paltCode) { | ||||
| if (filter == null){ | |||||
| return wxBusinessMapper.findListAll(tenantEntity.getFinalTenantId()); | |||||
| WxBusiness bq = new WxBusiness(); | |||||
| bq.setFinalTenantId(tenantEntity.getFinalTenantId()); | |||||
| bq.setIsRoot(EnumYesOrNo.YES.getCode()); | |||||
| if (filter == null){ | |||||
| return wxBusinessMapper.findListAll(bq); | |||||
| }else if (filter.equals(EnumBusinessFilter.FILTER_BY_COUPON.getCode())) { | }else if (filter.equals(EnumBusinessFilter.FILTER_BY_COUPON.getCode())) { | ||||
| if (paltCode == null) | if (paltCode == null) | ||||
| paltCode = EnumAppPlat.WX.getCode(); | paltCode = EnumAppPlat.WX.getCode(); | ||||
| return wxBusinessMapper.findListForCoupon(tenantEntity.getFinalTenantId(),tenantEntity.getTenantId(), tenantEntity.getParentTenantId(), paltCode); | |||||
| return wxBusinessMapper.findListForCoupon(bq,tenantEntity.getTenantId(), tenantEntity.getParentTenantId(), paltCode); | |||||
| }else if (filter.equals(EnumBusinessFilter.FILTER_BY_MERCHANT.getCode())) { | }else if (filter.equals(EnumBusinessFilter.FILTER_BY_MERCHANT.getCode())) { | ||||
| return wxBusinessMapper.findListForMerchant(tenantEntity.getFinalTenantId(),tenantEntity.getTenantId(), tenantEntity.getParentTenantId()); | |||||
| return wxBusinessMapper.findListForMerchant(bq,tenantEntity.getTenantId(), tenantEntity.getParentTenantId()); | |||||
| }else { | }else { | ||||
| return wxBusinessMapper.findListAll(tenantEntity.getFinalTenantId()); | |||||
| return wxBusinessMapper.findListAll(bq); | |||||
| } | } | ||||
| } | } | ||||
| @@ -210,7 +213,9 @@ public class WxBusinessServiceImpl implements WxBusinessService { | |||||
| @Override | @Override | ||||
| public Map<Integer, WxBusiness> findAllMap(TenantEntity tenantEntity) { | public Map<Integer, WxBusiness> findAllMap(TenantEntity tenantEntity) { | ||||
| List<WxBusiness> list = wxBusinessMapper.findListAll(tenantEntity.getFinalTenantId()); | |||||
| WxBusiness bq = new WxBusiness(); | |||||
| bq.setFinalTenantId(tenantEntity.getFinalTenantId()); | |||||
| List<WxBusiness> list = wxBusinessMapper.findListAll(bq); | |||||
| Map<Integer,WxBusiness> map = new HashMap<Integer,WxBusiness>(); | Map<Integer,WxBusiness> map = new HashMap<Integer,WxBusiness>(); | ||||
| if (null != list) { | if (null != list) { | ||||
| for (int i = 0 ; i < list.size() ; i++) { | for (int i = 0 ; i < list.size() ; i++) { | ||||
| @@ -215,7 +215,9 @@ public class WxMerchantServiceImpl implements WxMerchantService { | |||||
| if (null == merchantList || merchantList.size() <= 0 ) { | if (null == merchantList || merchantList.size() <= 0 ) { | ||||
| return null; | return null; | ||||
| } | } | ||||
| List<WxBusiness> bussinessList = wxBusinessMapper.findListAll(tenantEntity.getFinalTenantId()); | |||||
| WxBusiness bq = new WxBusiness(); | |||||
| bq.setFinalTenantId(tenantEntity.getFinalTenantId()); | |||||
| List<WxBusiness> bussinessList = wxBusinessMapper.findListAll(bq); | |||||
| Map<Integer,WxBusiness> bussinessMap = new HashMap<Integer,WxBusiness>(); | Map<Integer,WxBusiness> bussinessMap = new HashMap<Integer,WxBusiness>(); | ||||
| if (null != bussinessList) { | if (null != bussinessList) { | ||||
| for (int i = 0 ; i < bussinessList.size() ; i ++) { | for (int i = 0 ; i < bussinessList.size() ; i ++) { | ||||
| @@ -88,10 +88,13 @@ | |||||
| <include refid="dynamicWhereConditions" /> | <include refid="dynamicWhereConditions" /> | ||||
| </select> | </select> | ||||
| <select id="findListAll" resultMap="BaseResultMap"> | |||||
| <select id="findListAll" parameterType="com.iformall.domain.po.WxBusiness" resultMap="BaseResultMap"> | |||||
| select | select | ||||
| <include refid="allColumns"/> | <include refid="allColumns"/> | ||||
| from wx_business where `final_tenant_id` = #{finalTenantId} | from wx_business where `final_tenant_id` = #{finalTenantId} | ||||
| <if test=" 1 == isRoot"> | |||||
| and `parent_id` is null | |||||
| </if> | |||||
| order by create_date asc | order by create_date asc | ||||
| </select> | </select> | ||||
| @@ -99,7 +102,11 @@ | |||||
| select | select | ||||
| <include refid="allColumns"/> | <include refid="allColumns"/> | ||||
| from wx_business b | from wx_business b | ||||
| where b.`final_tenant_id` = #{finalTenantId} and | |||||
| where b.`final_tenant_id` = #{wxBusiness.finalTenantId} | |||||
| <if test=" 1 == wxBusiness.isRoot"> | |||||
| and b.`parent_id` is null | |||||
| </if> | |||||
| and | |||||
| (select count(*) from wx_merchant m | (select count(*) from wx_merchant m | ||||
| where b.id = m.business_id | where b.id = m.business_id | ||||
| <if test=" null != tenantId and '' != tenantId"> | <if test=" null != tenantId and '' != tenantId"> | ||||
| @@ -117,7 +124,11 @@ | |||||
| select | select | ||||
| <include refid="allColumns"/> | <include refid="allColumns"/> | ||||
| from wx_business b | from wx_business b | ||||
| where b.`final_tenant_id` = #{finalTenantId} and | |||||
| where b.`final_tenant_id` = #{wxBusiness.finalTenantId} | |||||
| <if test=" 1 == wxBusiness.isRoot"> | |||||
| and b.`parent_id` is null | |||||
| </if> | |||||
| and | |||||
| (select count(*) from wx_coupon_channel cc | (select count(*) from wx_coupon_channel cc | ||||
| where b.id = cc.business | where b.id = cc.business | ||||
| and cc.status = 0 | and cc.status = 0 | ||||