| @@ -11,8 +11,8 @@ 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> findListAll(@Param("finalTenantId") String finalTenantId); | ||||
| List<WxBusiness> findListForMerchant(@Param("tenantId") String tenantId, @Param("parentTenantId") String parentTenantId); | |||||
| List<WxBusiness> findListForCoupon(@Param("tenantId") String tenantId, @Param("parentTenantId") String parentTenantId, @Param("platCode") Integer platCode); | |||||
| 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<Map<String,Object>> businessDataList(WxBusiness wxBusiness); | List<Map<String,Object>> businessDataList(WxBusiness wxBusiness); | ||||
| @@ -57,9 +57,9 @@ public class WxBusinessServiceImpl implements WxBusinessService { | |||||
| }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.getTenantId(), tenantEntity.getParentTenantId(), paltCode); | |||||
| return wxBusinessMapper.findListForCoupon(tenantEntity.getFinalTenantId(),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.getTenantId(), tenantEntity.getParentTenantId()); | |||||
| return wxBusinessMapper.findListForMerchant(tenantEntity.getFinalTenantId(),tenantEntity.getTenantId(), tenantEntity.getParentTenantId()); | |||||
| }else { | }else { | ||||
| return wxBusinessMapper.findListAll(tenantEntity.getFinalTenantId()); | return wxBusinessMapper.findListAll(tenantEntity.getFinalTenantId()); | ||||
| } | } | ||||
| @@ -399,7 +399,7 @@ public class InvestBizServiceImpl implements InvestBizService { | |||||
| private Map<String, WxBusiness> getBusinessMap(TenantEntity tenantEntity) { | private Map<String, WxBusiness> getBusinessMap(TenantEntity tenantEntity) { | ||||
| WxBusiness bq = new WxBusiness(); | WxBusiness bq = new WxBusiness(); | ||||
| bq.setFinalTenantId(tenantEntity.getFinalTenantId()); | bq.setFinalTenantId(tenantEntity.getFinalTenantId()); | ||||
| List<WxBusiness> businesses = businessService.listAsPage(null, 1, Integer.MAX_VALUE).getList(); | |||||
| List<WxBusiness> businesses = businessService.listAsPage(bq, 1, Integer.MAX_VALUE).getList(); | |||||
| return getMap(businesses, WxBusiness::getTitle); | return getMap(businesses, WxBusiness::getTitle); | ||||
| } | } | ||||
| @@ -98,8 +98,8 @@ | |||||
| <select id="findListForMerchant" resultMap="BaseResultMap"> | <select id="findListForMerchant" resultMap="BaseResultMap"> | ||||
| select | select | ||||
| <include refid="allColumns"/> | <include refid="allColumns"/> | ||||
| from wx_business b | |||||
| where | |||||
| from wx_business b | |||||
| where b.`final_tenant_id` = #{finalTenantId} 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"> | ||||
| @@ -116,8 +116,8 @@ | |||||
| <select id="findListForCoupon" resultMap="BaseResultMap"> | <select id="findListForCoupon" resultMap="BaseResultMap"> | ||||
| select | select | ||||
| <include refid="allColumns"/> | <include refid="allColumns"/> | ||||
| from wx_business b | |||||
| where | |||||
| from wx_business b | |||||
| where b.`final_tenant_id` = #{finalTenantId} 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 | ||||