| @@ -11,8 +11,8 @@ public interface WxBusinessMapper extends CommonMapper<WxBusiness, String> { | |||||
| List<WxBusiness> findList(WxBusiness wxBusiness); | List<WxBusiness> findList(WxBusiness wxBusiness); | ||||
| List<WxBusiness> findListAll(WxBusiness wxBusiness); | 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<WxBusiness> findListForMerchant(@Param("finalTenantId")String finalTenantId,@Param("isRoot")Integer isRoot,@Param("tenantId") String tenantId, @Param("parentTenantId") String parentTenantId); | |||||
| List<WxBusiness> findListForCoupon(@Param("finalTenantId")String finalTenantId,@Param("isRoot")Integer isRoot,@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); | ||||
| @@ -60,9 +60,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(bq,tenantEntity.getTenantId(), tenantEntity.getParentTenantId(), paltCode); | |||||
| return wxBusinessMapper.findListForCoupon(tenantEntity.getFinalTenantId(),EnumYesOrNo.YES.getCode(),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(bq,tenantEntity.getTenantId(), tenantEntity.getParentTenantId()); | |||||
| return wxBusinessMapper.findListForMerchant(tenantEntity.getFinalTenantId(),EnumYesOrNo.YES.getCode(),tenantEntity.getTenantId(), tenantEntity.getParentTenantId()); | |||||
| }else { | }else { | ||||
| return wxBusinessMapper.findListAll(bq); | return wxBusinessMapper.findListAll(bq); | ||||
| } | } | ||||
| @@ -102,8 +102,8 @@ | |||||
| select | select | ||||
| <include refid="allColumns"/> | <include refid="allColumns"/> | ||||
| from wx_business b | from wx_business b | ||||
| where b.`final_tenant_id` = #{wxBusiness.finalTenantId} | |||||
| <if test=" 1 == wxBusiness.isRoot"> | |||||
| where b.`final_tenant_id` = #{finalTenantId} | |||||
| <if test=" 1 == isRoot"> | |||||
| and b.`parent_id` is null | and b.`parent_id` is null | ||||
| </if> | </if> | ||||
| and | and | ||||
| @@ -124,8 +124,8 @@ | |||||
| select | select | ||||
| <include refid="allColumns"/> | <include refid="allColumns"/> | ||||
| from wx_business b | from wx_business b | ||||
| where b.`final_tenant_id` = #{wxBusiness.finalTenantId} | |||||
| <if test=" 1 == wxBusiness.isRoot"> | |||||
| where b.`final_tenant_id` = #{finalTenantId} | |||||
| <if test=" 1 == isRoot"> | |||||
| and b.`parent_id` is null | and b.`parent_id` is null | ||||
| </if> | </if> | ||||
| and | and | ||||