| @@ -48,7 +48,6 @@ public class WxBusinessController extends BaseController { | |||||
| @ApiOperation("业态全列表接口") | @ApiOperation("业态全列表接口") | ||||
| @GetMapping("listAll") | @GetMapping("listAll") | ||||
| @SystemControllerLog(description = "业态-全列表") | |||||
| public ResultData listAll() { | public ResultData listAll() { | ||||
| WxUserDataRule dataRule = this.getCurrentDataFloors(); | WxUserDataRule dataRule = this.getCurrentDataFloors(); | ||||
| String bussinessRule = null; | String bussinessRule = null; | ||||
| @@ -42,8 +42,8 @@ public class WxUserDataRule extends TenantEntity { | |||||
| } | } | ||||
| public String getBussinessIds() { | public String getBussinessIds() { | ||||
| if (StringUtils.isNotEmpty(businessForRule)) { | |||||
| Object[] data = JSONArray.parseArray(businessForRule).toArray(); | |||||
| if (StringUtils.isNotEmpty(business)) { | |||||
| Object[] data = JSONArray.parseArray(business).toArray(); | |||||
| return StringUtils.join(data, ","); | return StringUtils.join(data, ","); | ||||
| } | } | ||||
| return null; | return null; | ||||
| @@ -12,8 +12,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("finalTenantId")String finalTenantId,@Param("isRoot")Integer isRoot,@Param("isDel")Integer isDel,@Param("tenantId") String tenantId, @Param("parentTenantId") String parentTenantId); | |||||
| List<WxBusiness> findListForCoupon(@Param("finalTenantId")String finalTenantId,@Param("isRoot")Integer isRoot,@Param("isDel")Integer isDel,@Param("tenantId") String tenantId, @Param("parentTenantId") String parentTenantId, @Param("platCode") Integer platCode); | |||||
| List<WxBusiness> findListForMerchant(@Param("businessForRule")String businessForRule,@Param("finalTenantId")String finalTenantId,@Param("isRoot")Integer isRoot,@Param("isDel")Integer isDel,@Param("tenantId") String tenantId, @Param("parentTenantId") String parentTenantId); | |||||
| List<WxBusiness> findListForCoupon(@Param("businessForRule")String businessForRule,@Param("finalTenantId")String finalTenantId,@Param("isRoot")Integer isRoot,@Param("isDel")Integer isDel,@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); | ||||
| @@ -90,9 +90,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.getFinalTenantId(),EnumYesOrNo.YES.getCode(),isDel,tenantEntity.getTenantId(), tenantEntity.getParentTenantId(), paltCode); | |||||
| return wxBusinessMapper.findListForCoupon(bussinessRule,tenantEntity.getFinalTenantId(),EnumYesOrNo.YES.getCode(),isDel,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(),EnumYesOrNo.YES.getCode(),isDel,tenantEntity.getTenantId(), tenantEntity.getParentTenantId()); | |||||
| return wxBusinessMapper.findListForMerchant(bussinessRule,tenantEntity.getFinalTenantId(),EnumYesOrNo.YES.getCode(),isDel,tenantEntity.getTenantId(), tenantEntity.getParentTenantId()); | |||||
| }else { | }else { | ||||
| return wxBusinessMapper.findListAll(bq); | return wxBusinessMapper.findListAll(bq); | ||||
| } | } | ||||