Commit 8a3b0f4e by guojuxing

会员卡域ID集合查询pid

parent 3ca1fb93
......@@ -101,10 +101,10 @@ public interface WmStoreApiService {
* @Description:

* @author guojuxing
* @param enterpriseId 商户ID
* @param memberCardAreaId
会员卡域ID
* @param memberCardAreaIdList
会员卡域ID
* @return com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.enterprise.dto.wm.WmCouponPackageDTO>>


*/
ServiceResponse<List<WmCouponPackageDTO>> getWmListByMemberCardAreaId(Integer enterpriseId, Long memberCardAreaId);
ServiceResponse<List<WmCouponPackageDTO>> getWmListByMemberCardAreaId(Integer enterpriseId, List<Long> memberCardAreaIdList);
/**
* 根据微盟主账号查询配置
......
......@@ -142,10 +142,15 @@ public class WmStoreApiServiceImpl implements WmStoreApiService {
}
@Override
public ServiceResponse<List<WmCouponPackageDTO>> getWmListByMemberCardAreaId(Integer enterpriseId, Long memberCardAreaId) {
if (memberCardAreaId == null) {
public ServiceResponse<List<WmCouponPackageDTO>> getWmListByMemberCardAreaId(Integer enterpriseId, List<Long> memberCardAreaIdList) {
if (CollectionUtils.isEmpty(memberCardAreaIdList)) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "会员卡域ID为空");
}
Set<String> memberCard = memberCardAreaIdList
.stream()
.filter(e -> e != null)
.map(e -> e.toString())
.collect(Collectors.toSet());
List<TabWmStore> list = wmStoreService.getHasAuth(enterpriseId);
if (CollectionUtils.isNotEmpty(list)) {
return ServiceResponse.success(list
......@@ -156,7 +161,7 @@ public class WmStoreApiServiceImpl implements WmStoreApiService {
if (result.isSuccess()) {
if ("2".equals(JSON.parseObject(result.getResult().getStoreConfigJson()).getString("couponMode"))) {
//
if (memberCardAreaId.toString().equals(getMemberCardArea(e.getWmMallStoreId()))) {
if (memberCard.contains(getMemberCardArea(e.getWmMallStoreId()))) {
return true;
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment